Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop sg_core prometheus related vars"

Browse Source
This commit is contained in:
Zuul
2025-04-08 11:55:39 +00:00
committed by Gerrit Code Review
parent 03c107a4ce 0702cb3869
commit 25c1a8207f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@@ -213,13 +213,15 @@
CEILOMETER_BACKENDS: "sg-core" CEILOMETER_BACKENDS: "sg-core"
CEILOMETER_PIPELINE_INTERVAL: 15 CEILOMETER_PIPELINE_INTERVAL: 15
CEILOMETER_ALARM_THRESHOLD: 6000000000 CEILOMETER_ALARM_THRESHOLD: 6000000000
NODE_EXPORTER_ENABLE: false
# avoid collecting real host cpu metrics since tests # avoid collecting real host cpu metrics since tests
# will inject fake metrics when needed # will inject fake metrics when needed
NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu" NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu"
PROMETHEUS_ENABLE: false
PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core,node-exporter"
PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml" 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: devstack_local_conf:
post-config: post-config:
$WATCHER_CONF: $WATCHER_CONF:
@@ -264,7 +266,6 @@
subnode: subnode:
devstack_plugins: devstack_plugins:
ceilometer: https://opendev.org/openstack/ceilometer 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-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
devstack_services: devstack_services:
ceilometer-acompute: true ceilometer-acompute: true
@@ -277,9 +278,6 @@
# avoid collecting real host cpu metric since tests # avoid collecting real host cpu metric since tests
# will inject fake metrics when needed # will inject fake metrics when needed
NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu" NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu"
# sg_core related var
NODE_EXPORTER_ENABLE: false
PROMETHEUS_ENABLE: false
devstack_local_conf: devstack_local_conf:
post-config: post-config:
$WATCHER_CONF: $WATCHER_CONF: