4319 Commits

Author SHA1 Message Date
liu-sheng
4dfce21e07 Keep the instance_type meta from polling and notification consistent
The metadata.instance_type from polling is set to flavor id, but from
notifications, it is set to flavor name.

Change-Id: I4f260e5c7e29fa7bf890930abc8be4ec5b611554
Closes-Bug: 1489132
2015-08-27 14:27:00 +08:00
Jenkins
fcf5b4e7e2 Merge "Change json path's to start with $. for consistency" 2015-08-27 04:08:51 +00:00
Jenkins
68a4552492 Merge "Add validation tests for arithmetic, string and prefix expressions" 2015-08-27 01:18:36 +00:00
Jenkins
b38c500e42 Merge "Fix description for "Inapt spelling of 'MongoDB'"" 2015-08-27 00:24:33 +00:00
Jenkins
ccf824aa43 Merge "support custom timestamp" 2015-08-26 20:51:05 +00:00
Jenkins
62dc905e75 Merge "Add cpu meters to yaml" 2015-08-26 19:59:27 +00:00
Divya
6a532111bc Add user_id,project_id traits to audit events
The ceilometer audit events stored at the ceilometer database
currently don't have user_id/project_id associated with them
even though this information is available as part of the event
message payload. The user_id and project_id information has to
be stored as traits so that there's user/project context for each
event and these traits are required to apply RBAC-based rules
and filters on events. For eg., presence of these traits enable
db queries - like get all events for a project/user against events.
The audit event definition in the events yaml file already stores
payload.initiator.id as initiator_id but the initiator_id trait
is not a common trait across all events and thus this trait cannot
be used to apply RBAC filter against events.This changeset will
thus add user_id and project_id traits to the audit events namely
*.http.* and add useri_id and project_id as default traits for all
events.

DocImpact

Change-Id: If4034342c4e60d519f0ec96ae8895dcf78f8ad3b
blueprint: events-rbac
2015-08-26 20:23:29 +02:00
Jenkins
c18d69a800 Merge "gnocchi: move to jsonpath_rw_ext" 2015-08-26 17:13:52 +00:00
Pradeep Kilambi
2bff767191 Change json path's to start with $. for consistency
Change-Id: Ib714624356d777a39dcaedc834d152ddd2547f91
2015-08-26 12:23:35 +00:00
Pradeep Kilambi
3dc6b74dff Add validation tests for arithmetic, string and prefix expressions
Partially Implements: blueprint declarative-notifications

Change-Id: I483b1e732269a74f07a064e14fb1a9b78e811237
2015-08-26 12:23:10 +00:00
JuPing
b569a66491 Fix description for "Inapt spelling of 'MongoDB'"
There is an inapt spelling in the file called
ceilometer/doc/source/webapi/v2.rst.
  line194:...different meaning in Mongo DB and...
  line198:...the Mongo DB will return every....
  line199:See more in the Mongod DB doc.
I think "Mongo DB" and "Mongod DB" are supposed to
spelled as "MongoDB".

Change-Id: Icb72e5e5eb099a839c4ef5aba292a42976144428
Closes-Bug: #1488775
2015-08-26 11:10:56 +00:00
Chris Dent
788a8341db Create conf directory during devstack install phase
Otherwise other plugins which depend on ceilometer and want to set
configuration items may have issues with the configuration directory not
being there.

Change-Id: Id8d10c9fcdd85e2840a74dcff5245b6f44f7424b
2015-08-26 10:21:33 +00:00
gordon chung
537959e4fe support custom timestamp
this patch allows us to define timstamp field. the default remains
oslo.messaging timestamp located at message['timestamp']

Change-Id: I27768b22bcfd9744b3542f171ebea5c63423496d
Implements: blueprint declarative-notifications
2015-08-26 07:59:46 +00:00
Pradeep Kilambi
e1168f2ecd Add cpu meters to yaml
Change-Id: I9cb4088f5a562d9593e701eb2dfb386abc8b4294
Implements: blueprint declarative-notifications
2015-08-26 07:55:24 +00:00
JuPing
492fe30747 Fix description for "Incorrect spelling of a word"
There is a incorrect spelling of a word in thefile called
ceilometer/doc/source/releasenotes/folsom.rst(line26).
  It is curently tested to work with OpenStack 2012.2 Folsom.
