Adds openstack exporter scrape interval

Author: jovial

etc/kayobe/kolla/config/prometheus/prometheus.rules

@@ -7,7 +7,7 @@ groups:
   rules:
 
   - alert: PrometheusTargetMissing
-    expr: up{job!="redfish-exporter-seed"} == 0
+    expr: up{job!="redfish-exporter-seed", job!="redfish-exporter-collectlog"} == 0
     for: 5m
     labels:
       severity: critical

etc/kayobe/kolla/globals.yml

@@ -56,3 +56,5 @@ prometheus_blackbox_exporter_endpoints_kayobe:
   - endpoints:
       - "pulp:http_2xx:{{ pulp_url }}/pulp/api/v3/status/"
     enabled: "{{ seed_pulp_container_enabled | bool }}"
+
+prometheus_openstack_exporter_interval: "{{ stackhpc_prometheus_openstack_exporter_interval }}s"

etc/kayobe/stackhpc-monitoring.yml

@@ -3,7 +3,12 @@
 ###############################################################################
 # Prometheus server configuration
 
-stackhpc_prometheus_query_lookback_delta: "{{ [redfish_exporter_scrape_interval, stackhpc_os_capacity_scrape_interval, 300] | max }}s"
+# How far prometheus will look back in time to find a metric.
+stackhpc_prometheus_query_lookback_delta: >-
+  {{ [stackhpc_redfish_exporter_scrape_interval | int,
+      stackhpc_os_capacity_scrape_interval | int,
+      stackhpc_prometheus_openstack_exporter_interval | int,
+      300] | max + 30 }}s
 
 ###############################################################################
 # Alert configuration
@@ -55,15 +60,18 @@ stackhpc_os_capacity_scrape_interval: 900
 # Whether the redfish exporter is enabled.
 stackhpc_enable_redfish_exporter: false
 
+# How often to scrape the BMCs in seconds.
+stackhpc_redfish_exporter_scrape_interval: "{{ [8 * groups['redfish_exporter_targets'] | length, 300] | max }}"
+
 # Credentials
 redfish_exporter_default_username: "{{ ipmi_username }}"
 redfish_exporter_default_password: "{{ ipmi_password }}"
 
 # The address of the BMC that is used to query redfish metrics.
 redfish_exporter_target_address: "{{ ipmi_address }}"
 
-# How often to scrape the BMCs in seconds.
-redfish_exporter_scrape_interval: "{{ [8 * groups['redfish_exporter_targets'] | length, 300] | max }}"
+# How often to scrape OpenStack Exporter in seconds.
+stackhpc_prometheus_openstack_exporter_interval: 300
 
 ###############################################################################
 

releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml

@@ -3,8 +3,10 @@ features:
   - Upgrades the redfish exporter container image to the v2.x series.
   - Adds support for lenovo hardware to the redfish exporter dashboard.
   - |
-    Adds the ``redfish_exporter_scrape_interval``, and
-    ``stackhpc_os_capacity_scrape_interval`` configuration variables.
+    Adds the ``stackhpcredfish_exporter_scrape_interval``,
+    ``stackhpc_os_capacity_scrape_interval``, and
+    ``stackhpc_prometheus_openstack_exporter_interval``
+    configuration variables.
 fixes:
   - |
     Sets the prometheus server side option ``query.lookback-delta`` to