summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Updated from global requirements" into stable/junojuno-eol2014.2.4stable/junoJenkins2015-11-102-2/+2
|\
| * Updated from global requirementsOpenStack Proposal Bot2015-10-152-2/+2
| | | | | | | | Change-Id: Icbf1decfeed6dde6a23270b10db8743305c9219d
* | Remove dependency on sphinxcontrib-docbookrestapiCyril Roelandt2015-10-142-2/+0
|/ | | | | | | This Sphinx extension is no longer used nor maintained and can be safely removed. Change-Id: Iacf714ad50c66e68d4d42a2592846f693bf49d31
* remove log message when process notificationZhiQiang Fan2015-09-301-2/+0
| | | | | | | | | message may contain some sensitive information, for example, auth token. This patch removes log entire message in network.notications Change-Id: I7e5f37668ab2a8bcf191ad886ac54352727272f7 Closes-Bug: #1433004 (cherry picked from commit fd2a66f9a3a2d6612a05a3df258c3ce46bb154f2)
* Updated from global requirementsOpenStack Proposal Bot2015-09-182-2/+2
| | | | Change-Id: I5ce68bebf44da78796eb8134f45921fdb0c25e1a
* Updated from global requirementsOpenStack Proposal Bot2015-08-225-105/+104
| | | | Change-Id: I7b50a27dbefbf00e76c837a56f5e456abbf6ab59
* Merge "Add bandwidth to measurements" into stable/junoJenkins2015-07-041-0/+1
|\
| * Add bandwidth to measurementsZhiQiang Fan2015-07-031-0/+1
| | | | | | | | | | | | | | | | | | Bandwidth notification has been implemented since Icehouse, but never presents in documents. Change-Id: Icc187841d8664c48151482259d5b717580115950 Closes-Bug: #1391040 (cherry picked from commit 2b46268cfd7ebfbe185c980083e1e5a7a797372e)
* | Merge "ensure unique list of consumers created" into stable/junoJenkins2015-07-032-1/+24
|\ \
| * | ensure unique list of consumers createdgordon chung2015-07-032-1/+24
| |/ | | | | | | | | | | | | | | | | this patch makes sure that we don't create duplicate consumers when setting up notification listener Change-Id: I3974fb8fcc78d57bbe41e2a234859d15ab8d9db0 Closes-Bug: #1397424 (cherry picked from commit ae99fa648495b69411f2e19333da211ca76bca23)
* | Merge "Rely on VM UUID to fetch metrics in libvirt" into stable/junoJenkins2015-07-039-49/+67
|\ \
| * | Rely on VM UUID to fetch metrics in libvirtmizeng2015-07-039-49/+67
| |/ | | | | | | | | | | | | | | | | | | VM instance name is inconsistent between nova parent node and nova cell node. So it is necessary to rely on VM UUID (which is an unique ID and immutable for VM resource) rather than instance name to fetch system metrics via libvirt’s lookupByUUIDString API. Change-Id: I59dad915185fb191b7712024697e7b15e9e759e4 Closes-bug: #1396473
* | Merge "Use alarm's evaluation periods in sufficient test" into stable/junoJenkins2015-07-032-7/+37
|\ \ | |/ |/|
| * Use alarm's evaluation periods in sufficient testZhiQiang Fan2015-03-162-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we use constant value quorum=1 to check if there are enough datapoints, however, this is not quite right for an alarm rule. Image evaluation periods is set to, for i.e., 3 for an instance on cpu_util greater or equal than 80%. Here are the cases which current may not work as expected: 1. when system start or instance is just created, we may only get one or two samples for the instance 2. when system is somewhere broken, or an instance is restarted (after being shutoff), sample may fail to be collected in some time, so we only get one or two sample in that time range We want to avoid a spurious data peak, for example, instance cpu_util can be 50%, 50%, 50%, 90%, in such case, alarm will not be triggered, but if instance cpu_util is None, None, None, 90%, current code will think alarm should be triggered, which is not consistent and may confuse end users. This patch will put alarm to insufficient data when datapoints are less than evaluation periods. Conflicts: ceilometer/alarm/evaluator/threshold.py NOTE(mriedem): The conflict is due to the oslo.i18n imports on master and oslo.i18n wasn't used in stable/juno so the _LW usage is removed. Change-Id: Ie64a537434493a5965c8e9e165cf028d57689da2 Closes-Bug: #1380216 (cherry picked from commit 553d8d96e60cf354406568ed7dd4c563e768e4d0)
* | Merge "Retry to connect database when DB2 or mongodb is restarted" into ↵Jenkins2015-06-122-29/+39
|\ \ | | | | | | | | | stable/juno
| * | Retry to connect database when DB2 or mongodb is restartedlqslan2015-06-042-29/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch https://review.openstack.org/#/c/122387 works fine with operations with get, record and update functions. But exception would still occured with the operation of db.collection.find() function. This patch can give some benefit to tolerate DB restart with find() function. This patch also removes "test_mongo_find" test case since it doesn't raise AutoReconnect exception at all. Closes-Bug: #1389985 Change-Id: Ia0474726960ce2b4b611fda0a1c304bb8ad96922 (cherry-picked from commit 8c6841d3c00931204eaba0e9058707629120c1da)
* | | Merge "[MongoDB] Fix bug with reconnection to new master node" into stable/junoJenkins2015-06-128-65/+196
|\ \ \ | |/ /
| * | [MongoDB] Fix bug with reconnection to new master nodeIgor Degtiarov2015-05-288-65/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug with raising AutoReconnect exception when MongoDB ReplicaSet loses connection to primary node. Closes-Bug: #1309555 Conflicts: ceilometer/event/storage/impl_db2.py ceilometer/event/storage/impl_mongodb.py ceilometer/storage/__init__.py ceilometer/storage/mongo/utils.py ceilometer/tests/storage/test_pymongo_base.py Conflicts are due to refactoring of the storage drivers and this patch has been modified to account for the refactor. The test case within the file test_pymongo_base.py was removed since equivalent test coverage was included in the cherry picked commit in the test_storage_scenarios.py file. Change-Id: Id0e81ba60b28d09adff6a10d04b412f25257d8ce (cherry-picked from commit 21d882c96cbbaeb8b78ff91e06e3615be97bff07)
* | | Merge "fix the value of query_spec.maxSample to advoid to be zero" into ↵Jenkins2015-06-091-1/+2
|\ \ \ | |/ / |/| | | | | stable/juno
| * | fix the value of query_spec.maxSample to advoid to be zeroyanheven2015-05-281-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code before: VC_REAL_TIME_SAMPLING_INTERVAL = 20 samples_cnt = (int(duration / VC_REAL_TIME_SAMPLING_INTERVAL) if duration else 1) query_spec.maxSample = samples_cnt if we set the value of "interval" in /etc/ceilometer/pipline.yaml to less than 20,the value of "query_spec.maxSample" will be 0,which will cause problem when use it to send request to vsphere server Change-Id: Ibdb586109fe5334f3080539a40ff92badead837b Closes-Bug:#1415307 (cherry picked from commit 53fe9976cc48c3c301b74044bae6c23b8dbb1d63)
* | Updated from global requirementsOpenStack Proposal Bot2015-05-272-11/+11
| | | | | | | | Change-Id: Iba92aa656c6490ad43589bf6ae42bf2aac2ca613
* | Merge "metering data ttl sql backend breaks resource metadata" into stable/junoJenkins2015-05-142-16/+23
|\ \
| * | metering data ttl sql backend breaks resource metadataZhiQiang Fan2015-03-172-16/+23
| |/ | | | | | | | | | | | | | | | | | | | | | | The implementation for sql clear_expired_metering_data() uses delete() on join() for four metatada tables, which will cause clear whole tables no matter what join returns. And it associates metadata id with sample id which makes no sense, the metadata id is resource's internal id. Change-Id: I98219bf27a0a765838d45386b7ae6b6b980b1ae9 Closes-Bug: #1419239 (cherry picked from commit 5a65b4de0fe46967e76832c2acf4924a53b18612)
* | stop mocking os.path in test_setup_events_default_configgordon chung2015-05-111-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | test_setup_events_default_config unnecessarily mocks os.path.exists. this seems to be causing failures when running tox -edebug -- test_setup_events_default_config (and occasionally in gate). it's dangerous to mock os.path because other libs might depend on it so let's stop mocking it. Change-Id: Ibe9027874f597348c5da6c92899cf8740eb678c2 Closes-Bug: #1449604 (cherry picked from commit c3b58d7dd2298d343cf88df22e0a60de060393fc)
* | Catch exception when evaluate single alarmZhiQiang Fan2015-04-173-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if we raise exception when evaluate alarms, the outside method will not catch it, so the higher _evaluate_assigned_alarms catches it, but this will stop evaluating the rest alarms. Alarm should be evaluated no matter whether other alarms succeed or not. This patch adds a try...except block in _evaluate_alarm, it will log exception when it is raised, and the higher method can move on next alarm. Change-Id: Id95865c51dc4ffe2d7089a3ff4fa5b73bd93ae76 Closes-Bug: #1408620 (cherry picked from commit f88f6863eaf70de74e63a11fbce1c23033141aea)
* | Bump stable/juno version to 2014.2.4Adam Gandelman2015-04-131-1/+1
| | | | | | | | Change-Id: I7e095aee85a23d7c5b71c8735857d5d0ee3f79a1
* | Updated from global requirements2014.2.3OpenStack Proposal Bot2015-04-092-2/+2
| | | | | | | | Change-Id: I64677148a23567a882dc256c4672f84bcdb98c97
* | Updated from global requirementsOpenStack Proposal Bot2015-04-084-16/+16
|/ | | | Change-Id: Ib0bc46203bf8e4d0434e488fc7ac4c25dde25130
* Updated from global requirementsOpenStack Proposal Bot2015-02-164-81/+81
| | | | Change-Id: I86b092677a0909d9d37da9408e9f567be6655df7
* Bump stable/juno version to 2014.2.3Matt Riedemann2015-02-091-1/+1
| | | | | Change-Id: Ib8a29258d99de75b49a9b19aef36bb99bc5fcac0 Related-Bug: #1419919
* Updated from global requirements2014.2.2OpenStack Proposal Bot2015-01-281-1/+1
| | | | Change-Id: I1ce32db6f821f53a9cf1ca404f5790adf1128242
* Merge "Do not print snmpd password in logs" into stable/junoJenkins2015-01-281-1/+2
|\
| * Do not print snmpd password in logszjingbj2014-12-041-1/+2
| | | | | | | | | | | | | | | | | | The snmpd password is sensitive information, so we'd better not print it. Change-Id: I4ab11c468ae7e13214303c755e60717bd407cbe8 Closes-Bug: #1398670 (cherry picked from commit 11a64b2142b6f475281c57ab071498487b213cf9)
* | Merge "[DB2 nosql] Create TIMESTAMP type index for 'timestamp' field" into ↵Jenkins2015-01-282-1/+29
|\ \ | | | | | | | | | stable/juno
| * | [DB2 nosql] Create TIMESTAMP type index for 'timestamp' fieldlqslan2015-01-272-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when doing ceilometer-dbsync, ceilometer will create an index for 'timestamp' field of meter collection. But the datatype of the field is set to 'VARCHAR' which is not correct. The patch insert a document with 'timestamp' before creating the index of 'timestamp', then DB2 nosql will create the correct index type for 'timestamp' field. Change-Id: I69dd2fc8d552f5dbb2485c2a5eab55b3bee71e29 Closes-Bug: #1411492 (cherry picked from commit b2fd1dee45c19477223286f8be2118e584d9b3eb)
* | | Updated from global requirementsOpenStack Proposal Bot2015-01-282-2/+2
|/ / | | | | | | Change-Id: I2ce810eba3c23b2ede5d63c4583b8c322fb879ce
* | Merge "Updated from global requirements" into stable/junoJenkins2015-01-222-4/+4
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2015-01-142-4/+4
| | | | | | | | | | | | Change-Id: Ib40f919284e217f1d7a436b39402bd26f07ccffa
* | | Combined fixes for ipmitool, timeutils, and read from stderrEdwin Zhai2015-01-154-13/+18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 3 changes meant to fix various gate issues. Co-Authored-By: lianhao-lu <lianhao.lu@intel.com> The first one is: IPMI unit tests call ipmitool accidently, and sudo requirements cause tox failure. Mock the executing engine completely to fix it. Change-Id: Ifa2f13b324f1e244cc0982bf850de928e37ecca5 Closes-bug:1410411 (cherry picked from commit 9307f9703191f527fbcb9bdae22c59d8911c407d) The second one is: the event api tests incorrectly reference a private attribute from oslo_utils. this is not required and should not be done in general. this patch changes this. Change-Id: I03610078123edbe8ef89e8ea271d9c72ed4ba696 Closes-Bug: #1408737 (cherry picked from commit 160513ddb680ffb66758fb003c58a75b41a89785) The third one is committed here directly as it is only relevant to stable/juno: Increase the amount of stderr read from 1024 to 2048 in test_bin.py These test currently asserts a specific message is contained in the first 1024 bytes of the stderr message. oslo_utils now spits a bunch of deprecation messages that fill this quickly and the message being asserted on is cut off. This bumps the read() from 1024 to 2048 to account for deprecation spam. Change-Id: I03610078123edbe8ef89e8ea271d9c72ed4ba696 (cherry picked from commit 3197c9be0731522a9bb1a47eafa10218893dbe13)
* | Updated from global requirementsOpenStack Proposal Bot2014-12-162-4/+4
| | | | | | | | Change-Id: I47d9ed3b38f79cdb1a71f9959bc31ad7e22a2fb4
* | Bump stable/juno next version to 2014.2.2Alan Pevec2014-12-051-1/+1
| | | | | | | | Change-Id: If016d6f492c2b23d6ce3e77731cd1d9de94a9b18
* | 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)