summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirements2014.2.1OpenStack Proposal Bot2014-12-052-2/+2
| | | | Change-Id: Ifc1ee82a8be88b153bf32f33d9eba4c229b01a1d
* Updated from global requirementsOpenStack Proposal Bot2014-12-032-2/+2
| | | | Change-Id: Ic974528437dc90a548c58749192ce592af51ecde
* Merge "Internal error with period overflow" into stable/junoJenkins2014-12-032-12/+27
|\
| * Internal error with period overflowSrinivas Sakhamuri2014-12-022-12/+27
| | | | | | | | | | | | | | | | | | | | When statistics queried with large period value the overflow causes error 500. This patch converts the overflow error to ClientSideError which is returned as 400 bad input error Change-Id: Iacf89c75428713a151fbe81aa1601df63785f942 Closes-Bug: 1396223 (cherry picked from commit 9f923ae928176ca36ad784fadeea56bfc806e7e1)
* | Merge "Fix signature validation failure when using qpid message queue" into ↵Jenkins2014-12-032-24/+26
|\ \ | | | | | | | | | stable/juno
| * | Fix signature validation failure when using qpid message queueFeng Xi Yan2014-12-022-24/+26
| |/ | | | | | | | | | | | | | | | | | | | | When using qpid message queue, the metering message will get signature validation failure because of extra unicode encoding given by json loads. This change peels off unicode of the message so that this issue can be avoided. Change-Id: Ia23af789460ad8597867902f713b8a78f4a09e06 Closes-Bug: 1373356 (cherry picked from commit 4166da70b30291e8de74cf8c18e27753d0902ace)
* | Merge "Validate AdvEnum & return an InvalidInput on error" into stable/junoJenkins2014-12-033-5/+159
|\ \
| * | Validate AdvEnum & return an InvalidInput on errorPradyumna Sampath2014-12-023-5/+159
| |/ | | | | | | | | | | | | | | | | Raise a relevant exception of InvalidInput while validating if the input to AdvEnum is not one of what is expected. Closes-bug: #1320430 Change-Id: I48f014cc09e7d88e9b0f02fb8e9cf45772178b2c (cherry picked from commit 7cf60e2a3b54b7a763434f65cb045b80074addf1)
* | Change event type for identity trust notificationsIlya Tyaptin2014-12-021-1/+1
|/ | | | | | | | | Our identity trust notification event type do not match keystone event type for these notifications. This patch fix it. Change-Id: I73c4ce9334a26574f3b2c83244ea67b219bec920 Closes-bug: #1392326 (cherry picked from commit 31350c54cb8d56880cd0b72811c532d07f8f5a28)
* Merge "Sync strutils from oslo-incubator for mask_password fix" into stable/junoJenkins2014-11-271-1/+6
|\
| * Sync strutils from oslo-incubator for mask_password fixJames Carey2014-10-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sync pulls in: 1131b56 Enable mask_password to handle byte code strings This is needed because Ceilometer commands are hitting the same problem Cinder was hitting in bug 1368527 which was fixed by this strutils update in bug 1366189. This is not needed in kilo because in kilo Ceilometer has moved to using the oslo.utils library, which has this fix in it. Closes-bug: #1366189 Change-Id: I4aacbe8d44f0ae2a649294652a388fbd5e15b4c9
* | Merge "Add timeout to all http requests" into stable/junoJenkins2014-11-2715-7/+38
|\ \
| * | Add timeout to all http requestsZhiQiang Fan2014-11-2715-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we generate lots of samples by polling data from other services, but theses rest requests have no timeout limitation. We have observed that some requests (for example, keystone due to openssl problem) may stuck for over several days (maybe forever if we don't restart the service). Other pollsters in same thread will not be able to work too. The worst thing is that, when outside (keystone) service becomes normal, Ceilometer cannot recover itself automatically, cloud operator needs to restart it manually. So I strongly suggest that we should add timeout limit to **every** rest api call, this is quite important to improve Ceilometer's robust and reliability. This patch adds a new option named http_timeout, and applies it to almost all http requests in Ceilometer project. Change-Id: I76df2c0a9ffacb252e15edbb125e37ccb2aac4aa Closes-Bug: #1388778 (cherry picked from commit bd0244ffe63b752649ae74f65a46563e986dcb00)
* | | Merge "fix swift middleware parsing" into stable/junoJenkins2014-11-272-4/+7
|\ \ \
| * | | fix swift middleware parsinggordon chung2014-11-252-4/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | swift middleware is incorrectly stripping out 'HTTP_' headers. This patch fixes this. Change-Id: I866d08badd32c83f72f05d113acc684fc40c501d Closes-Bug: #1394453 (cherry picked from commit 6417139b839dba96a6840c745d772e85a4f1d8bc)
* | | Merge "Add encoding to keys in compute_signature" into stable/junoJenkins2014-11-272-1/+11
|\ \ \
| * | | Add encoding to keys in compute_signatureIlya Tyaptin2014-11-272-1/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike fixed sample keys as counter_name and counter_volume, metadata keys may contain unicode characters. ceilometer.publisher.utils.compute_signature can't calculate signature of unicode symbols and crashes. In this patch encoding keys is added. Change-Id: I94d02ce20999510e9c6aaf33f7ee503bbb350e87 Closes-bug: #1391517 (cherry picked from commit 05276690525d76e18769712bc66d0cd535b11f18)
* | | Database.max_retries only override on sqlalchemy sidelqslan2014-11-271-0/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the max_retries parameter will be override in get_connection_from_config function. But it will be used later in safe_mongo_call function. Since the override of max_retries only need on sqlalchemy side, this patch move the override from get_connection_ from_config to storage.impl_sqlalchemy.Connection.__init__ and make sure max_retries can be used on mongoDB side. Change-Id: I83f35c886bc8b7299c1efd7297fdbc980214567f Closes-Bug: #1395972 (cherry picked from commit afb90e0cfc7fadae17ed9d360124e5683cb0b99a)
* | Merge "Add user_metadata to network samples" into stable/junoJenkins2014-11-272-0/+66
|\ \
| * | Add user_metadata to network samplesHang Liu2014-11-262-0/+66
| |/ | | | | | | | | | | | | | | | | | | Previously 'user_metadata' is not included in ceilometer network samples, while it is in other samples. This causes network samples not triggering alarms heat created. Change-Id: Iafb4c42955fceaaf20fef1f9580ddb1331a0c724 Closes-Bug: 1369500 (cherry picked from commit cca6fcd89e0044f310f6b05c62665302582e14e1)
* | Fixes Hyper-V Inspector disk metrics cache issueClaudiu Belu2014-11-252-9/+2
|/ | | | | | | | | | | | Hyper-V Inspector yields a Disk with the property 'device' containing a dictionary. This causes an exception when the values are cached in a dictionary using the said 'device' as a key. Closes-Bug: #1395807 Change-Id: I09b4ec2a37a6f7e6580a059517ab6e606bfc346f (cherry picked from commit a2e11a37aca6d4c0f76376938a147a37b1950ec6)
* Handle poorly formed individual sensor readingsChris Dent2014-10-203-7/+72
| | | | | | | | | | | | | | | | | | | ipmitool returns a series of multiple readings per run. Some of these readings may be of a form that parser code cannot handle. The desired behavior in this case is for the single reading to be dropped and for parsing to continue. This change ensures that behavior by continuing through the loop instead of allowing exceptions to cause the loop to exit. Tests have been added which verify the correct behavior. Note that though there was an opportunity to log each skipped reading this would lead to a very large number of log messages as many or even most samples from ipmitool are not parsed. Change-Id: I6a3193d5a6e12c69ca5c548e5fb58d8bc9646348 Closes-Bug: #1381600 (cherry picked from commit 8323cfe92af2ad27f6611be0a6887cac12b2c630)
* Opening stable/junoThierry Carrez2014-10-162-1/+2
| | | | | | | Bump version to next stable release on juno branch, and set defaultbranch in .gitreview for convenience. Change-Id: I4a6d5ba62f78843876a7775095c8f864432e8acf
* Merge "Fix recording failure for system pollster" into proposed/juno2014.2.rc32014.2proposed/junoJenkins2014-10-141-2/+2
|\
| * Fix recording failure for system pollsterSamta2014-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameter "cumulative" was interpreted as a list and could not be recognized as a valid Type for SQL query hence failing to record the data for the pollster. The presence of ',' operator in the pollster class after the term CUMULATIVE caused it to be treated as a list This is corrected to interpret the field as a string which will be successfully recorded to the meter database. Change-Id: I10a69134a7f0c42a3e6c0d9bb7568e8d8fd2a932 Closes-Bug: 1378742 (cherry picked from commit f8f63d4b15ce68797d6e16943bd85efb19a77752)
* | Add oslo.db to config generatorJulien Danjou2014-10-131-1/+1
|/ | | | | | | | | | Otherwise we miss the oslo.db configuration option in the sample config file. Closes-Bug: 1379808 Change-Id: I3a70e5da42562081002286d37ba1a200150c8cfc (cherry picked from commit f7392e47575c8baa081406b03cf14ce2894a5996)
* Manually updated translations2014.2.rc2Eoghan Glynn2014-10-075-1438/+36
| | | | | | | | | | | | | | | | The workflow boils down to: $ sudo easy_install Babel $ sudo yum install gettext $ python setup.py extract_messages $ python setup.py update_catalog --no-fuzzy-matching \ --ignore-obsolete=true $ source \ ../project-config/jenkins/scripts/common_translation_update.sh $ setup_loglevel_vars $ cleanup_po_files ceilometer Change-Id: Ia16b2b15004e0e0cbd4332ed5106ba04f1736ade
* Merge "Include a 'node' key and value in ipmi metadata" into proposed/junoJenkins2014-10-077-10/+33
|\
| * Include a 'node' key and value in ipmi metadataChris Dent2014-10-077-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ipmi meters use resource_ids which make it challenging to select information for all the sensors of a particular type. This change adds metadata that identifies the physical node on which a sensor exists. There are still remaining issues with the naming of ipmi and sensor-related meters that will need to be addressed separately. Closes-Bug: 1377157 Change-Id: Ib53755112e4757aa53ab60079f3c555e21a72b63 (cherry picked from commit 3b20fa08527170aaca38253277feedf0f2d11217)
* | Merge "clean path in swift middleware" into proposed/junoJenkins2014-10-071-1/+2
|\ \
| * | clean path in swift middlewaregordon chung2014-10-071-1/+2
| |/ | | | | | | | | | | | | | | the path also requires encoding as syslogs still show errors. Closes-Bug: #1369124 Change-Id: Ie4d19a5a7dd5ce29e10c6e082bfcb33e6e641623 (cherry picked from commit dbe8c8b20f4231841d2086fbfd278f3a4cde8324)
* | Merge "Fix OrderedDict usage for Python 2.6" into proposed/junoJenkins2014-10-071-7/+14
|\ \
| * | Fix OrderedDict usage for Python 2.6Thomas Bechtold2014-10-071-7/+14
| |/ | | | | | | | | | | | | | | | | | | | | "import collections" also works on Python 2.6 but collections.OrderedDict() is not available so the current check is wrong. Using a function to get an OrderedDict() instance works fine for that. Closes-Bug: #1375568 Change-Id: Iaf739dc2deb7d4b09bf477be60de4df8c4fcf5c0 (cherry picked from commit 7212f7dc92c1c6fd5d7e36fc270b74efec412d72)
* | Merge "Fix neutron client to catch 404 exceptions" into proposed/junoJenkins2014-10-071-0/+5
|\ \
| * | Fix neutron client to catch 404 exceptionsPradeep Kilambi2014-10-071-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | When network services such as lbaas, fwaas or vpnaas are disabled in neutron, the discovery continues to poll the api calls and gets back a not found exception. The fix here is to catch the exception so it doesn't go unhandled. Change-Id: I8f350b9009f0d8c172836b1dd1123e966f887fdb Closes-Bug: #1374012 (cherry picked from commit b65554eb460a282a2ab0a2dcc0053a8691cb9373)
* | Updated from global requirementsOpenStack Proposal Bot2014-10-062-2/+2
|/ | | | Change-Id: I4a0be4a03e6c3590a7cab8f4548a128fdc31d1ca
* Merge "[HBase] Improves speed of unit tests on real HBase backend"2014.2.rc1Jenkins2014-09-295-6/+148
|\
| * [HBase] Improves speed of unit tests on real HBase backendIlya Tyaptin2014-09-245-6/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, unittests at real HBase are not usually used. Jenkins jobs and a predominant amount of developers use HBase mock. One of the reasons for this is that unittests at real HBase are too slow. It's due to processing of "disable_table" and "delete_table" commands. In HBase these command take up to 1-2 seconds. Now we create all table-set for each test that's why at real HBase unit tests may be executed several hours. So, at real HBase backend unit tests may be executed several hours. My CR speeds up this case. To solve this problem it was decided to keep all test data in one table. To provide a distinguishability of data from different tests unique row-prefix is used for each one. Creating and deleting required table are implements at setup-test-env.sh. Separating data is implemented with mock.patchs which transforms row value in happybase.Table methods. Change-Id: I1883d6e0619b0b2f223a4e58bdc0fc0656636e1f Closes-bug: #1372912
* | Merge "Partition static resources defined in pipeline.yaml"Jenkins2014-09-294-7/+77
|\ \
| * | Partition static resources defined in pipeline.yamlNejc Saje2014-09-294-7/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources statically defined in pipeline.yaml are currently not subject to workload partitioning, so we can't do HA. If we have multiple agents running with the same pipeline.yaml, the samples will be duplicated. This patch partitions the static resources as well. Closes-bug: #1369538 Change-Id: Iff3b33db58302fb2e89b1b3722937a031a70be5f
* | | Merge "Fix bug in the documentation"Jenkins2014-09-272-7/+14
|\ \ \
| * | | Fix bug in the documentationLena Novokshonova2014-09-252-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding information about some daemons of Ceilometer. Change-Id: Ib31588f962d393cb2c1d9ee96e9d62b8898233cc Closes-Bug: 1368938
* | | | Merge "Per-source separation of static resources & discovery"Jenkins2014-09-272-54/+89
|\ \ \ \ | | |/ / | |/| |
| * | | Per-source separation of static resources & discoveryEoghan Glynn2014-09-262-54/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the amalgamation of static resources and discovery extensions defined for all matching pipeline sources were passed to each pollster on each polling cycle. This led to unintended duplication of the samples emitted when an individual pollster matched several sources. Now, we relate the static resources and discovery extensions to the originating sources and only pass these when a pollster is traversed in the context of that source. Similarly, sinks are now related to the originating source and samples are only published over the sinks corresponding to the current sources. Closes-Bug: #1357869 Change-Id: Ie973625325ba3e25c76c90e4792eeaf466ada657
* | | | dbsync: Acknowledge 'metering_connection' optionLianhao Lu2014-09-261-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Support 'metering_connection' option in ceilometer-dbsync. Closes-Bug: #1373269 Change-Id: I02f439ae89f265e088ca539ab355561d1b7b1c31
* | | Merge "Change compute agent recurring logs from INFO to DEBUG"Jenkins2014-09-252-8/+8
|\ \ \
| * | | Change compute agent recurring logs from INFO to DEBUGNejc Saje2014-09-242-8/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | Repeatedly logging all the data about each instance is too verbose for the INFO level, it should use the DEBUG level. Change-Id: I5420c74e364790b2ff0a875337d5cd4d002ab5b5 Closes-Bug: #1373427
* | | Merge "Fix bug with wrong bool opt value interpolation"Jenkins2014-09-251-2/+4
|\ \ \
| * | | Fix bug with wrong bool opt value interpolationDina Belova2014-09-241-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Other way of global debug opt value interpolation is needed for the pecan_debug option, as bool opt interpolation seems to be not working in the oslo.config Closes-Bug: 1373360 Change-Id: I77c4d02b0821b559d7de7329acf11c6d490f51b1
* | | Merge "Removed unused abc meta class"Jenkins2014-09-251-1/+0
|\ \ \
View Lorry Controller Status