From de697bd50df09d75352d76e7c32b05c529b1d5d0 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Fri, 1 Nov 2024 16:16:47 +0000
Subject: [PATCH] Redfish exporter: Fixes scrape group

We were only including the scrape group `overcloud` in the prometheus
config. This change allows the scrape group to work as intended.
---
 .../kolla/config/prometheus/prometheus.yml.d/60-redfish.yml | 2 --
 ...with-redfish-exporter-scrape-group-b10eaac6ee1e6af3.yaml | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-issue-with-redfish-exporter-scrape-group-b10eaac6ee1e6af3.yaml

diff --git a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml
index 84e85e04f..6f234e5a0 100644
--- a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml
+++ b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml
@@ -15,13 +15,11 @@ scrape_configs:
        replacement: "{{ lookup('vars', admin_oc_net_name ~ '_ips')[groups.seed.0] }}:9610"
     static_configs:
 {% for host in groups.get('redfish_exporter_targets', []) %}
-{% if hostvars[host]["redfish_exporter_scrape_group"] | default('overcloud') == 'overcloud' %}
       - targets:
           - '{{ hostvars[host]["redfish_exporter_target_address"] }}'
         labels:
           server: '{{ host }}'
           env: "{{ kayobe_environment | default('openstack') }}"
           group: "{{ hostvars[host]['redfish_exporter_scrape_group'] | default('overcloud') }}"
-{% endif %}
 {% endfor %}
 {% endif %}
diff --git a/releasenotes/notes/fix-issue-with-redfish-exporter-scrape-group-b10eaac6ee1e6af3.yaml b/releasenotes/notes/fix-issue-with-redfish-exporter-scrape-group-b10eaac6ee1e6af3.yaml
new file mode 100644
index 000000000..1ee5a9a41
--- /dev/null
+++ b/releasenotes/notes/fix-issue-with-redfish-exporter-scrape-group-b10eaac6ee1e6af3.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where setting ``redfish_exporter_scrape_group`` to a value
+    other than ``overcloud`` would exclude those nodes from the redfish
+    exporter scrapes.