646 Commits

Author SHA1 Message Date
Doug Hellmann
a0066c3d3c Add sample configuration files for mod_wsgi
These files really only work for a devstack setup,
but the demonstrate what one would need to do in
a real deployment behind mod_wsgi.

Change-Id: If60ce2aa0b89c055ccc0411aece28042b14ab633
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-03-08 16:10:37 -05:00
OpenStack Jenkins
e7fc028e2b Merge "Imported Translations from Transifex" 2013-03-08 19:36:05 +00:00
Jenkins
3aee249059 Merge "Start both v1 and v2 api from one daemon." 2013-03-08 19:29:33 +00:00
Jenkins
711786d0f1 Merge "Handle missing units values in mongodb data." 2013-03-08 18:52:02 +00:00
Jenkins
0420270570 Merge "Update manual installation instructions" 2013-03-08 07:57:55 +00:00
Angus Salkeld
fa6bdc284c Start both v1 and v2 api from one daemon.
- Move bin/ceilometer-api-v2 to bin/ceilometer-api
- use VersionSelectorApplication() as the base application.

bug #1086381
Change-Id: Ia74938eb351fc374450932a91b21c0755afca2e5
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2013-03-08 15:28:25 +11:00
Jenkins
27ebcf2c0a Merge "Return something sane from the log impl." 2013-03-08 02:32:24 +00:00
Lianhao Lu
43a99336f6 Handle missing units values in mongodb data.
Provide a units value if it's missing in the existing mongodb data. This
is for the backward compatibility issue when the data had been already
stored before the counter_unit field was added in our meter definition.

Fixed bug #1098603.

Change-Id: I1ff3e325dc9b226e4441de6f5f9118fced67cf33
2013-03-08 09:22:23 +08:00
OpenStack Jenkins
cafec09ccb Imported Translations from Transifex
Change-Id: I1b0b1d0486dbfae9836a386ebc49b266047498ef
2013-03-08 00:02:06 +00:00
Sandy Walsh
6a7633c62a Make HACKING compliant
Make all the source and tests HACKING compliant and
enable tox -e hacking on by default.

Relative directory checks not enabled (yet)

Change-Id: I8803f67c49b4d16caebe76ae690092ae5c9a6dd3
2013-03-07 19:02:01 -04:00
Jenkins
b345cef2f3 Merge "Add the etc directory to the sdist manifest" 2013-03-07 20:07:06 +00:00
Doug Hellmann
a90958085c Update manual installation instructions
Update the instructions for installing ceilometer by hand
instead of using devstack.

bug 1070404
bug 1071494

Change-Id: I617e0467b40f218e5811da7b39db76c6eb466da6
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-03-07 13:53:04 -05:00
Lianhao Lu
df0a2ca24b Fix oslo.config and unittest.
Switch to the new oslo.config package which was renamed from
oslo-config.

Use python-keystoneclient master version as a temporary workaround for
bug #1151665.

Temporary workdaround of the bug #1151345 by comment out the test code
to pass the jenkin's gate test.

Change-Id: I7c223f3e98c5d33993b345d93c27f97d3d926d80
2013-03-07 22:56:53 +08:00
Angus Salkeld
b7c30cae6b Return something sane from the log impl.
This is just so we can use the log impl. for the binary api test (next commit).

Change-Id: I00e40060e12dce417b39d3d0fe35fb264272fd8b
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2013-03-07 09:01:57 +11:00
Jenkins
54432375ac Merge "Fix an invalid test in the storage test suite" 2013-03-06 14:30:39 +00:00
Doug Hellmann
bf0c01eb48 Fix an invalid test in the storage test suite
The test_by_user_period test is looking for the first
result set to come back with the wrong timestampe, and
not noticing that most of the test isn't even being
run. Be more explicit about the expected results.

