summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ensure user metadata mapped for instance notifications" into ↵havana-eol2013.2.4stable/havanaJenkins2014-09-205-84/+300
|\ | | | | | | stable/havana
| * Ensure user metadata mapped for instance notificationsEoghan Glynn2014-04-035-84/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1284073 For pollster-originated samples related to instances, we apply a mapping to the user metadata so as to ensure that there are no embedded periods in metadata keys and also to exclude any metadata not matching the configured reserved namespace. Now this logic is also applied to user metadata for samples derived from instance-related notifications in order to avoid failures when persisting these data in mongodb. (cherry picked from commit ddeb54bb0d2c4203332a5ecc09a4aedfce353a4c) Change-Id: I77eab59023fa23c5879b05c948bd4cb1db7fa177
* | Updated from global requirementsOpenStack Proposal Bot2014-09-131-1/+1
| | | | | | | | Change-Id: Iee84a0882e82784928418fecd83d862c0ce1e8c0
* | Merge "Set python hash seed to 0 in tox.ini" into stable/havanaJenkins2014-08-201-1/+3
|\ \
| * | Set python hash seed to 0 in tox.iniClark Boylan2014-07-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New tox (>=1.7.0) sets a random python hash seed by default. This is generally good for testing because it will help keep projects working regardless of the hash seed, but ceilometer unittests don't currently pass with a random hash seed so set it to the python default seed. This change will allow us to use new tox again and remove the restriction on tox<=1.6.1 to run unittests. Redundant setenvs for specific test envs are removed to prevent them from overriding the PYTHONHASHSEED value. Note this change will need to be backported to the stable branches to keep unittests there working with new tox as well. Conflicts: tox.ini Change-Id: Ibc613d77ad52d5f7d8d613f3dd66ffba4117ff72 (cherry picked from commit 860a2852ca92df20fa886cec2e75d753ac6e18bb)
* | | Merge "Update ensure()/reconnect() to catch MessagingError" into stable/havanaJenkins2014-08-151-3/+3
|\ \ \
| * | | Update ensure()/reconnect() to catch MessagingErrorNejc Saje2014-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error handling code that gets connections reset if necessary caught ConnectionError. It really needs to catch MessagingError, which ConnectionError inherits from. There are other types of MessagingErrors that may occur, such as InternalError, and they need to cause the connection to reset, as well. This fix has already been merged into oslo.messaging. -- Cherry-picked from oslo-incubator 234f64d608266f43d8856ff98c89ceba6699d752 See also https://bugzilla.redhat.com/show_bug.cgi?id=1086077 Closes-bug: #1303890 Change-Id: Ic5082b74a362ded8b35cbc75cf178fe6e0db62d0
* | | | Merge "Disable specifying alarm itself in combination rule" into stable/havanaJenkins2014-07-312-0/+33
|\ \ \ \
| * | | | Disable specifying alarm itself in combination ruleZhiQiang Fan2014-06-112-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, update combination alarm can specify itself in alarm_ids, however, that will cause endless loop when evaluating this alarm. This patch adds a check to disable such behavior. Change-Id: I63b465c59fe39206ae04b0736482d1ffd7bf59c4 Closes-Bug: #1304419 (cherry picked from commit de8176fa736ffa9c4d6b0a57a8db2f58083f124a)
* | | | | Merge "Fixes Hyper-V metrics units" into stable/havanaJenkins2014-07-314-19/+21
|\ \ \ \ \
| * | | | | Fixes Hyper-V metrics unitsClaudiu Belu2014-07-304-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the units of the values returned for the network and disks data to bytes as expected. Closes-Bug: #1289015 (cherry picked from commit f55e3510bbee39d3101fcbf2283fc037c7a42c99) Change-Id: If4950d05213a345900b3450c83450345e04560fc
* | | | | | Merge "Fixes Hyper-V Inspector network metrics values" into stable/havanaJenkins2014-07-312-12/+46
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Fixes Hyper-V Inspector network metrics valuesClaudiu Belu2014-03-312-12/+46
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Hyper-V inspector is currently returning the wrong metric values. The current values are the aggregated ones, which is not correct in scenarios in which instances have more than one nic. Furthermore, values were taken from the Msvm_EthernetPortAllocationSettingData, instead of Msvm_EthernetSwitchPortAclSettingData. (cherry picked from commit 01190ccee364dc061038ef7d8f3cc701c8d447ba) Change-Id: I669ff52a1be2ee56bf69aa3b680ab42fdcaf1cb7 Closes-bug: #1289014
* | | | Sync RPC module from osloNejc Saje2014-07-252-4/+9
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change syncs the following patches from stable/havana oslo RPC: - I67923cb024bbd143edc8edccf35b9b400df31eb3 - Ia148baa6e1ec632789ac3621c85173c2c16f3918 RabbitMQ: advance thru the list of brokers on reconnect In RabbitMQ implementation, when using multiple rabbit_hosts, we don't want to immediately retry failed connection for the same failed broker. This was not the case in existing implementation though, where we've always attempted to reconnect starting from the first broker in the list of candidates. So if the first broker failed, we initiated reconnect to the same failed broker. This change makes reconnect() implementation to select the next broker in the list. This also means that non-failure reconnect attempts will also switch the current broker. All in all, users should not rely on any particular order to use brokers from the list, so this should not constitute an issue. Qpid: advance thru the list of brokers on reconnect In Qpid implementation, when using multiple qpid_hosts, we don't want to immediately retry failed connection for the same failed broker. This was not the case in existing implementation though, where we've always attempted to reconnect starting from the first broker in the list of candidates. So if the first broker failed, we initiated reconnect to the same failed broker. This change makes reconnect() implementation to select the next broker in the list. This also means that non-failure reconnect attempts will also switch the current broker. All in all, users should not rely on any particular order to use brokers from the list, so this should not constitute an issue. Partial-Bug: #1261631 Change-Id: Icde6b3a1fa173be2a3ccc729b7ed739dd4f4aa11
* | | Updated from global requirementsOpenStack Proposal Bot2014-07-231-1/+1
| | | | | | | | | | | | Change-Id: I2e0056a9c0514ed8697166827e5623e4cd3d913e
* | | Merge "Ensure routing key is specified in the address for a direct producer" ↵Jenkins2014-07-231-1/+1
|\ \ \ | | | | | | | | | | | | into stable/havana
| * | | Ensure routing key is specified in the address for a direct producerRussell Bryant2014-06-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is already merged in oslo-incubator. Note that for Ceilometer this is an Icehouse-specific patch since master has already been updated to use the oslo.messaging library. Original commit message body includes: Porting this fix from oslo.messaging. This fixes the impl_qpid.py driver to allow it to work with the latest stable upstream QPID broker (version 0.28). See the Apache Qpid Jira bug https://issues.apache.org/jira/browse/QPID-5557 Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7 Related-Bug: #1300318 (cherry picked from commit 096106f72fad5975bd0cb8ffa3447931c8fee9f5)
* | | Use swift masterJulien Danjou2014-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Swift is not available on PyPI, so use the tarball from master instead. Change-Id: I1721804890423c242bb69697d2c42ca57d0871a4 (cherry picked from commit 28f6bee013c55ac9f4b4545293fd8849da45c961)
* | | remove token from notifier middlewareGrant Murphy2014-06-232-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | oslo-incubator sync to address the security bug in middleware (as below). notifier middleware is capturing token and sending it to MQ. this is not advisable so we should filter it out. Change-Id: Ia1bfa1bd24989681db1d2f385defc12e69a01f8d Closes-Bug: #1321080
* | Fix testing gate due to new keystoneclient releaseDina Belova2014-06-041-2/+4
| | | | | | | | | | | | | | | | As new keystoneclient version was released, token now requires 'expires' field to be set. Change-Id: I57a7746d24b82763824a02ac3d02049b055288c7 (cherry picked from commit 5a78832251e8cdf2dfbcc8b3a24ad8c4e7e3439c)
* | Allow alarm threshold value set to 0ZhiQiang Fan2014-04-282-1/+42
| | | | | | | | | | | | | | | | | | | | Currently, if we set alarm threshold value to 0, it will return 400 with threshold_rule/threshold is mandatory, which is not suitable. This patch corrects the check to only fail if mandatory field is not set or is None. Change-Id: Id141937337435f41fa7c246d8f0485fdd3bb118b Closes-Bug: #1313492
* | Merge "Bump stable/havana next version to 2013.2.4" into stable/havanaJenkins2014-04-241-1/+1
|\ \
| * | Bump stable/havana next version to 2013.2.4Adam Gandelman2014-04-211-1/+1
| | | | | | | | | | | | Change-Id: I417ebd3e87ae9d4e2c207c59298a205554536fa0
* | | Use known protocol scheme in keystone testsEoghan Glynn2014-04-192-8/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | With the recent introduction of the identity_uri in keystoneclient, there is a small backward incompatible change which means that weird protocols like the ones we use during tests aren't support properly anymore. The patch replaces "foottp" and "barttp" by "file" hopefully keeping testing coverage the same. Change-Id: Idb30ff3ee0ca50911e453899ad32e630f9b18724 Closes-Bug: #1309092 (cherry picked from commit e5b7606eaa94033256eb1aca5f6a6eed4f9e54a0) (cherry picked from commit a1ec218d683e27434a5b085f1fbc7e3c13b60684)
* | Merge "User a more accurate max_delay for reconnects" into stable/havana2013.2.3Jenkins2014-04-021-1/+1
|\ \
| * | User a more accurate max_delay for reconnectsFlavio Percoco2014-04-011-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an HA deployment, a 60 seconds delay between reconnects can be quite problematic. This patch changes the delay calculation by setting the max delay to 5s and by changing the way it is increased. Unfortunately, this is one of the places where both our main drivers are not consistent. Rabbit's driver uses configuration parameters for this whereas qpid's driver has never had one. However, I would prefer not adding configuration paremeters to qpid's driver for the following reasons: 1. Most of OpenStack services depend on the messaging layer, hence they need it to be available. A 5s delay seems to be reasonable and I could argue the need of tune it further. Although so frequent reconnects can add load to the network, that wouldn't be the main issue if one of the brokers go down. 2. We're trying to move away from configuration options towards using transport URL. This path is still not clear and I would prefer avoiding adding new options until we clear it out. Closes-bug: #1281148 Change-Id: I537015f452eb770acba41fdedfe221628f52a920 (cherry picked from commit 93471a2f3ee1bf4d41fa1a21375eaba3942b003a)
* | latest alembic imcompatible with current sqlalchemy requirementsGordon Chung2014-04-011-1/+1
|/ | | | | | | | | ceilometer migrations are failing in stable/havana build because latest alembic release utilises code added in sqlalchemy>=0.9.2. set upper bound for alembic to avoid issue. Change-Id: Icc9e647d0c2ff418ead544fe671f3f2fe3c22da2 Closes-Bug: #1300105
* Merge "Fix validation error for invalid field name in simple query" into ↵Jenkins2014-03-283-24/+109
|\ | | | | | | stable/havana
| * Fix validation error for invalid field name in simple queryIldiko Vancsa2014-03-253-24/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | The field name validation code runs only in case of the operator that is specified for the invalid field name, is 'eq'. Otherwise the validation ends with an invalid operator error. The field name validation code was modified to check the field name first and only checks the operators for valid field names. Closes-bug: #1294628 Change-Id: Id34ae882940b36dec3ea81043b0d29b996a38426 (cherry picked from commit 50cffbc08f24ff8e3935aabecdf4be0fb366116d)
* | Merge "Ensure the correct error message is displayed" into stable/havanaJenkins2014-03-282-0/+22
|\ \
| * | Ensure the correct error message is displayedMehdi Abaakouk2014-03-072-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a untranslated error message pass through the translation pecan hook, the previous translated error is send to the client. This patch fix that by reseting the "translatable_error" of the translation pecan hook before each request. Conflicts: tests/api/v2/test_app.py Change-Id: Icee79cf09fd696655048c7c0cf8a3d6706e31701 Fixes: bug #1260398 (cherry picked from commit 02d017022bab577b581b58f42b468bf0b2c644a9)
* | | Merge "Adds doc string to query validate functions in V2 API" into stable/havanaJenkins2014-03-281-10/+56
|\ \ \ | | |/ | |/|
| * | Adds doc string to query validate functions in V2 APIIldiko Vancsa2014-03-251-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename is_timestamp_valid parameter to allow_timestamps and add doc string to _validate_query and _validate_timestamp_fields functions, related to the bugfix of bug 1280975. Change-Id: I7c8564ce88d048e5b7d6d1e3c7109c5cb08e48f3 (cherry picked from commit bd3997c088710c741d3438a2cd98658f18e69e68)
* | | Merge "Checks for presence of Hyper-V cpu metrics before accessing" into ↵Jenkins2014-03-281-3/+3
|\ \ \ | | | | | | | | | | | | stable/havana
| * | | Checks for presence of Hyper-V cpu metrics before accessingClaudiu Belu2014-03-271-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Adds a default value if there are no cpu metrics to be retrieved. Closes-Bug: 1249959 (cherry picked from commit f15e2cc9248c99e9b5c6b371ecce4f0ed49450cc) Change-Id: I39513648ab25d46b2639b24a94e7344954ce3aeb
* | | Merge "Fixes Hyper-V Inspector disk metrics bug" into stable/havanaJenkins2014-03-271-2/+2
|\ \ \
| * | | Fixes Hyper-V Inspector disk metrics bugClaudiu Belu2014-03-261-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed disk metric names used by Hyper-V utils. Was using wrong metric names before. 'Aggregated Disk Data Read/Written' metrics refers to all disks (sum), while the metrics needs to be per disk. (cherry picked from commit 39c0ca654743513ab158fac399813a1a557ab61e) Change-Id: I4ec36152a8b8147069151dd6eb98f36f7aab9229 Closes-Bug: 1250336
* | | Fix ceilometer.conf.sample mismatchIldiko Vancsa2014-03-271-1/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceilometer.conf.sample mismatch issue makes the tests failing. This patch removes the checkupdate.sh test from tox.ini, like it was removed from nova too, until having a proper solution for handling the changes in ceilometer.conf.sample, to fix the gate quickly. Closes-Bug: #1297999 (cherry picked from commit 63ff15ed95f71f5272c64b82ff148d35f75782d4) Conflicts: tox.ini Change-Id: Ia638fb19ce25788a418b59509ec3527e643aac4e
* | Merge "Fix the default rpc policy value" into stable/havanaJenkins2014-03-182-5/+14
|\ \
| * | Fix the default rpc policy valueMehdi Abaakouk2014-03-122-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, each time a service that use ceilometer.publisher.rpc start this annoying message appear because the default value is not the correct. WARNING ceilometer.publisher.rpc [-] Publishing policy is unknown (wait) force to default WARNING ceilometer.publisher.rpc [-] Publishing policy is unknown (wait) force to default This patch set the correct default (to default inteads of wait), and check in tests that the expected logger method is called. Fixes bug #1245965 Change-Id: I41b9461359c7b0b17eb8e9dad1772bafdc3554fc (cherry picked from commit 30ecd2f76633b8854401c6254210aaa5a7920be0)
* | | Ensure insecure config option propagated by alarm serviceEoghan Glynn2014-03-141-0/+1
|/ / | | | | | | | | | | | | | | | | | | Fixes bug 1292130 Ensure insecure (i.e. non-cert-verifying) access over SSL to keystone works from the alarm evaluator (cherry picked from commit eb14d7e80502f8b57f7c79f9120cf3f30f7e872b) Change-Id: Ice009ad97ea540afede697e9d812f1bde877dd84
* | Merge "Propogate cacert and insecure flags to glanceclient" into stable/havanaJenkins2014-03-061-1/+4
|\ \ | |/ |/|
| * Propogate cacert and insecure flags to glanceclientEoghan Glynn2014-02-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1278973 Previously, the insecure flag was only propagated to the keystoneclient while the cacert flag was only propagated to the keystoneclient and the ceilometerclient used by alarming. Since the glanceclient also supports these options, these flags should be propogated to it also to avoid SSL cert verification failures when the central agent calls out to glance over https. Change-Id: I967ba080a4011a54b5789ca0fc20cb9a37dafb15 (cherry picked from commit b000317f670f635b00ca52a4539a0b83b14c8ff4)
* | Merge "Refactor timestamp existence validation in V2 API" into stable/havanaJenkins2014-03-063-26/+121
|\ \
| * | Refactor timestamp existence validation in V2 APIIldiko Vancsa2014-02-203-26/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in AlarmThresholdRule in v2.py, the timestamp_keys were defined with a missing comma: ['timestamp', 'start', 'start_timestamp' 'end', 'end_timestamp']. The validation, if the timestamp field is used or not, was unclear in the current implementation. A new parameter, 'timestamp_is_valid', was added to the validation functions to show, if the timestamp is allowed to use or not in the validated query. Fixes bug 1280975 (cherry picked from commit b1834e55fce08f1536c7d9392ae035b9583be8ed) Change-Id: I2aaef54354926f9afe3bb1d4fae8f8aa0ae600ab
* | | Merge "cacert is not picked up correctly by alarm services" into stable/havanaJenkins2014-03-062-2/+2
|\ \ \
| * | | cacert is not picked up correctly by alarm servicesEoghan Glynn2014-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to bug 1266472 which changes client to look only at os_cacert arg. update alarm services to use just os_cacert as well. Change-Id: Id28a0838330296fe030fa7c4a35a216dd3e64bad Closes-Bug: #1266477 (cherry picked from commit 89f9b3049ac7a395c470f8d323b44e8128e5b1b2)
* | | | Merge "Add an insecure option for Keystone client" into stable/havanaJenkins2014-03-063-1/+11
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add an insecure option for Keystone clientJulien Danjou2014-02-143-1/+11
| |/ | | | | | | | | | | Change-Id: I05cea4c79ad89d2c55008ea0d7ba9eefa5908fa2 Closes-Bug: #1232437 (cherry picked from commit d48b4a3a4e5d0b80c3644844e0f1c8e3806c78d6)
* | Bump stable/havana next version to 2013.2.3Alan Pevec2014-02-131-1/+1
|/ | | | Change-Id: Ia5b940faf01df6cae58df1f4b4f5e8fa2f3f078a
View Lorry Controller Status