From 61bf917cefef2bdeb20cf09a71deae6af3797876 Mon Sep 17 00:00:00 2001
From: Jeff Reiffers <jeffreiffers@gmail.com>
Date: Fri, 5 Jan 2024 14:37:24 +0100
Subject: [PATCH 1/2] chore: blackbox exporter scrape relabeling

---
 .../helm-release-blackbox-exporter.yaml       | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/infrastructure/base/monitoring/helm-release-blackbox-exporter.yaml b/infrastructure/base/monitoring/helm-release-blackbox-exporter.yaml
index f142b01..69d11c8 100644
--- a/infrastructure/base/monitoring/helm-release-blackbox-exporter.yaml
+++ b/infrastructure/base/monitoring/helm-release-blackbox-exporter.yaml
@@ -20,11 +20,54 @@ spec:
   upgrade:
     crds: CreateReplace
   values:
+    config:
+      modules:
+        http_2xx:
+          prober: http
+          timeout: 5s
+          http:
+            valid_http_versions: ["HTTP/1.1", "HTTP/2.0"]
+            valid_status_codes:
+              - 200
+              - 204
+            follow_redirects: true
+            preferred_ip_protocol: "ip4"
+      scrape_configs:
+        - job_name: 'kubernetes-ingresses'
+
+          metrics_path: /probe
+          params:
+            module: [http_2xx]
+
+          kubernetes_sd_configs:
+            - role: ingress
+
+          relabel_configs:
+            - source_labels: [__meta_kubernetes_ingress_annotation_prometheus_io_probe]
+              action: keep
+              regex: true
+            - source_labels: [__address__]
+              regex: (.+);(.+)
+              replacement: https://${1}
+              target_label: __param_target
+            - source_labels: [__address__]
+              regex: (catalog-admin\..+)
+              replacement: https://${1}/api/ping
+              target_label: __param_target  
+            - source_labels: [__param_target]
+              target_label: instance
+            - action: labelmap
+              regex: __meta_kubernetes_ingress_label_(.+)
+            - source_labels: [__meta_kubernetes_namespace]
+              target_label: kubernetes_namespace
+            - source_labels: [__meta_kubernetes_ingress_name]
+              target_label: kubernetes_name
     serviceMonitor:
       enabled: true
       targets:
         - name: datajegeren
           url: https://datafabrikken.norge.no/finn-data/datajegeren
+        
 #
 # TODO: TEST Probe
 #

From 99338216702e447be5c372a1c8bc4db4445b3a07 Mon Sep 17 00:00:00 2001
From: Flux <>
Date: Mon, 15 Jan 2024 09:58:52 +0100
Subject: [PATCH 2/2] Add Flux sync manifests

---
 clusters/dev/flux-system/gotk-sync.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clusters/dev/flux-system/gotk-sync.yaml b/clusters/dev/flux-system/gotk-sync.yaml
index 7aa091f..481513a 100644
--- a/clusters/dev/flux-system/gotk-sync.yaml
+++ b/clusters/dev/flux-system/gotk-sync.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   interval: 1m0s
   ref:
-    branch: main
+    branch: chore/jr/scrapetimeout
   secretRef:
     name: flux-system
   url: ssh://git@github.com/Informasjonsforvaltning/fdk-infra