summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Removed unused abc meta classLianhao Lu2014-09-241-1/+0
| | |/ | |/| | | | | | | | | | | | | AlarmEvaluationService is not using abc.ABCMeta, so remove it. Change-Id: I9df6ac9e5842d03191946f719549d554c51e6540
* | | Merge "update references to auth_token middleware"Jenkins2014-09-252-2/+2
|\ \ \
| * | | update references to auth_token middlewaregordon chung2014-09-232-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | auth_token middleware is deprecated from keystoneclient. this patch updates references to use keystonemiddleware instead. Change-Id: I79b9657cafbc66000ee63b8d16104af9cd32552d Closes-Bug: #1373115
* | | Merge "Use None instead of mutables in method params default values"Jenkins2014-09-254-5/+16
|\ \ \
| * | | Use None instead of mutables in method params default valuesLena Novokshonova2014-09-194-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutables in the method params defaults might cause errors and that's why it's anti-pattern in most of the cases and should be removed. Change-Id: Ib1498e68ab9cc770b237a324b733c85b4a5c6839
* | | | Merge "Imported Translations from Transifex"Jenkins2014-09-248-339/+645
|\ \ \ \ | |_|_|/ |/| | |
| * | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-248-339/+645
| | |/ | |/| | | | | | | Change-Id: I25df9cf375e981d5b9fb81fbb2841ec35bc59730
* | | Merge "Typo "possibilites" should be "possibilities""Jenkins2014-09-241-1/+1
|\ \ \ | |/ / |/| |
| * | Typo "possibilites" should be "possibilities"Rafael Rivero2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Misspelling of "possibilities" found in class QueryAlarmHistoryController in /ceilometer/ceilometer/api/controllers/v2.py Change-Id: I88a6b3f56198c254763d324f1e4df5302f8d1094
* | | Merge "test db2 driver code"Jenkins2014-09-221-1/+3
|\ \ \
| * | | test db2 driver codegordon chung2014-09-191-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | currently, db2 driver code is not being tested. the scenario tests are essentially calling the mongodb driver code twice. Change-Id: I4987bb974e4f8ad6584e7939c14e59f243562fef Closes-Bug: #1371396
* | | Merge "Enable to get service types from configuration file"Jenkins2014-09-2211-17/+102
|\ \ \
| * | | Enable to get service types from configuration fileHisashi Osanai2014-09-1911-17/+102
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When services are registered to keystone without using default service types, pollsters for the services don't work. This fix enables the pollsters to get service types from ceilometer.conf. If there is no entry in the file, the default service types will be used. Change-Id: Iab30b6e749f5d2af4ecb0bbf6fe1a137793f4c2c Closes-Bug: 1353356 DocImpact: Add new parameters in ceilometer.conf
* | | Merge "[HBase] Catch AlreadyExists error in Connection upgrade"Jenkins2014-09-203-5/+29
|\ \ \
| * | | [HBase] Catch AlreadyExists error in Connection upgradeIlya Tyaptin2014-09-193-5/+29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now in upstream, if HBase table exists when we upgrade backend AlreadyExists exception is raised. Also exception raising interrupts creating of other tables. It is an incorrect behavior because we should create all tables and migrate them if need or use existing tables. Change-Id: I8e8a8ae633351de8393b5103910510dd635245be Closes: bug #1370508
* | | Merge "clean up swift middleware to avoid unicode errors"Jenkins2014-09-192-2/+30
|\ \ \
| * | | clean up swift middleware to avoid unicode errorsgordon chung2014-09-192-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the swift middleware does not handle environment variables correctly. this is causing ceilometer errors to be thrown in syslogs in the check-swift-dsvm-full tests. this patch adds in unicode support. Closes-Bug: #1369124 Change-Id: Icf0874efcc69d9889df591b2cb4bbdd3930eaf68
* | | | Updated from global requirementsOpenStack Proposal Bot2014-09-194-30/+30
|/ / / | | | | | | | | | Change-Id: I793b6d86096209c55c934f818242ae3bc58fc56f
* | | Merge "Docs: Add description of pipeline discovery section"Jenkins2014-09-192-5/+30
|\ \ \
| * | | Docs: Add description of pipeline discovery sectionLianhao Lu2014-09-192-5/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Added description of pipeline discovery section, also corrected some minor errors. Closes-Bug: #1371373 Change-Id: I7370d1464fc5723c9535f0c90b3e4c2281361e42
* | | Merge "Modified docs to update DevStack's config filename"Jenkins2014-09-191-10/+20
|\ \ \ | |/ / |/| |
| * | Modified docs to update DevStack's config filenameJoanna H. Huang2014-09-181-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | As reported in the bug, the documentation needs to be updated with new config file DevStack uses. This patch simply updates information in "Installing and Running the Development Version" page. Change-Id: I5ee8f528be44b4fe801b38c748fff7314980a93e Closes-Bug: #1370476
* | | Add an API configuration section to docsChris Dent2014-09-181-1/+16
| |/ |/| | | | | | | | | | | | | Uses the help text from where the options are defined. Closes-Bug: #1370030 Change-Id: I77e048ea37492c32a8d81c5d27262a4398ffaf3a
View Lorry Controller Status