Change-Id: I47e7699c877819d98f66d47dc85662f26767abd6
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-03-06 09:12:27 -05:00
Jenkins
64e8e382f6 Merge "api: run compute duration by resource on SQL backend" 2013-03-06 03:54:23 +00:00
Jenkins
5ba6a71abb Merge "api: run list_projects tests against SQL backend too" 2013-03-06 03:50:03 +00:00
Jenkins
9b1f861d09 Merge "api: run list users test against SQL backend too" 2013-03-06 03:50:00 +00:00
Jenkins
2a1c24669b Merge "api: run list meters tests against SQL backend too" 2013-03-06 03:46:04 +00:00
Jenkins
b912653a5d Merge "Exclude tests directory from installation." 2013-03-06 03:42:14 +00:00
Doug Hellmann
9aa2ec39f2 Add the etc directory to the sdist manifest
Make sure we package the sample configuration files
along with the rest of the source files.

Change-Id: I957101fc5fb35f305924d362b94e24323e833c05
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-03-05 16:20:09 -05:00
Julien Danjou
34e59325dc api: run compute duration by resource on SQL backend
Change-Id: Id5aa0bc2b24bb7d3e521d51b2b7777b99ea418e5
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-05 17:17:01 +01:00
Julien Danjou
955ffa901d api: run list_projects tests against SQL backend too
Change-Id: Id656537f74ebb636147fb8e6762a65652ad5c151
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-05 17:17:01 +01:00
Julien Danjou
75f4fffb94 api: run list users test against SQL backend too
Change-Id: I89a0d970ac124c6ff51c8e8f9389b7dda7403462
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-05 17:17:01 +01:00
Julien Danjou
fdadb09907 api: run list meters tests against SQL backend too
Change-Id: Ide08d0e92aa29a0d79333d1e02e8184a2f6d132d
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-05 17:17:01 +01:00
Mehdi Abaakouk
fba1ae00c3 Kwapi pollster silently return no probre if keystone endpoint is not present
Fixes bug 1105404

Change-Id: Ib2673215ca1075d04283492d9e08540f9f786d08
2013-03-05 16:13:35 +01:00
Jenkins
37bc0a7915 Merge "HBase storage driver, initial version." 2013-03-05 10:38:38 +00:00
Stas Maksimov
6f7525755f HBase storage driver, initial version.
This is a new storage driver that supports storing of Ceilometer
data in an HBase backend. This version does not have metaquery
support yet.

Implements: blueprint hbase-storage-backend
Change-Id: Id3e7ec01434b1be30cce4f91b39461fc389a000f
2013-03-05 10:10:35 +00:00
Lianhao Lu
b9d9539a48 Exclude tests directory from installation.
This fixed bug #1146340 by excluding tests packages.

Change-Id: Id892c0a2e521a199a9ac42ed8d3729e17fffb5bd
2013-03-05 16:54:47 +08:00
Jenkins
d9c4de87af Merge "Ensure missing period is treated consistently" 2013-03-05 08:29:06 +00:00
Jenkins
581344b639 Merge "Run some APIv1 tests on different backends" 2013-03-05 02:09:42 +00:00
Doug Hellmann
2d049c1da3 Ensure missing period is treated consistently
Add a new test to ensure that all of the storage drivers
return a consistent value for the period.

Fix the SQLAlchemy driver so it returns 0 for the period
if no period is provided in the input to the query.

Change-Id: I3bc272aea1fd1ce29953d2080b58d75f5373513a
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-03-04 16:11:05 -05:00
Chuck Short
34cb09d9b2 Exclude tests when installing ceilometer
Dont include the tests directory when installing
ceilometer as they might conflict with other
poorly installed packages on the users systems.

Fixes LP: #1102110

Signed-off-by Chuck Short <chuck.short@canonical.com>

Change-Id: Ia8b0477af72b30dcf54b4751a51bbb460a7a90f4
2013-03-04 11:40:42 -06:00
Julien Danjou
c41249e488 Run some APIv1 tests on different backends
This is a first change towards implementing bug #1131638. It clears a lot of
stuff in the various DB mocking stuff, and I plan to do more after.

In the same process, this implements a unit test and a fix for bug #1138137

Change-Id: I36a6741393455c764913e0388d73d834db06da8c
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-04 16:45:29 +01:00
Julien Danjou
346c4248e4 Remove old configuration metering_storage_engine
This is useless now.

Change-Id: I195cc626a6ae2d65535362c67f53663551933f9e
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-04 13:50:57 +01:00
Jenkins
4125b9e7c6 Merge "Set where=tests" 2013-03-04 01:30:31 +00:00
Jenkins
2fa5e50f3d Merge "send-counter: fix & test" 2013-03-03 23:55:00 +00:00
Julien Danjou
a86cdeba8c Set where=tests
Many tests assumed to be run from tests, and fails without that if simply
run with 'nosetests', which is handy.

Change-Id: Ief9dba564f809012b38df8533dd5a09e90668517
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-03-01 15:49:32 +01:00
Jenkins
ca064bdbd6 Merge "Decouple the nova notifier from ceilometer code" 2013-03-01 13:51:44 +00:00
Jenkins
a6ba521c8b Merge "compute: fix unknown flavor handling" 2013-02-28 01:32:38 +00:00
Doug Hellmann
7d8bd50d08 Decouple the nova notifier from ceilometer code
The move to oslo.config introduced a conflict in the nova notifier
because both nova and ceilometer have copies of the
openstack.common.rpc library and define an option for the AMQP
exchange name for the project. This changeset decouples the notifier
plugin in ceilometer from most of the ceilometer code, to remove that
conflict.

The nova notifier is rewritten to emit a new notification message with
event type `compute.instance.delete.samples` instead of making the old
RPC calls directly to the ceilometer collector, and a notification
listener plugin is provided to convert those messages to sample data.

The notifier implementations are split between the one that worked
in folsom and the one that works in grizzly to maintain backwards
compatibility.

get_hypervisor_inspector() is moved to a location where it can be
imported both by the compute agent manager and the notifier
plugin. The definition of `disabled_compute_pollsters` option is also
moved for the same reason.

The tox configuration is changed to run the nova notifier tests
separately from the other tests, since nose cannot import nova and
ceilometer code in the same process.

bug 1130952

Change-Id: I39ba4564c9c14f09dbdd768d7a83f6940e3942ad
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-02-26 14:22:27 -05:00
Julien Danjou
d066837415 send-counter: fix & test
This fixes the bin/ceilometer-send-counter program that has been broken
after the implementation of multi-publisher.
We also add a test to see if it runs!

This fixes bug #1133226

Change-Id: I922c7a000e942ee28d840f4cd65d13898d6d23a8
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-02-26 11:57:52 +01:00
Jenkins
1d44a182cb Merge "Remove nose wrapper script" 2013-02-26 10:02:10 +00:00
Jenkins
59514bf6f2 Merge "Add glossary definitions for additional terms" 2013-02-26 10:00:40 +00:00
Jenkins
f96476dd7a Merge "Allow empty dict as metaquery param for sqlalchemy." 2013-02-25 22:46:53 +00:00
Doug Hellmann
b4cd6f1fab Remove nose wrapper script
Change-Id: I8e244aa892ac66dddd1be96369dfb0e90cc1543d
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2013-02-25 16:27:52 -05:00
Julien Danjou
f8337b52fc Fix count type in MongoDB
This fixes some API tests ran with CEILOMETER_LIVE_TEST

Change-Id: I3c77ffb3b6287dd4efcf0afd6f437033acb5f2b7
Signed-off-by: Julien Danjou <julien@danjou.info>
2013-02-25 17:26:18 +01:00
Jenkins
0ccc81e1c4 Merge "Remove compat cfg wrapper" 2013-02-25 15:02:14 +00:00
OpenStack Jenkins
2d8f7c157f Merge "Imported Translations from Transifex" 2013-02-25 15:00:52 +00:00