I think the word "curently " should be spelled as "currently".

Change-Id: I39f413e2fb6602cab828c87779826654296768f2
Closes-Bug: #1488766
2015-08-26 06:13:33 +00:00
Mehdi Abaakouk
a12d40f8b0 integration: add some new tests
This change:
* we can downscale the stack.
* use two vm instead of three to reduce the test duration

Related-bug: #1479429
Change-Id: Ifea9869cd98654d168eb8e95c6e84d3a80bc32cc
2015-08-26 05:58:15 +00:00
Edwin Zhai
ed884d4dbd Fix disable_non_metric_meters referencing
Need import it otherwise TestMeterProcessing unit test fails.

Change-Id: Ia6da94364bb4c8fd9647b2caf8f1932b1eb2e0de
Closes-Bug: #1488450
2015-08-26 10:12:44 +08:00
Mehdi Abaakouk
d7428b7c38 Update tests to reflect WSME 0.8 fixes
All these bugs are now fixed in wsme 0.8.0

Closes-bug: #1424642
Closes-bug: #1423634
Closes-bug: #1419110
Closes-bug: #1428185
Closes-bug: #1428628
Closes-bug: #1428658
Closes-bug: #1428624

Change-Id: Iea8507ebc54f42786a44bfcd96246b88dd998bf0
2015-08-25 17:13:38 +00:00
gordon chung
bd91b1dcd6 remove jsonpath-rw requirement
we use jsonpath-rw-ext now

Change-Id: I70e8b82885bc30db3a2a6a3b053e9bee7037ea95
2015-08-25 12:43:18 -04:00
Jenkins
7d4fa41b16 Merge "Do not use system config file for test" 2015-08-25 15:29:18 +00:00
Edwin Zhai
53c73ec2f8 Do not use system config file for test
Use dummy config file so that test depends on default config opts
instead of system config file.

Change-Id: I4ffbd389f80bbdb6076cdd99d3b25ffb4a26f32e
Closes-Bug: #1482695
2015-08-26 07:47:03 +08:00
Jenkins
0e93b6bb50 Merge "Use jsonpath_rw_ext for meter/event definitions" 2015-08-25 13:09:22 +00:00
Mehdi Abaakouk
a832d13465 gnocchi: move to jsonpath_rw_ext
This change use jsonpath_rw_ext instead of jsonpath_rw

It also remove the useless attributes list by a dict in the
yaml configuration.

Change-Id: I6014181d6d4d45ffa9769da9670b11d79d6910fc
2015-08-25 12:56:15 +00:00
Jenkins
72683d9b33 Merge "preload jsonpath_rw parsers" 2015-08-25 12:42:51 +00:00
OpenStack Proposal Bot
3cbed0322d Updated from global requirements
Change-Id: I49ebadb40ed55587cd5f8db974b38a4420e21b41
2015-08-25 07:06:12 +00:00
Jenkins
ca4c452bfc Merge "Allow to run debug tox job for functional tests" 2015-08-25 01:42:48 +00:00
Jenkins
e1fc1ca8df Merge "add flexible grouping key" 2015-08-24 16:57:37 +00:00
Jenkins
2dfe8f2d03 Merge "Fix dependency for doc build" 2015-08-24 16:48:12 +00:00
Ilya Tyaptin
9c8e0e5459 Allow to run debug tox job for functional tests
In this CR functional tox jobs with "oslo_debug_helper" have
been added. Currently we can run oslo_debug_helper only for unit
tests directory.

