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) <raukadah@gmail.com>
(cherry picked from commit 0702cb3869)
This commit is contained in:
committed by
Alfredo Moralejo
parent
68c9ce65d2
commit
64f70b948d
15
.zuul.yaml
15
.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:
|
||||
|
||||
Reference in New Issue
Block a user