From 64f70b948d727f4bc071d8b32f34125a2bb42de0 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Thu, 3 Apr 2025 14:21:02 +0530 Subject: [PATCH] Drop sg_core prometheus related vars The depends-on pr removes the installation of promotheus[1] and node exporter[2] from sg_core. We no longer need to define those vars in the devstack config. Links: [1]. https://github.com/openstack-k8s-operators/sg-core/pull/21 [2]. https://github.com/openstack-k8s-operators/sg-core/pull/23 Note: We do not need to enable sg_core service on compute node, so removing it's plugin call. Change-Id: Ie8645813a360605635de4dff9e8d1ba0d7a0cdc3 Signed-off-by: Chandan Kumar (raukadah) (cherry picked from commit 0702cb386908df85856e6c80f257389a09c0df1e) --- .zuul.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c03c20ad9..b9abccd34 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -213,10 +213,12 @@ CEILOMETER_BACKENDS: "sg-core" CEILOMETER_PIPELINE_INTERVAL: 15 CEILOMETER_ALARM_THRESHOLD: 6000000000 - NODE_EXPORTER_ENABLE: false - PROMETHEUS_ENABLE: false - PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core,node-exporter" 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: @@ -261,7 +263,6 @@ subnode: devstack_plugins: 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: ceilometer-acompute: true @@ -271,9 +272,9 @@ devstack_localrc: CEILOMETER_BACKEND: "none" CEILOMETER_BACKENDS: "none" - # sg_core related var - NODE_EXPORTER_ENABLE: false - PROMETHEUS_ENABLE: false + # avoid collecting real host cpu metric since tests + # will inject fake metrics when needed + NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu" devstack_local_conf: post-config: $WATCHER_CONF: