openstack/python-observabilityclient
Code Issues Proposed changes

Merge "Use PROMETHEUS_CUSTOM_SCRAPE_TARGETS to pass sg_core scrape endpoint"

Browse Source
This commit is contained in:
Zuul
2025-05-26 08:16:50 +00:00
committed by Gerrit Code Review
parent ab8ce8fd34 34781c5e4f
commit 76afec05a6
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
PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core
CEILOMETER_BACKEND: sg-core
PROMETHEUS_CONF_DIR: /opt/stack
PROMETHEUS_CONFIG_FILE: /opt/stack/prometheus.yml
PROMETHEUS_CLIENT_CONF_DIR: /etc/openstack
PROMETHEUS_CUSTOM_SCRAPE_TARGETS: "localhost:3000,localhost:9090"
devstack_plugins:
sg-core: https://github.com/openstack-k8s-operators/sg-core
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__"]
)
self.assertEqual(
"sg-core",
"custom",
metric["job"]
)
@@ -103,7 +103,7 @@ class CliTestFunctionalRBACEnabled(base.CliTestCase):
metric["__name__"]
)
self.assertEqual(
"sg-core",
"custom",
metric["job"]
)

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

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