diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-09 05:40:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-09 05:40:08 +0000 |
| commit | 4c68955fd278f2be0f6575db4aca40917883ff27 (patch) | |
| tree | 9878b512395ec7326cdef05fc044e8713d0fee8c | |
| parent | b422e9dd4b5ae2254416e59fb849e67f6447d23b (diff) | |
| parent | 21f9afc4061f91810c794fe7e14cdbcde7f8b763 (diff) | |
| download | ceilometer-4c68955fd278f2be0f6575db4aca40917883ff27.tar.gz | |
Merge "Include project_id in Prometheus publisher"
| -rw-r--r-- | ceilometer/publisher/prometheus.py | 4 | ||||
| -rw-r--r-- | ceilometer/tests/unit/publisher/test_prometheus.py | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ceilometer/publisher/prometheus.py b/ceilometer/publisher/prometheus.py index 973f8777..caca9fb4 100644 --- a/ceilometer/publisher/prometheus.py +++ b/ceilometer/publisher/prometheus.py @@ -71,8 +71,8 @@ class PrometheusPublisher(http.HttpPublisher): # data += '%s{resource_id="%s"} %s %d\n' % ( # curated_sname, s.resource_id, s.volume, timestamp_ms) - data += '%s{resource_id="%s"} %s\n' % ( - curated_sname, s.resource_id, s.volume) + data += '%s{resource_id="%s", project_id="%s"} %s\n' % ( + curated_sname, s.resource_id, s.project_id, s.volume) self._do_post(data) @staticmethod diff --git a/ceilometer/tests/unit/publisher/test_prometheus.py b/ceilometer/tests/unit/publisher/test_prometheus.py index e03daa27..510250d5 100644 --- a/ceilometer/tests/unit/publisher/test_prometheus.py +++ b/ceilometer/tests/unit/publisher/test_prometheus.py @@ -95,12 +95,12 @@ class TestPrometheusPublisher(base.BaseTestCase): publisher.publish_samples(self.sample_data) data = """# TYPE alpha counter -alpha{resource_id="%s"} 1 -beta{resource_id="%s"} 3 +alpha{resource_id="%s", project_id="test"} 1 +beta{resource_id="%s", project_id="test"} 3 # TYPE gamma gauge -gamma{resource_id="%s"} 5 +gamma{resource_id="%s", project_id="test"} 5 # TYPE delta_epsilon gauge -delta_epsilon{resource_id="%s"} 7 +delta_epsilon{resource_id="%s", project_id="test"} 7 """ % (self.resource_id, self.resource_id, self.resource_id, self.resource_id) expected = [ @@ -127,12 +127,12 @@ delta_epsilon{resource_id="%s"} 7 publisher.publish_samples(self.sample_data) data = """# TYPE alpha counter -alpha{resource_id="%s"} 1 -beta{resource_id="%s"} 3 +alpha{resource_id="%s", project_id="test"} 1 +beta{resource_id="%s", project_id="test"} 3 # TYPE gamma gauge -gamma{resource_id="%s"} 5 +gamma{resource_id="%s", project_id="test"} 5 # TYPE delta_epsilon gauge -delta_epsilon{resource_id="%s"} 7 +delta_epsilon{resource_id="%s", project_id="test"} 7 """ % (self.resource_id, self.resource_id, self.resource_id, self.resource_id) expected = [ |