117 Commits

Author SHA1 Message Date
Kishan Kavala
421d6029db Remove cloud-server dependency for cloud-usage project 2014-07-02 15:28:42 +05:30
Santhosh Edukulla
1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-21 12:38:46 +02:00
Olivier Lemasle
a5902f1db4 CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-10 03:11:35 -04:00
Olivier Lemasle
303e6ffc1e CLOUDSTACK-6669: Fix support resize in usage server
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:45:44 -04:00
Hugo Trippaers
703febc64b Fix CID-1147052 Use try-with-resources to fix the leak 2014-06-03 17:20:16 +02:00
Rajani Karuturi
bdde5335f9 FIXED CLOUDSTACK-6669 Support volume resize in usage server 2014-05-30 15:03:02 +05:30
Harikrishna Patnala
14f1b96b51 CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2 2014-05-05 11:50:48 +05:30
Harikrishna Patnala
95fa931ff2 CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale 2013-12-30 12:20:33 +05:30
Antonio Fornie
55a6df4501 Resources leaks, refactoring and testing
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)

Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)

Create Unit and Integration Tests for UsageSanityChecker

Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
2013-12-18 10:55:04 +01:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alena Prokharchyk
bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java

listAlerts: introduced new parameter "name" to the alertResponse

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

Added new Admin API - generateAlert. Available to ROOT admin only

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

listAlerts: implemented search by alert name

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Bharat Kumar
68406ba29d CLOUDSTACK-5161 enable scaling of a vm using custom offering
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
Harikrishna Patnala
b2f0a0bce2 CLOUDSTACK-4737: handling usage events for dynamic compute offering
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 17:07:30 +05:30
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Darren Shepherd
f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Laszlo Hornyak
977a75f1be UsageManagerInternal fix
aed5e9dc2a6882139bc38073923be5a3bacfd9d2 seems to inroduce some typo to run

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-07 13:13:40 -07:00
Darren Shepherd
aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Kishan Kavala
b4464d88d3 CLOUDSTACK-4281 : Usage - exception was hiding the db error. Make the usage job fail incase of any DB insert exceptions 2013-08-13 17:30:46 +05:30
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Mice Xia
51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Harikrishna Patnala
2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Saksham Srivastava
135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Kishan Kavala
f96442a45b CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm 2013-06-27 16:01:39 +05:30
Wei Zhou
ab6bf0b209 fix disk I/O description mistake 2013-06-11 00:09:05 +02:00
Wei Zhou
6de271c754 fix disk I/O description mistake 2013-06-11 00:03:03 +02:00
Wei Zhou
76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Wei Zhou
b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Wei Zhou
2e8d1264a2 CLOUDSTACK-2707: use executeBatch instead of persist when Usage Server createNetworkHelperEntry 2013-05-28 09:43:23 +02:00
Mice Xia
5118e9e29f 1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128
2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent
2013-04-22 19:38:32 +08:00
Hugo Trippaers
574e716352 CLOUDSTACK-2033 Fix usage server startup and logging
Properly implement the Daemon interface

Initialize logging when the usage server is started as a daemon

Fix a few minor startup and packaging items.
2013-04-16 10:52:49 +02:00
Kelven Yang
f8471e545f CLOUDSTACK-1746: fix logging warning in usage server 2013-03-29 13:44:12 -07:00
Anshul Gangwar
61754cd987 CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
Rohit Yadav
0a1a207a19 usage: Fix regression build fail from fc3905fb, missing closing parenthesis
We've to test our commits, build 'em before committing :)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c47f685b1f323d1d8316ef6067c11cf14ecabbc6)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 16:41:16 +05:30
Wei Zhou
fc3905fb57 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:27:59 +05:30
Kishan Kavala
7d61ee6e99 CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db

Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-15 18:41:28 +05:30
Kishan Kavala
fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Hugo Trippaers
7ce03b4f8e Summary: Fixup usage server for packaging
Make the start method work again with jsvc

Move the usageApplicationContext to resources and add resources to the pom.xml

Remove the old components file

Add mysql-connector as a runtime dependency

Rename the usage package and the files to cloudstack

Change paths to the new proposed locations
2013-02-03 17:49:18 +01:00
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang
1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Kelven Yang
6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Alex Huang
f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Kelven Yang
b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Wido den Hollander
5d41523a0b usage: Fix whitspace and indention according to code convention
Replaced all tabs by 4 spaces
2012-09-13 16:29:01 +02:00
Wido den Hollander
eab3e4783e Remove cloud-daemonize and use JSVC
We now use JSVC for daemonizing our agent and usage server.
2012-07-24 19:32:39 +02:00
David Nalley
4cfbe5cf8b fixing license headers for usage 2012-06-04 10:22:57 -04:00