openstack/watcher
Code Issues Proposed changes

Merge "Aggregate by label when querying instance cpu usage in prometheus" into stable/2025.1

Browse Source
This commit is contained in:
Zuul
2025-07-08 12:41:34 +00:00
committed by Gerrit Code Review
parent 3a923dbf16 53872f9af2
commit f5a21ba43e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
watcher/decision_engine/datasources/prometheus.py
View File

@@ -343,10 +343,12 @@ class PrometheusHelper(base.DataSourceBase):
)
vcpus = 1
query_args = (
"clamp_max((%s by (instance)(rate(%s{%s='%s'}[%ss]))/10e+8) "
"*(100/%s), 100)" %
(aggregate, meter, uuid_label_key, instance_label, period,
vcpus)
"clamp_max((%(agg)s by (%(label)s)"
"(rate(%(meter)s{%(label)s='%(label_value)s'}[%(period)ss]))"
"/10e+8) *(100/%(vcpus)s), 100)"
% {'label': uuid_label_key, 'label_value': instance_label,
'agg': aggregate, 'meter': meter, 'period': period,
'vcpus': vcpus}
)
else:
raise exception.InvalidParameter(

8
watcher/tests/decision_engine/datasources/test_prometheus_helper.py
View File

@@ -242,7 +242,7 @@ class TestPrometheusHelper(base.BaseTestCase):
self.assertEqual(expected_cpu_usage, result_cpu)
self.assertIsInstance(result_cpu, float)
mock_prometheus_query.assert_called_once_with(
"clamp_max((avg by (instance)(rate("
"clamp_max((avg by (resource)(rate("
"ceilometer_cpu{resource='uuid-0'}[300s]))"
"/10e+8) *(100/2), 100)"
)
@@ -644,7 +644,7 @@ class TestPrometheusHelper(base.BaseTestCase):
def test_build_prometheus_query_instance_cpu_avg_agg(self):
expected_query = (
"clamp_max((avg by (instance)(rate("
"clamp_max((avg by (resource)(rate("
"ceilometer_cpu{resource='uuid-0'}[222s]))"
"/10e+8) *(100/2), 100)"
)
@@ -655,7 +655,7 @@ class TestPrometheusHelper(base.BaseTestCase):
def test_build_prometheus_query_instance_cpu_max_agg(self):
expected_query = (
"clamp_max((max by (instance)(rate("
"clamp_max((max by (resource)(rate("
"ceilometer_cpu{resource='uuid-0'}[555s]))"
"/10e+8) *(100/4), 100)"
)
@@ -699,7 +699,7 @@ class TestPrometheusHelper(base.BaseTestCase):
def test_prometheus_query_custom_uuid_label(self, mock_prometheus_get):
cfg.CONF.prometheus_client.instance_uuid_label = 'custom_uuid_label'
expected_query = (
"clamp_max((max by (instance)"
"clamp_max((max by (custom_uuid_label)"
"(rate(ceilometer_cpu{custom_uuid_label='uuid-0'}[555s]))"
"/10e+8) *(100/4), 100)"
)