diff -Nru ceilometer-13.0.0/AUTHORS ceilometer-13.1.0/AUTHORS --- ceilometer-13.0.0/AUTHORS 2019-10-16 12:40:07.000000000 +0000 +++ ceilometer-13.1.0/AUTHORS 2020-02-27 12:56:51.000000000 +0000 @@ -24,6 +24,7 @@ Angus Salkeld Ann Kamyshnikova Arnaud Morin +Artem Vasilyev Artur Svechnikov Ashwin Agate Balazs Gibizer @@ -163,6 +164,7 @@ Jon Schlueter Jonte Watford JordanP +Jorge Niedbalski Joseph Richard Joshua Harlow JuPing @@ -250,6 +252,7 @@ Petr Kovar Petr Kuběna Phil Neal +Pierre Riteau Pierre Riteau Piyush Masrani Pradeep Kilambi @@ -347,6 +350,7 @@ XieYingYun Yaguang Tang Yaguang Tang +Yanos Angelopoulos Yanyan Hu Yarko Tymciurak Yassine Lamgarchal diff -Nru ceilometer-13.0.0/ceilometer/compute/discovery.py ceilometer-13.1.0/ceilometer/compute/discovery.py --- ceilometer-13.0.0/ceilometer/compute/discovery.py 2019-10-16 12:39:14.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/compute/discovery.py 2020-02-27 12:55:00.000000000 +0000 @@ -24,7 +24,6 @@ from oslo_log import log from oslo_utils import timeutils - try: import libvirt except ImportError: @@ -147,7 +146,7 @@ raise LOG.error( "Fail to get domain uuid %s metadata, libvirtError: %s", - domain.UUIDString(), e.message) + domain.UUIDString(), e) continue full_xml = etree.fromstring(domain.XMLDesc()) diff -Nru ceilometer-13.0.0/ceilometer/gnocchi_client.py ceilometer-13.1.0/ceilometer/gnocchi_client.py --- ceilometer-13.0.0/ceilometer/gnocchi_client.py 2019-10-16 12:39:14.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/gnocchi_client.py 2020-02-27 12:55:00.000000000 +0000 @@ -240,6 +240,12 @@ "value": {"type": "string", "min_length": 0, "max_length": 255, "required": False} }]}, + {"desc": "add loadbalancer resource type", + "type": "create_resource_type", + "resource_type": "loadbalancer", + "data": [{ + "attributes": {} + }]}, ] # NOTE(sileht): We use LooseVersion because pbr can generate invalid diff -Nru ceilometer-13.0.0/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po ceilometer-13.1.0/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po --- ceilometer-13.0.0/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po 2019-10-16 12:39:14.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po 2020-02-27 12:55:00.000000000 +0000 @@ -6,15 +6,16 @@ # Andi Chandler , 2013-2014 # Andreas Jaeger , 2016. #zanata # Andi Chandler , 2017. #zanata +# Andi Chandler , 2019. #zanata msgid "" msgstr "" "Project-Id-Version: ceilometer VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" -"POT-Creation-Date: 2018-09-19 00:45+0000\n" +"POT-Creation-Date: 2019-09-27 17:22+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2017-11-30 10:30+0000\n" +"PO-Revision-Date: 2019-11-14 11:10+0000\n" "Last-Translator: Andi Chandler \n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -160,6 +161,9 @@ msgid "Required fields %s not specified" msgstr "Required fields %s not specified" +msgid "Sample Check" +msgstr "Sample Check" + #, python-format msgid "The field 'fields' is required for %s" msgstr "The field 'fields' is required for %s" diff -Nru ceilometer-13.0.0/ceilometer/publisher/data/gnocchi_resources.yaml ceilometer-13.1.0/ceilometer/publisher/data/gnocchi_resources.yaml --- ceilometer-13.0.0/ceilometer/publisher/data/gnocchi_resources.yaml 2019-10-16 12:39:14.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/publisher/data/gnocchi_resources.yaml 2020-02-27 12:55:00.000000000 +0000 @@ -395,3 +395,15 @@ attributes: controller: resource_metadata.controller switch: resource_metadata.switch + + - resource_type: loadbalancer + metrics: + network.services.lb.outgoing.bytes: + network.services.lb.incoming.bytes: + network.services.lb.pool: + network.services.lb.listener: + network.services.lb.member: + network.services.lb.health_monitor: + network.services.lb.loadbalancer: + network.services.lb.total.connections: + network.services.lb.active.connections: \ No newline at end of file diff -Nru ceilometer-13.0.0/ceilometer/publisher/prometheus.py ceilometer-13.1.0/ceilometer/publisher/prometheus.py --- ceilometer-13.0.0/ceilometer/publisher/prometheus.py 2019-10-16 12:39:18.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/publisher/prometheus.py 2020-02-27 12:55:00.000000000 +0000 @@ -55,9 +55,11 @@ elif s.type == sample.TYPE_GAUGE: metric_type = "gauge" - if metric_type and s.name not in doc_done: - data += "# TYPE %s %s\n" % (s.name, metric_type) - doc_done.add(s.name) + curated_sname = s.name.replace(".", "_") + + if metric_type and curated_sname not in doc_done: + data += "# TYPE %s %s\n" % (curated_sname, metric_type) + doc_done.add(curated_sname) # NOTE(sileht): prometheus pushgateway doesn't allow to push # timestamp_ms @@ -67,10 +69,10 @@ # datetime.utcfromtimestamp(0) # ).total_seconds() * 1000 # data += '%s{resource_id="%s"} %s %d\n' % ( - # s.name, s.resource_id, s.volume, timestamp_ms) + # curated_sname, s.resource_id, s.volume, timestamp_ms) data += '%s{resource_id="%s"} %s\n' % ( - s.name, s.resource_id, s.volume) + curated_sname, s.resource_id, s.volume) self._do_post(data) @staticmethod diff -Nru ceilometer-13.0.0/ceilometer/tests/unit/publisher/test_prometheus.py ceilometer-13.1.0/ceilometer/tests/unit/publisher/test_prometheus.py --- ceilometer-13.0.0/ceilometer/tests/unit/publisher/test_prometheus.py 2019-10-16 12:39:18.000000000 +0000 +++ ceilometer-13.1.0/ceilometer/tests/unit/publisher/test_prometheus.py 2020-02-27 12:55:00.000000000 +0000 @@ -65,6 +65,17 @@ timestamp=datetime.datetime.now().isoformat(), resource_metadata={'name': 'TestPublish'}, ), + sample.Sample( + name='delta.epsilon', + type=sample.TYPE_GAUGE, + unit='', + volume=7, + user_id='test', + project_id='test', + resource_id=resource_id, + timestamp=datetime.datetime.now().isoformat(), + resource_metadata={'name': 'TestPublish'}, + ), ] def setUp(self): @@ -88,7 +99,9 @@ beta{resource_id="%s"} 3 # TYPE gamma gauge gamma{resource_id="%s"} 5 -""" % (self.resource_id, self.resource_id, self.resource_id) +# TYPE delta_epsilon gauge +delta_epsilon{resource_id="%s"} 7 +""" % (self.resource_id, self.resource_id, self.resource_id, self.resource_id) expected = [ mock.call('http://localhost:90/metrics/job/os', @@ -118,7 +131,9 @@ beta{resource_id="%s"} 3 # TYPE gamma gauge gamma{resource_id="%s"} 5 -""" % (self.resource_id, self.resource_id, self.resource_id) +# TYPE delta_epsilon gauge +delta_epsilon{resource_id="%s"} 7 +""" % (self.resource_id, self.resource_id, self.resource_id, self.resource_id) expected = [ mock.call('https://localhost:90/metrics/job/os', diff -Nru ceilometer-13.0.0/ceilometer.egg-info/pbr.json ceilometer-13.1.0/ceilometer.egg-info/pbr.json --- ceilometer-13.0.0/ceilometer.egg-info/pbr.json 2019-10-16 12:40:07.000000000 +0000 +++ ceilometer-13.1.0/ceilometer.egg-info/pbr.json 2020-02-27 12:56:51.000000000 +0000 @@ -1 +1 @@ -{"git_version": "79629473", "is_release": true} \ No newline at end of file +{"git_version": "4e91fa56", "is_release": true} \ No newline at end of file diff -Nru ceilometer-13.0.0/ceilometer.egg-info/PKG-INFO ceilometer-13.1.0/ceilometer.egg-info/PKG-INFO --- ceilometer-13.0.0/ceilometer.egg-info/PKG-INFO 2019-10-16 12:40:07.000000000 +0000 +++ ceilometer-13.1.0/ceilometer.egg-info/PKG-INFO 2020-02-27 12:56:51.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ceilometer -Version: 13.0.0 +Version: 13.1.0 Summary: OpenStack Telemetry Home-page: https://docs.openstack.org/ceilometer/latest/ Author: OpenStack diff -Nru ceilometer-13.0.0/ceilometer.egg-info/SOURCES.txt ceilometer-13.1.0/ceilometer.egg-info/SOURCES.txt --- ceilometer-13.0.0/ceilometer.egg-info/SOURCES.txt 2019-10-16 12:40:07.000000000 +0000 +++ ceilometer-13.1.0/ceilometer.egg-info/SOURCES.txt 2020-02-27 12:56:51.000000000 +0000 @@ -12,6 +12,7 @@ babel.cfg bindep.txt lower-constraints.txt +reno.yaml requirements.txt setup.cfg setup.py @@ -364,6 +365,7 @@ releasenotes/notes/add-full-snmpv3-usm-support-ab540c902fa89b9d.yaml releasenotes/notes/add-ipmi-sensor-data-gnocchi-70573728499abe86.yaml releasenotes/notes/add-json-output-to-file-publisher-786380cb7e21b56b.yaml +releasenotes/notes/add-loadbalancer-resource-type-a73c29594b72f012.yaml releasenotes/notes/add-magnum-event-4c75ed0bb268d19c.yaml releasenotes/notes/add-memory-swap-metric-f1633962ab2cf0f6.yaml releasenotes/notes/add-tool-for-migrating-data-to-gnocchi-cea8d4db68ce03d0.yaml diff -Nru ceilometer-13.0.0/ChangeLog ceilometer-13.1.0/ChangeLog --- ceilometer-13.0.0/ChangeLog 2019-10-16 12:40:06.000000000 +0000 +++ ceilometer-13.1.0/ChangeLog 2020-02-27 12:56:51.000000000 +0000 @@ -1,6 +1,16 @@ CHANGES ======= +13.1.0 +------ + +* Tell reno to ignore the kilo branch +* Fix logging libvirt error on python 3 +* Add note for loadbalancer resource type support +* Imported Translations from Zanata +* Add loadbalancer resource type +* Fix samples with dots in sample name + 13.0.0 ------ diff -Nru ceilometer-13.0.0/debian/changelog ceilometer-13.1.0/debian/changelog --- ceilometer-13.0.0/debian/changelog 2019-11-27 14:23:05.000000000 +0000 +++ ceilometer-13.1.0/debian/changelog 2020-04-06 15:45:01.000000000 +0000 @@ -1,3 +1,12 @@ +ceilometer (1:13.1.0-0ubuntu1) eoan; urgency=medium + + * d/watch: Update tarball URL to opendev.org. + * New stable point release for OpenStack Train (LP: #1871125). + * d/p/add-loadbalancer-resource-type.patch: Dropped. Fixed in stable + point release. + + -- Corey Bryant Mon, 06 Apr 2020 11:45:01 -0400 + ceilometer (1:13.0.0-0ubuntu1.1) eoan; urgency=medium * d/gbp.conf: Create stable/train branch. diff -Nru ceilometer-13.0.0/debian/patches/add-loadbalancer-resource-type.patch ceilometer-13.1.0/debian/patches/add-loadbalancer-resource-type.patch --- ceilometer-13.0.0/debian/patches/add-loadbalancer-resource-type.patch 2019-11-27 14:23:05.000000000 +0000 +++ ceilometer-13.1.0/debian/patches/add-loadbalancer-resource-type.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From 6f77f2d53e5bcd51da4c46c2d1bec3d708ccaef6 Mon Sep 17 00:00:00 2001 -From: Jorge Niedbalski -Date: Thu, 7 Nov 2019 18:30:22 -0300 -Subject: [PATCH] Add loadbalancer resource type. - -Adds the loadbalancer resource type for usage -with the network.services.lb.* metrics. - -Change-Id: Ib6e78438c3da0e22d93f720f00cdeadf0ed7a91f -Closes-Bug: #1848286 -Signed-off-by: Jorge Niedbalski -(cherry picked from commit cd9e199076b1e3cb8ef6e6bc3e7844b0d23f7e48) ---- - ceilometer/gnocchi_client.py | 6 ++++++ - ceilometer/publisher/data/gnocchi_resources.yaml | 12 ++++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/ceilometer/gnocchi_client.py b/ceilometer/gnocchi_client.py -index e471b1a2..a07eddb1 100644 ---- a/ceilometer/gnocchi_client.py -+++ b/ceilometer/gnocchi_client.py -@@ -240,6 +240,12 @@ resources_update_operations = [ - "value": {"type": "string", "min_length": 0, "max_length": 255, - "required": False} - }]}, -+ {"desc": "add loadbalancer resource type", -+ "type": "create_resource_type", -+ "resource_type": "loadbalancer", -+ "data": [{ -+ "attributes": {} -+ }]}, - ] - - # NOTE(sileht): We use LooseVersion because pbr can generate invalid -diff --git a/ceilometer/publisher/data/gnocchi_resources.yaml b/ceilometer/publisher/data/gnocchi_resources.yaml -index e9e9ef5a..656e0c82 100644 ---- a/ceilometer/publisher/data/gnocchi_resources.yaml -+++ b/ceilometer/publisher/data/gnocchi_resources.yaml -@@ -395,3 +395,15 @@ resources: - attributes: - controller: resource_metadata.controller - switch: resource_metadata.switch -+ -+ - resource_type: loadbalancer -+ metrics: -+ network.services.lb.outgoing.bytes: -+ network.services.lb.incoming.bytes: -+ network.services.lb.pool: -+ network.services.lb.listener: -+ network.services.lb.member: -+ network.services.lb.health_monitor: -+ network.services.lb.loadbalancer: -+ network.services.lb.total.connections: -+ network.services.lb.active.connections: -\ No newline at end of file --- -2.24.0 - diff -Nru ceilometer-13.0.0/debian/patches/series ceilometer-13.1.0/debian/patches/series --- ceilometer-13.0.0/debian/patches/series 2019-11-27 14:23:05.000000000 +0000 +++ ceilometer-13.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -add-loadbalancer-resource-type.patch diff -Nru ceilometer-13.0.0/debian/watch ceilometer-13.1.0/debian/watch --- ceilometer-13.0.0/debian/watch 2019-11-27 14:23:05.000000000 +0000 +++ ceilometer-13.1.0/debian/watch 2020-04-06 15:45:01.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/;s/\.0rc/~rc/" \ - http://tarballs.openstack.org/ceilometer ceilometer-(13\..*)\.tar\.gz + https://tarballs.opendev.org/openstack/ceilometer ceilometer-(13\..*)\.tar\.gz diff -Nru ceilometer-13.0.0/PKG-INFO ceilometer-13.1.0/PKG-INFO --- ceilometer-13.0.0/PKG-INFO 2019-10-16 12:40:07.000000000 +0000 +++ ceilometer-13.1.0/PKG-INFO 2020-02-27 12:56:51.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ceilometer -Version: 13.0.0 +Version: 13.1.0 Summary: OpenStack Telemetry Home-page: https://docs.openstack.org/ceilometer/latest/ Author: OpenStack diff -Nru ceilometer-13.0.0/releasenotes/notes/add-loadbalancer-resource-type-a73c29594b72f012.yaml ceilometer-13.1.0/releasenotes/notes/add-loadbalancer-resource-type-a73c29594b72f012.yaml --- ceilometer-13.0.0/releasenotes/notes/add-loadbalancer-resource-type-a73c29594b72f012.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-13.1.0/releasenotes/notes/add-loadbalancer-resource-type-a73c29594b72f012.yaml 2020-02-27 12:55:00.000000000 +0000 @@ -0,0 +1,6 @@ +--- +fixes: + - | + [`bug 1848286 `_] + Enable load balancer metrics by adding the loadbalancer resource type, + allowing Gnocchi to capture measurement data for Octavia load balancers. diff -Nru ceilometer-13.0.0/reno.yaml ceilometer-13.1.0/reno.yaml --- ceilometer-13.0.0/reno.yaml 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-13.1.0/reno.yaml 2020-02-27 12:55:00.000000000 +0000 @@ -0,0 +1,4 @@ +--- +# Ignore the kilo-eol tag because that branch does not work with reno +# and contains no release notes. +closed_branch_tag_re: "(.+)(?