diff --git a/etc/kayobe/kolla/config/haproxy/services.d/os_exporter.cfg b/etc/kayobe/kolla/config/haproxy/services.d/os_exporter.cfg index 1292f38bd..e40c27a38 100644 --- a/etc/kayobe/kolla/config/haproxy/services.d/os_exporter.cfg +++ b/etc/kayobe/kolla/config/haproxy/services.d/os_exporter.cfg @@ -1,3 +1,4 @@ +{% if stackhpc_enable_os_capacity | bool %} {% raw %} frontend os_capacity_frontend mode http @@ -17,3 +18,4 @@ backend os_capacity_backend server {{ host_name }} {{ host_ip }}:9000 check inter 2000 rise 2 fall 5 {% endfor %} {% endraw %} +{% endif %} diff --git a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml.j2 b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml similarity index 73% rename from etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml.j2 rename to etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml index 1c0c25c15..659c26047 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml.j2 +++ b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml @@ -1,3 +1,6 @@ +# yamllint disable-file +--- +{% if stackhpc_enable_os_capacity | bool %} {% raw %} scrape_configs: - job_name: os-capacity @@ -7,3 +10,4 @@ scrape_configs: scrape_interval: 15m scrape_timeout: 10m {% endraw %} +{% endif %} diff --git a/etc/kayobe/stackhpc-monitoring.yml b/etc/kayobe/stackhpc-monitoring.yml index 43f1f309f..b48646e79 100644 --- a/etc/kayobe/stackhpc-monitoring.yml +++ b/etc/kayobe/stackhpc-monitoring.yml @@ -9,3 +9,9 @@ alertmanager_low_memory_threshold_gib: 5 ############################################################################### +# Exporter configuration + +# Whether the OpenStack Capacity exporter is enabled. +# Enabling this flag will result in HAProxy configuration and Prometheus scrape +# targets being templated during deployment. +stackhpc_enable_os_capacity: false