From 188e583dcb0b48e77f43923ae349a0b7046b65a5 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Wed, 21 May 2025 10:54:58 +0530 Subject: [PATCH] Drop sg_core related prometheus var https://review.opendev.org/c/openstack/devstack-plugin-prometheus/+/950476 adds the support for passing custom scrape target and https://github.com/openstack-k8s-operators/sg-core/pull/25 drops sg_core prometheus related vars. So we also need to sg_core related prometheus vars from our job. This cr achieves the same. Depends-On: https://github.com/openstack-k8s-operators/sg-core/pull/25 Depends-On: https://review.opendev.org/c/openstack/devstack-plugin-prometheus/+/950476 Change-Id: I6c8f54f8749e81b532c88e9224022294c4a1d331 Signed-off-by: Chandan Kumar (raukadah) --- .zuul.yaml | 5 ----- devstack/local.conf.controller | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 9157006c5..67718e324 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -175,11 +175,6 @@ # will inject fake metrics when needed NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu" PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml" - # Disable sg_core prometheus config copy - PROMETHEUS_ENABLE: false - # PROMETHEUS_CONFIG_FILE var conflicts with sg_core var - # to avoid issue, set PROMETHEUS_CONF_DIR - PROMETHEUS_CONF_DIR: "/home/zuul" devstack_local_conf: post-config: $WATCHER_CONF: diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller index df7363c3c..5f5c4c99c 100644 --- a/devstack/local.conf.controller +++ b/devstack/local.conf.controller @@ -8,11 +8,6 @@ DATABASE_PASSWORD=stackdb RABBIT_PASSWORD=stackqueue SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_TOKEN=azertytoken -# Disable sg_core prometheus config copy -PROMETHEUS_ENABLE=false -# PROMETHEUS_CONFIG_FILE var conflicts with sg_core var -# to avoid issue, set PROMETHEUS_CONF_DIR -PROMETHEUS_CONF_DIR="${DEST}" HOST_IP=192.168.42.1 # Change this to your controller node IP address #HOST_IPV6=2001:db8::7