From 59a6f2e31cb3624243ed88e9a93f997093c9ec9b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 23 Nov 2024 17:23:36 +0900 Subject: [PATCH] Adjust endpoint url according to devstack plugin update ... and also update the functional job set up according to the recent update of devstack plugins. Depends-on: https://review.opendev.org/c/openstack/aodh/+/936101 Change-Id: I4f7fa65ee77a17bef7dfc60fea31ec5ced5b833f --- .zuul.yaml | 12 ++++++++++-- tox.ini | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a7db945..5c1ef1c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,17 +10,25 @@ - openstack/ceilometer - gnocchixyz/gnocchi - openstack-k8s-operators/sg-core + - openstack/devstack-plugin-prometheus timeout: 4200 vars: devstack_localrc: - AODH_SERVICE_HOST: localhost - AODH_DEPLOY: uwsgi CEILOMETER_BACKENDS: "gnocchi,sg-core" PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core + PROMETHEUS_CONF_DIR: /opt/stack + PROMETHEUS_CONFIG_FILE: /opt/stack/prometheus.yml + PROMETHEUS_CLIENT_CONF_DIR: /etc/openstack devstack_plugins: aodh: https://opendev.org/openstack/aodh ceilometer: https://opendev.org/openstack/ceilometer sg-core: https://github.com/openstack-k8s-operators/sg-core + devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus + devstack_services: + node_exporter: false + zuul_copy_output: + /etc/prometheus/prometheus.yml: logs + /etc/openstack/prometheus.yaml: logs - project: queue: telemetry diff --git a/tox.ini b/tox.ini index 7361faa..04b0af4 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,7 @@ setenv = OS_TEST_PATH = ./aodhclient/tests/functional OS_TESTENV_NAME = {envname} AODH_CLIENT_EXEC_DIR={envdir}/bin - AODH_ENDPOINT=http://localhost:8042 + AODH_ENDPOINT=http://localhost/alarming/ GNOCCHI_ENDPOINT=http://localhost/metric/ PROMETHEUS_ENDPOINT=http://localhost:9090 allowlist_externals =