Temporarily remove redfish log collection

This isn't working yet (takes far too long to scrape),let's
split it out into a separate patch.

Also removed the query lookback delta config, as this was
working around the much longer scrape times.

Author: MoteHue

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

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

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

@@ -23,27 +23,5 @@ scrape_configs:
           server: '{{ host }}'
           env: "{{ kayobe_environment | default('openstack') }}"
           group: "{{ hostvars[host]['redfish_exporter_scrape_group'] | default('overcloud') }}"
-{% endfor %}
-  - job_name: redfish-exporter-collectlog
-    params:
-      collectlogs: ['true']
-    metrics_path: /redfish
-    scrape_timeout: 1200s
-    scrape_interval: 3600s
-    relabel_configs:
-     - source_labels: [__address__]
-       target_label: __param_target
-     - source_labels: [__param_target]
-       target_label: instance
-     - target_label: __address__
-       replacement: "{{ lookup('vars', admin_oc_net_name ~ '_ips')[groups.seed.0] }}:9610"
-    static_configs:
-{% for host in groups.get('redfish_exporter_targets', []) %}
-      - targets:
-          - '{{ hostvars[host]["redfish_exporter_target_address"] }}'
-        labels:
-          server: '{{ host }}'
-          env: "{{ kayobe_environment | default('openstack') }}"
-          group: "{{ hostvars[host]['redfish_exporter_scrape_group'] | default('overcloud') }}"
 {% endfor %}
 {% endif %}

etc/kayobe/kolla/globals.yml

@@ -26,7 +26,7 @@ kolla_image_tags:
 # Monitoring and alerting related settings
 
 opensearch_heap_size: 8g
-prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d --query.lookback-delta={{ stackhpc_prometheus_query_lookback_delta }}"
+prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d"
 
 # Additional command line flags for node exporter to enable texfile collector for disk metrics and create textfile docker volume
 prometheus_node_exporter_extra_volumes:

etc/kayobe/stackhpc-monitoring.yml

@@ -1,14 +1,5 @@
 ---
 # StackHPC monitoring configuration
-###############################################################################
-# Prometheus server configuration
-
-# 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

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

@@ -8,10 +8,6 @@ features:
     ``stackhpc_prometheus_openstack_exporter_interval``
     configuration variables.
 fixes:
-  - |
-    Sets the prometheus server side option ``query.lookback-delta`` to
-    the largest scrape interval so that metrics from exporters with large
-    scrape intervals are not marked stale before the next scrape.
   - Fixes various issues with the redfish exporter dashboard.
 upgrade:
  - |