Make query lookback delta setting smarter

Author: jovial

etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml

@@ -7,7 +7,7 @@ scrape_configs:
       collectlogs: ['false']
     metrics_path: /redfish
     scrape_timeout: 300s
-    scrape_interval: {{ [8 * groups['redfish_exporter_targets'] | length, 300] | max }}s
+    scrape_interval: {{ redfish_exporter_scrape_interval }}s
     relabel_configs:
      - source_labels: [__address__]
        target_label: __param_target

etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml

@@ -7,7 +7,7 @@ scrape_configs:
     static_configs:
         - targets:
           - '{{ kolla_internal_fqdn | put_address_in_context('url') }}:9090'
-    scrape_interval: 15m
+    scrape_interval: "{{ stackhpc_os_capacity_scrape_interval }}s"
     scrape_timeout: 10m
 {% if kolla_enable_tls_internal | bool %}
     scheme: https

etc/kayobe/stackhpc-monitoring.yml

@@ -1,5 +1,9 @@
 ---
 # StackHPC monitoring configuration
+###############################################################################
+# Prometheus server configuration
+
+prometheus_query_lookback_delta: "{{ [redfish_exporter_scrape_interval, stackhpc_os_capacity_scrape_interval, 300] | max }}s"
 
 ###############################################################################
 # Alert configuration
@@ -45,6 +49,9 @@ stackhpc_os_capacity_openstack_cacert: ""
 stackhpc_os_capacity_openstack_verify: true
 # Redfish exporter
 
+# How often to scrape the os capacity exporter in seconds.
+stackhpc_os_capacity_scrape_interval: 900
+
 # Whether the redfish exporter is enabled.
 stackhpc_enable_redfish_exporter: false
 
@@ -55,6 +62,9 @@ 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 }}"
+
 ###############################################################################
 
 # Whether the RADOS gateway usage exporter is enabled.

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

@@ -0,0 +1,13 @@
+---
+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.
+fixes:
+  - |
+    Sets the prometheus server side option ``query.lookback-delta`` to
+    the largest scrape interval so that redfish exporter metrics are not
+    marked stale before the next scrape.
+  - Fixes various issues with the redfish exporter dashboard.