openstack/python-observabilityclient
Code Issues Proposed changes

Use PROMETHEUS_CUSTOM_SCRAPE_TARGETS to pass sg_core scrape endpoint

Browse Source 
https://review.opendev.org/c/openstack/devstack-plugin-prometheus/+/950476
adds the support for passing custom prometheus scrape target in d-p-p.

Let's use the same to pass sg_core endpoint.

Co-Authored-By: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: I598fd222f7e41e80ad9fc7f0008c965190255b05
This commit is contained in:
Jaromir Wysoglad
2025-05-21 15:27:20 -04:00
parent 9b63e62521
commit 34781c5e4f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@@ -16,9 +16,7 @@
USE_PYTHON3: True USE_PYTHON3: True
PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core
CEILOMETER_BACKEND: sg-core CEILOMETER_BACKEND: sg-core
PROMETHEUS_CONF_DIR: /opt/stack PROMETHEUS_CUSTOM_SCRAPE_TARGETS: "localhost:3000,localhost:9090"
PROMETHEUS_CONFIG_FILE: /opt/stack/prometheus.yml
PROMETHEUS_CLIENT_CONF_DIR: /etc/openstack
devstack_plugins: devstack_plugins:
sg-core: https://github.com/openstack-k8s-operators/sg-core sg-core: https://github.com/openstack-k8s-operators/sg-core
ceilometer: https://opendev.org/openstack/ceilometer ceilometer: https://opendev.org/openstack/ceilometer

4
observabilityclient/tests/functional/test_cli.py
View File

@@ -88,7 +88,7 @@ class CliTestFunctionalRBACEnabled(base.CliTestCase):
metric["__name__"] metric["__name__"]
) )
self.assertEqual( self.assertEqual(
"sg-core", "custom",
metric["job"] metric["job"]
) )
@@ -103,7 +103,7 @@ class CliTestFunctionalRBACEnabled(base.CliTestCase):
metric["__name__"] metric["__name__"]
) )
self.assertEqual( self.assertEqual(
"sg-core", "custom",
metric["job"] metric["job"]
) )

4
observabilityclient/tests/functional/test_python_api.py
View File

@@ -52,7 +52,7 @@ class PythonAPITestFunctionalRBACEnabled(base.PythonAPITestCase):
for metric in ret: for metric in ret:
self.assertEqual("ceilometer_image_size", self.assertEqual("ceilometer_image_size",
metric.labels["__name__"]) metric.labels["__name__"])
self.assertEqual("sg-core", self.assertEqual("custom",
metric.labels["job"]) metric.labels["job"])
def test_query(self): def test_query(self):
@@ -62,7 +62,7 @@ class PythonAPITestFunctionalRBACEnabled(base.PythonAPITestCase):
for metric in ret: for metric in ret:
self.assertEqual("ceilometer_image_size", self.assertEqual("ceilometer_image_size",
metric.labels["__name__"]) metric.labels["__name__"])
self.assertEqual("sg-core", metric.labels["job"]) self.assertEqual("custom", metric.labels["job"])
class PythonAPITestFunctionalAdminCommands(base.PythonAPITestCase): class PythonAPITestFunctionalAdminCommands(base.PythonAPITestCase):