summaryrefslogtreecommitdiff
path: root/ceilometer
Commit message (Collapse)AuthorAgeFilesLines
* Have eventlet monkeypatch the time module2015.1.0rc22015.1.0Chris Dent2015-04-231-1/+1
| | | | | | | | | | | | | | | | Without this, mongod retry logic in the various services started as commands fails to behave as expected and does not reconnect as soon as the mongod service has returned to availability. In addition to the mongod sleep there are two other time.sleep calls that may be reached by this change. Review and discussion with others indicates that their behavior will continue to be correct with the monkeypatch in place. Cherry-pick from https://review.openstack.org/#/c/176751/ Change-Id: I4eca290acc3b06658951f070935ebb39936e13d3 Closes-Bug: #1447599
* Merge "Fix valueerror when ceilometer-api start" into stable/kiloJenkins2015-04-231-3/+3
|\
| * Fix valueerror when ceilometer-api startLan Qi song2015-04-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | If change local language to other language(like ja), ceilometer-api will failed to start. This patch will remove i18 support from ceilometer/storage/__init__.py Change-Id: I8dc7ff0921d69e64a41e588207c97548513c99ed Closes-Bug: #1446983 (cherry picked from commit f2ab05ac3dc95981ce183277a52e8c395a4cdbeb)
* | Merge "use message id to generate hbase unique key" into stable/kiloJenkins2015-04-232-6/+5
|\ \
| * | use message id to generate hbase unique keyZhiQiang Fan2015-04-212-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently can disable computing signature for metering message, but HBase still uses signature as a dimension to generate unique row key, this will lead to different samples treated as same one. Message id should be used in stead of message signature, because id will always exist and also unique. Change-Id: I47cdce59c9934573076cf609ce1a0c37aea75c44 Closes-Bug: #1445227 (cherry picked from commit 15a92ec1ef2ab3e6d1d187ad909a0d5800ee4a2e)
* | | Merge "gnocchi: fix typo in the aggregation endpoint" into stable/kiloJenkins2015-04-232-2/+2
|\ \ \ | |_|/ |/| |
| * | gnocchi: fix typo in the aggregation endpointMehdi Abaakouk2015-04-202-2/+2
| |/ | | | | | | | | | | | | Closes-bug: #1446201 Change-Id: I92a727b518f77ad7149fc43a564adea5e8e97240 (cherry picked from commit d1130e810d40ecd553a325fa5c32626be944625c)
* | Release Import of Translations from TransifexAndreas Jaeger2015-04-2019-1744/+0
|/ | | | | | | | | | | | Manual import of Translations from Transifex. This change also removes all po files that are less than 66 per cent translated since such partially translated files will not help users. This change needs to be done manually since the automatic import does not handle the proposed branches and we need to sync with latest translations. Change-Id: Ieab43148a8d77d5896f02dd96d54097cc3d2e37b
* Merge "Use oslo_vmware instead of deprecated oslo.vmware"2015.1.0rc1proposed/kiloJenkins2015-04-094-4/+4
|\
| * Use oslo_vmware instead of deprecated oslo.vmwareDina Belova2015-04-064-4/+4
| | | | | | | | Change-Id: I3d158786bc276c9d0de4fbaa324216697a5483aa
* | Merge "Adds support for default rule in ceilometer policy.json."Jenkins2015-04-091-9/+15
|\ \
| * | Adds support for default rule in ceilometer policy.json.Divya2015-04-071-9/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The default rule is broken in the current implementation of ceilometer rbac, because ceilometer rbac.py does not leverage the support provided by oslo_policy . It instead tries to loop through all the rules in the policy.json to check if the rule corresponding to the requested REST api matches with the any in the policy.json. In this process, it completely ignores the existence of the default rule. Closes-Bug: 1435855 Change-Id: Icab626b28d14514b0f024df447a8e7f35c52257c
* | Merge "Fix a issue for kafka-publisher and refactor the test code"Jenkins2015-04-092-84/+97
|\ \
| * | Fix a issue for kafka-publisher and refactor the test codeKomei Shimamura2015-04-092-84/+97
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Fix a issue which causes error when default policy is selected. Add test codes to avoid the same mistakes again. Fix a bug of the test code which is: * KafkaBrokerPublisher tries to connect localhost when __init__ is called because of the lack of mocking _get_client function before initializing KafkaBrokerPublisher. Closes-Bug: 1441175 Closes-Bug: 1441258 Change-Id: I306db443a866860ee45b2362b8a0cd2a59d8c3a2
* | Merge "use oslo.messaging dispatch filter"Jenkins2015-04-092-112/+9
|\ \
| * | use oslo.messaging dispatch filtergordon chung2015-04-082-112/+9
| | | | | | | | | | | | | | | | | | | | | oslo.messaging has the ability to filter notifications prior to dispatching message to endpoints. we should use it. Change-Id: Icafa81cce25e173e109b221010402ceb02023abb
* | | Merge "Avoid conflict with existing gnocchi_url conf value"Jenkins2015-04-091-3/+11
|\ \ \
| * | | Avoid conflict with existing gnocchi_url conf valueChris Dent2015-03-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If for some reason there is an existing ceilometer.conf lying around that has a gnocchi_url setting in the [alarms] section then that value will be used when running the test. We need to use that value when validating the match, not a hardcode host string. Change-Id: I0e23e3c380543fb491468977294cdbe11f58fa07
* | | | Merge "reset croniter to avoid cur time shift"Jenkins2015-04-092-0/+17
|\ \ \ \
| * | | | reset croniter to avoid cur time shiftZhiQiang Fan2015-04-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we evaluate alarms, we check the time constraints, and will check if it is exactly match firstly, but croniter get_prev() and get_next() will change croniter.cur time, then if it is not exactly match, the cur time is no longer the current time, and the second call to get_prev() is not same as first get_prev(), finally, a wrong value may returned. For example, if start="0 11 31 * *", and current time is 2015-03-31T11:30:00, then first get_prev() is 2015-03-31T11:00:00, but second one is 2015-05-01T11:00:00 This patch fixes it by creating a new croniter object with current time. Change-Id: Iaeb1f763ffc33b726d132a234c8e4e08db00a8fe Closes-Bug: #1438674
* | | | | Merge "Further mock adjustments to deal with intermittent failure"Jenkins2015-04-091-1/+2
|\ \ \ \ \
| * | | | | Further mock adjustments to deal with intermittent failureChris Dent2015-04-071-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the py-mysql tox target is run after the py27 tox target it can sometimes fail because a MagicMock was not properly initialized. This change more completely fleshes out the mock so that a TypeError does not occur when a debugging log message is caused. The specifics of why the logging only happens sometimes are not understood. Change-Id: I99f80d794b757a0ac05f7a9b53974ba9913e6e68 Closes-Bug: #1438300
* | | | | pymongo 3.0 breaks ci gateZhiQiang Fan2015-04-092-8/+6
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we pass safe parameter to pymongo.MongoClient but this field is removed in 3.0. the default value is safe=True as of pymongo>=2.4[1]. this patch also cleans up residual ensure_index usage in tests which were leftover from when ttl was not native to mongodb[2] [1] http://emptysqua.re/blog/pymongos-new-default-safe-writes/ [2] I3d91fb08eb51ba6cfd5256abbeca43ed98321412 Closes-Bug: #1441393 Change-Id: I46f6ba28a4986c1f35b726c411d0804f3bb0cbda
* | | | Merge "Use old name of 'hardware.ipmi.node.temperature'"Jenkins2015-04-072-2/+6
|\ \ \ \
| * | | | Use old name of 'hardware.ipmi.node.temperature'Ildiko Vancsa2015-04-032-2/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use old name of the 'hardware.ipmi.node.temperature' as currently there is no proper deprecation process for meters. DocImpact Partially Closes-Bug: #1439766 Change-Id: Ic71bcda4008f1b4090e0d9c8908201440abb02a4
* | | | Merge "Remove 'samples:groupby' from the Capabilities list"Jenkins2015-04-077-7/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove 'samples:groupby' from the Capabilities listIldiko Vancsa2015-04-037-7/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The 'samples:groupby' field in capabilities does not mark a real functionality, but can cause confusion, therefore it is removed from that list. The example in the documentation was also updated. Change-Id: Id902c3c7d55b5ca11bbc8b909b0b07f487887fc1 closes-Bug: #1440031
* | | Revert "remove instance:<flavor> meter"Ildiko Vancsa2015-04-036-0/+124
|/ / | | | | | | | | | | | | | | | | This reverts commit 88dcdb5d70c806b18aeb604040ee85e1ac8e7c51. Partially Closes-Bug: #1439766 DocImpact Change-Id: I59938b9129b23d140a443cf055ea73b3568f00d4
* | Merge "remove instance:<flavor> meter"Jenkins2015-03-316-124/+0
|\ \
| * | remove instance:<flavor> metergordon chung2015-03-286-124/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the groupby functionality allows you to group by instance_type which allows for the equivalent functionality of this meter. we should drop it so we avoid duplicating data. see: I568b5ca3d84371c4fd3bbdfed7b3e801164dbc5e DocImpact Change-Id: Ia380a0b87999f32fd339bb3b596ec8e18fdff0fe Closes-Bug: #1208365
* | | Merge "support ability to skip message signing"Jenkins2015-03-313-2/+26
|\ \ \
| * | | support ability to skip message signinggordon chung2015-03-263-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is significant overhead in signing each datapoint. this patch adds support to skip signing messages by setting the telemetry_secret empty for users who do not need signing or where MQ security is enough. DocImpact Closes-Bug: #1436077 Change-Id: Iec0b995e511085fdce1fc5f9286fddd25ab701f0
* | | | Merge "Avoid a error when py27 and py-mysql tests run in sequence"Jenkins2015-03-311-0/+1
|\ \ \ \
| * | | | Avoid a error when py27 and py-mysql tests run in sequenceChris Dent2015-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An imcompletely MagicMock can lead to: File "ceilometer/network/statistics/opencontrail/client.py", line 107, in _log_res LOG.debug(''.join(dump)) TypeError: sequence item 3: expected string, MagicMock found When the py-mysql tox test target is run after the py27 target. This happens because the Mock is not sufficiently formed for the places where it gets used. The "dump" above needs to have a value for 'reason'. Change-Id: I36fd406a06958e795ecf9aa9ff933eddaa979fc8 Closes-Bug: #1438300
* | | | | Imported Translations from TransifexOpenStack Proposal Bot2015-03-3114-207/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: I6db32b22fe164a4eaff0872b996afa5f29093d0d
* | | | | Merge "Stop using PYTHONHASHSEED=0 in ceilometer tests"Jenkins2015-03-301-3/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Stop using PYTHONHASHSEED=0 in ceilometer testsChris Dent2015-03-301-3/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we have tests that rely on ordering (for example the one fixed in this patchset). Note that this moves the hash seed setting to only be used in docs and venv tox targets. For some reason there is an issue in the tooling used by the docs build that tickles a bug in those tools. Tools which are not part of Ceilometer. To avoid tickling the problem and to move ceilometer along on this bug, we're just going to mask that. The venv target is used by the jenkins job that builds docs. It runs the same build_sphinx setup.py target that the docs target does. Change-Id: If93ec7934ad59515b821f056ca534d3676ee7e03 Closes-Bug: #1348818
* | | | Merge "Optimize the flow of getting pollster resources"Jenkins2015-03-271-7/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Optimize the flow of getting pollster resourcesLianhao Lu2015-03-271-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to call pollster's default discovery to get the resources if the pipeline has already provided them. Change-Id: Ib8959498b9dfd848087484d3348578733b790c29 Closes-Bug: #1437175
* | | | Merge "Added ipv6 support for udp publisher"Jenkins2015-03-272-1/+20
|\ \ \ \
| * | | | Added ipv6 support for udp publisherLianhao Lu2015-03-272-1/+20
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ibbae6c2513ff197aa1a1e66c875f9e0ee8840f63 Closes-Bug: #1436687
* | | | Remove the unnecessary dependency to netaddrLianhao Lu2015-03-271-2/+2
|/ / / | | | | | | | | | | | | | | | Since no one is directly using netaddr, remove that dependency. Change-Id: Ia713af8b98043df0ebfd8e76046dc080dac413a3
* | | Merge "drop deprecated novaclient.v1_1"Jenkins2015-03-261-1/+2
|\ \ \
| * | | drop deprecated novaclient.v1_1ZhiQiang Fan2015-03-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | novaclient.v1_1 has been deprecated and moved to v2 since v2.21.0, a warning message will be printed if we still use it: UserWarning: Module novaclient.v1_1 is deprecated (taken as a basis for novaclient.v2). The preferable way to get client class or object you can find in novaclient.client module. This patch uses novaclient.client.Client and specifies version=2 to replace old novaclient.v1_1.client.Client Change-Id: I0155caaa63b670f9b37c91e2297bd6b988784bf7
* | | | Merge "Using oslo.db retry decorator for sample create"Jenkins2015-03-262-15/+82
|\ \ \ \ | |_|/ / |/| | |
| * | | Using oslo.db retry decorator for sample createRohit Jaiswal2015-03-262-15/+82
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Decorated record_metering_data method of impl_sqlalchemy with oslo.db.api.wrap_db_retry decorator to retry on deadlock errors. This will allow for configurable number of retry attempts when a deadlock occurs while creating a sample. Change-Id: I528ea4576f1daccae8fb53393b3c48ae45c509f5 Closes-Bug: 1432914
* | | Merge "alarm: Use new gnocchi aggregation API"Jenkins2015-03-264-114/+295
|\ \ \
| * | | alarm: Use new gnocchi aggregation APIMehdi Abaakouk2015-03-264-114/+295
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since https://review.openstack.org/#/c/163462/ and https://review.openstack.org/#/c/162649/4 in gnocchi, all kind of aggregations have been moved in the same URI namespace (/v1/aggregation/...) and we can use complex query to make aggregation across multiples metrics. This change sync the ceilometer alarm API and Rules to match these changes. Change-Id: I015af585595e6880b527161fe5c8b34eeb7bfe29
* | | Merge "support disabling profiler and http meters"Jenkins2015-03-262-2/+4
|\ \ \
| * | | support disabling profiler and http metersgordon chung2015-03-232-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is support to disable all non-metric meters. the profiler and http meters should be part of this list but were left out. Change-Id: I0ad0e9d1258b237d5e4d30bf999e0fa67d308227 Closes-Bug: #1434711
View Lorry Controller Status