openstack/ceilometer
Code Issues Proposed changes

Merge "Fix vm_instance label from exporter Prometheus metrics"

Browse Source
This commit is contained in:
Zuul 2024-12-17 10:52:18 +00:00 committed by Gerrit Code Review
commit 4ce0541619
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/polling/prom_exporter.py
View File

@ -94,9 +94,9 @@ def _gen_labels(sample):
if sample.get('resource_metadata'):
resource_metadata = sample['resource_metadata']
if resource_metadata.get('host'):
if resource_metadata.get('instance_host'):
labels['keys'].append("vm_instance")
labels['values'].append(resource_metadata['host'])
labels['values'].append(resource_metadata['instance_host'])
if resource_metadata.get('display_name'):
value = resource_metadata['display_name']

8
ceilometer/tests/unit/test_prom_exporter.py
View File

@ -263,7 +263,7 @@ class TestPromExporter(base.BaseTestCase):
'type': 'usage',
'unit': 'MB',
'user': '6e7d71415cd5401cbe103829c9c5dec2',
'vm_instance': 'e0d297f5df3b62ec73c8d42b',
'vm_instance': 'devstack',
'server_group': 'none'}
sample_dict_3 = {'counter': 'disk.device.read.latency',
'disk': 'read',
@ -275,7 +275,7 @@ class TestPromExporter(base.BaseTestCase):
'type': 'device',
'unit': 'ns',
'user': '6e7d71415cd5401cbe103829c9c5dec2',
'vm_instance': 'e0d297f5df3b62ec73c8d42b',
'vm_instance': 'devstack',
'server_group': 'none'}
self.assertEqual(16344576,
prom_exporter.CEILOMETER_REGISTRY.
@ -304,7 +304,7 @@ class TestPromExporter(base.BaseTestCase):
'6e7d71415cd5401cbe103829c9c5dec2',
'ns',
'e536fff6-b20d-4aa5-ac2f-d15ac8b3af63-vda',
'e0d297f5df3b62ec73c8d42b',
'devstack',
'myserver:instance-00000002', 'none']
label1 = prom_exporter._gen_labels(self.test_data[0])
self.assertDictEqual(label1, slabels1)
@ -319,7 +319,7 @@ class TestPromExporter(base.BaseTestCase):
'd965489b7f894cbda89cd2e25bfd85a0',
'6e7d71415cd5401cbe103829c9c5dec2', 'MB',
'e536fff6-b20d-4aa5-ac2f-d15ac8b3af63',
'e0d297f5df3b62ec73c8d42b',
'devstack',
'myserver:instance-00000002', 'none']
label2 = prom_exporter._gen_labels(self.test_data[2])
self.assertDictEqual(label2, slabels2)