apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,297 Commits 308 Branches 324 Tags
Commit Graph

85 Commits

Author SHA1 Message Date
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
Kelven Yang
c3c7e7e570 CLOUDSTACK-1746: update usage server startup configuration 2013-03-29 11:12:36 -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
a6ea691d64 usage: Revert 7a79451 due to duplicate declaration of plugin definition 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-03-14 16:43:48 +05:30
Wido den Hollander
8e8decfe2a license: Remove trailing spaces in license header 2013-03-14 10:51:33 +01:00
Alex Huang
4ee387e9ad fixed rat 2013-03-13 20:40:43 -07:00
Wido den Hollander
cd65d26a93 debian: Further improve the usage server package 
We no longer symlink db.properties to the management server, but
we create a own db.properties for the usage server.

During a upgrade we copy the file to make the upgrade easier.
 2013-03-13 21:25:18 +01:00
Wido den Hollander
7a794519a2 debian: Fix the usage server packaging 2013-03-12 14:26:10 +01:00
Noa Resare
2f135be15f CLOUDSTACK-1415: Debian & Ubuntu packaging work 
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
 2013-02-27 15:44:46 +00:00
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
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Kishan Kavala
4d634980e2 exclude usage unit test since it requires db connection 2013-02-16 09:09:09 +05:30
Kishan Kavala
b54db07d20 added db.properties to usage test resources 2013-02-15 22:39:04 +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
Rohit Yadav
8234dfa544 usage: Fix classpath issue for usage server 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 16:51:48 +05:30
Rohit Yadav
1187fb7ed2 usage: Add maven target to run usage server 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-11 18:13:04 +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
1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Hugo Trippaers
ca7b8b0a87 Package the usage server 2013-01-29 16:23:14 +01: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
Alex Huang
0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Kelven Yang
b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Alex Huang
cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -08:00
Alex Huang
91e68b5f2c A bunch of .project changes again 2012-11-04 19:25:03 -08:00
Alex Huang
f92ce72639 Correct dependency errors 2012-10-24 11:12:40 -07:00
Edison Su
059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Kelven Yang
5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Marcus Sorensen
2459a5a7a9 usage: Fix init scripts for RHEL based distros to use --pidfile instead of -p 2012-10-07 10:11:30 +02:00
Hugo Trippaers
f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers
aa6355ffe6 Updated master to 4.1.0 
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
 2012-10-01 11:00:55 -07:00
Rohit Yadav
0fdc89b3f0 CLOUDSTACK-81: Fix typo in function name for script in fedora 
Patch fixes typo in function name, in start() for the script used for fedora

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-25 13:46:14 +02:00
Rohit Yadav
eb26f7a3e4 CLOUDSTACK-81: Use non-lsb function 
Patch fixes typo in function name, in start() for centos/rhel scripts

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-25 12:40:22 +05:30
Wido den Hollander
e314f5fe32 CLOUDSTACK-81: Fix init script for usage server on RHEL based platforms 2012-09-24 15:20:17 +02:00
Alex Huang
db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Manikanta Kattamuri
cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04: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
359d5acda4 usage: Update init script to use JSVC (Debian) 2012-09-12 18:14:18 +02:00
Alex Huang
1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Alex Huang
6309253de1 Deleted some useless files 2012-08-30 09:59:25 -07:00
Kelven Yang
2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
olivier lamy
a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy
3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00