Change-Id: Ib6b79b8af4ca9718720a789b3e0ab6b9600a4671
2015-08-24 19:47:21 +03:00
Mehdi Abaakouk
18b8e2f28a Use jsonpath_rw_ext for meter/event definitions
This change replace jsonpath_rw per jsonpath_rw_exta
for parsing meter/event definitions.

Depends-On: I4ebf773fd8e01185d3d1946c971d98f5c15e610a
Change-Id: I2e561e7f8a1c73b1eea561614c379d5ea207a363
2015-08-24 13:49:40 +00:00
Jenkins
cdef3bba3d Merge "disable non-metric meter definitions" 2015-08-24 04:42:50 +00:00
Mehdi Abaakouk
204fe38780 preload jsonpath_rw parsers
The loading of the jsonpath_rw parsers is expensive.
This change created them only once at startup.

Change-Id: Ie96199f0b28537a1a9fd56432bda97b97ccecee4
2015-08-23 11:21:17 +02:00
Jenkins
82849472af Merge "integration test: adjusts timeout" 2015-08-22 04:26:10 +00:00
Jenkins
a1aa2d3269 Merge "integration test: failfast" 2015-08-22 04:26:04 +00:00
Jenkins
51aa6dafa5 Merge "Implement consuming metrics from Magnum" 2015-08-21 23:21:13 +00:00
Jenkins
f598374b48 Merge "Updated from global requirements" 2015-08-21 19:57:32 +00:00
Jenkins
f2eb905188 Merge "Avoid recording whole instance info in log" 2015-08-21 19:45:04 +00:00
Jenkins
c3a60490f9 Merge "full multi-meter support" 2015-08-21 16:13:45 +00:00
Jenkins
1472a201b3 Merge "Introduce Guru Meditation Reports into Ceilometer" 2015-08-21 16:05:58 +00:00
Mehdi Abaakouk
eadc260024 integration test: adjusts timeout
This change waits
* for the update of heat stack status
* less time that the scale up occur
* a bit that gnocchi measures are ingested

Change-Id: Ic347e9eda88a251859b482c90325dfb374d88cf8
2015-08-21 14:41:51 +02:00
Mehdi Abaakouk
5ba15a556d integration test: failfast
This change uses 'gabbi-run -x' instead of 'testr'
to stop at the first errors.

We loose the testr report, but currentlty we have
only one scenario, this is not a big deal.

Change-Id: I9ca50592e959fec4669bef3d8e645268d2d3c3d5
2015-08-21 14:41:51 +02:00
Jenkins
e89f38d778 Merge "Improve comments in notification.py" 2015-08-21 10:10:18 +00:00
Jenkins
39b96b656d Merge "handle list payloads in notifications" 2015-08-21 06:37:12 +00:00
OpenStack Proposal Bot
3ff7aa8229 Updated from global requirements
Change-Id: I2ccd5f2baaf0082557ee79cf50059d279d7bd515
2015-08-21 05:08:17 +00:00
Jenkins
a8f49f79b0 Merge "Corrected test_fallback_meter_path test case" 2015-08-21 04:30:02 +00:00
LiuSheng
8220558072 Avoid recording whole instance info in log
Several compute pollsters will record the whole instance info in log when
polling resources usage, it is redundant and may boom the log messages.

Closes-Bug: #1487261
Change-Id: I308254eb1e63d1215c1c053aaf88093aa937df0b
2015-08-21 01:36:40 +00:00
Jenkins
4c74285a69 Merge "Mark record_type in PaaS Event Format doc as optional" 2015-08-20 23:30:32 +00:00
Edwin Zhai
77a76c256f Fix dependency for doc build
Add check for libtidy in Makefile giving more information to user.

Change-Id: I1deedc6d8b714cdfcef53672af2921a0906ec13f
Closes-Bug: #1337697
2015-08-21 07:14:08 +08:00
Jenkins
c6710ff2b5 Merge "add poll history to avoid duplicate samples" 2015-08-20 20:10:08 +00:00
Jenkins
119dae7b52 Merge "Fixed event requeuing/ack on publisher failure" 2015-08-20 19:27:21 +00:00