From 7afe13e4850e4152b5ff69cab80498782390cd40 Mon Sep 17 00:00:00 2001
From: technowhizz <7688823+technowhizz@users.noreply.github.com>
Date: Fri, 14 Feb 2025 22:54:51 +0000
Subject: [PATCH 1/2] Remove custom prometheus-blackbox-exporter.yml

Remove the custom prometheus-blackbox-exporter.yml as the upstream
version now matches this one.
---
 .../prometheus-blackbox-exporter.yml          | 56 -------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml

diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml b/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml
deleted file mode 100644
index f4cf32737..000000000
--- a/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# yamllint disable-file
-modules:
-  http_2xx:
-    prober: http
-  os_endpoint:
-    prober: http
-    http:
-      valid_status_codes: [200,300]
-      headers:
-        Content-Type: application/json
-      fail_if_body_not_matches_regexp:
-        - "versions"
-  http_post_2xx:
-    prober: http
-    http:
-      method: POST
-  tcp_connect:
-    prober: tcp
-  tls_connect:
-    prober: tcp
-    tcp:
-      tls: true
-  ssh_banner:
-    prober: tcp
-    tcp:
-      query_response:
-      - expect: "^SSH-2.0-"
-  icmp:
-    prober: icmp
-  http_2xx_opensearch_dashboards:
-    prober: http
-    timeout: 5s
-    http:
-      basic_auth:
-{% raw %}
-        username: {{ opensearch_dashboards_user }}
-        password: {{ opensearch_dashboards_password }}
-{% endraw %}
-  http_2xx_prometheus:
-    prober: http
-    timeout: 5s
-    http:
-      basic_auth:
-{% raw %}
-        username: admin
-        password: {{ prometheus_password }}
-{% endraw %}
-  http_2xx_alertmanager:
-    prober: http
-    timeout: 5s
-    http:
-      basic_auth:
-{% raw %}
-        username: {{ prometheus_alertmanager_user }}
-        password: {{ prometheus_alertmanager_password }}
-{% endraw %}

From 115a96de994a332f38a8f09b7992b94d790f2ed9 Mon Sep 17 00:00:00 2001
From: technowhizz <7688823+technowhizz@users.noreply.github.com>
Date: Fri, 14 Feb 2025 22:58:13 +0000
Subject: [PATCH 2/2] Add release note

---
 ...custom-prometheus-blackbox-exporter-c3a843ad068164ab.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 releasenotes/notes/remove-custom-prometheus-blackbox-exporter-c3a843ad068164ab.yaml

diff --git a/releasenotes/notes/remove-custom-prometheus-blackbox-exporter-c3a843ad068164ab.yaml b/releasenotes/notes/remove-custom-prometheus-blackbox-exporter-c3a843ad068164ab.yaml
new file mode 100644
index 000000000..454a25a27
--- /dev/null
+++ b/releasenotes/notes/remove-custom-prometheus-blackbox-exporter-c3a843ad068164ab.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Remove the custom prometheus-blackbox-exporter.yml from SKC in favour of
+    using the upstream Kolla Ansible one.