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)
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)
"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)
commit cac21417118c9aa72705088f8d04ff5250d93123
Author: Chris Dent <email address hidden>
Date: Mon Oct 6 20:00:08 2014 +0100
Include a 'node' key and value in ipmi metadata
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)
Reviewed: https:/ /review. openstack. org/128905 /git.openstack. org/cgit/ openstack/ ceilometer/ commit/ ?id=e67bdae2a24 30d5d7763e83daa 202bcb5cebf619
Committed: https:/
Submitter: Jenkins
Branch: master
commit 9899b6f12f50727 87ac72a1a64d4a7 12db222cb3
Author: Samta <email address hidden>
Date: Wed Oct 8 16:27:12 2014 +0530
Fix recording failure for system pollster
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: I10a69134a7f0c4 2a3e6c0d9bb7568 e8d8fd2a932 97d6e16943bd85e fb19a77752)
Closes-Bug: 1378742
(cherry picked from commit f8f63d4b15ce687
commit 619291bd6c5d977 5aaa9fcc2b47e81 20e6f3443d
Author: Julien Danjou <email address hidden>
Date: Fri Oct 10 16:25:58 2014 +0200
Add oslo.db to config generator
Otherwise we miss the oslo.db configuration option in the sample config
file.
Closes-Bug: 1379808
Change-Id: I3a70e5da425620 81002286d37ba1a 200150c8cfc a081406b03cf14c e2894a5996)
(cherry picked from commit f7392e47575c8ba
commit 5b966ba778ad9e8 7a41fc639a64e68 f84d6ca8e2
Author: Eoghan Glynn <email address hidden>
Date: Tue Oct 7 16:25:34 2014 +0000
Manually updated translations
The workflow boils down to:
$ sudo easy_install Babel
--ignore- obsolete= true
../project- config/ jenkins/ scripts/ common_ translation_ update. sh
$ sudo yum install gettext
$ python setup.py extract_messages
$ python setup.py update_catalog --no-fuzzy-matching \
$ source \
$ setup_loglevel_vars
$ cleanup_po_files ceilometer
Change-Id: Ia16b2b15004e0e 0cbd4332ed5106b a04f1736ade
commit aa15b2d7ed02822 b72f878e889b3a7 7c97b4a6c5
Author: Pradeep Kilambi <email address hidden>
Date: Tue Sep 30 11:24:20 2014 -0700
Fix neutron client to catch 404 exceptions
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: I8f350b9009f0d8 c172836b1dd1123 e966f887fdb a2ab0a2dcc0053a 8691cb9373)
Closes-Bug: #1374012
(cherry picked from commit b65554eb460a282
commit fc22a04cfbab9a8 68347bea78a0b55 c2b3316ef1
Author: Thomas Bechtold <email address hidden>
Date: Mon Sep 29 10:53:50 2014 +0200
Fix OrderedDict usage for Python 2.6
"import collections" also works on Python 2.6 but .OrderedDict( ) is not available so the current check is
collections
wrong. Using a function to get an OrderedDict() instance works fine for
that.
Closes-Bug: #1375568 b09bf477be60de4 df8c4fcf5c0 d5d7e36fc270b74 efec412d72)
Change-Id: Iaf739dc2deb7d4
(cherry picked from commit 7212f7dc92c1c6f
commit cac21417118c9aa 72705088f8d04ff 5250d93123
Author: Chris Dent <email address hidden>
Date: Mon Oct 6 20:00:08 2014 +0100
Include a 'node' key and value in ipmi metadata
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 aa53ab60079f3c5 55e21a72b63 aca38253277feed f0f2d11217)
Change-Id: Ib53755112e4757
(cherry picked from commit 3b20fa08527170a
commit e6078929fd3235e ab7f2b5f136a5c9 df347bf94c
Author: gordon chung <email address hidden>
Date: Mon Sep 29 18:39:03 2014 -0400
clean path in swift middleware
the path also requires encoding as syslogs still show errors.
Closes-Bug: #1369124 29e10c6e082bfcb 33e6e641623 41d2086fbfd278f 3a4cde8324)
Change-Id: Ie4d19a5a7dd5ce
(cherry picked from commit dbe8c8b20f42318
commit 0e499f88d1f197a ba5910723730200 9afcc2b500
Author: OpenStack Proposal Bot <email address hidden>
Date: Mon Oct 6 16:08:39 2014 +0000
Updated from global requirements
Change-Id: I4a0be4a03e6c35 90a7cab8f4548a1 28fdc31d1ca