From 0706d29a9b035321ba4171c27f9578557a389f64 Mon Sep 17 00:00:00 2001
From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:45:09 -0800
Subject: [PATCH 1/2] feat: configure cilium hubble prometheus scraping

---
 .../default/prometheus-podMonitorCiliumAgent.yaml    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
index 0acdd167af..2e40752f49 100644
--- a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
+++ b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
@@ -1,6 +1,10 @@
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT false}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT "prometheus"}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL "30s"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE false}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT 9965}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL "30s"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST "|hubble_(.+)"}}
 
 {{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
 
@@ -15,6 +19,14 @@ spec:
   podMetricsEndpoints:
     - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL }}
       port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
+    - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL }}
+      port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT }}
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST }}
+          action: keep
+{{end}}
   jobLabel: k8s-app
   selector:
     matchLabels:

From d39d5821f33bfcf7b366720709438c0116bf139f Mon Sep 17 00:00:00 2001
From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:56:25 -0800
Subject: [PATCH 2/2] feat: metric keep lists and allow hubble scrape without
 agent scrape

---
 .../default/prometheus-podMonitorCiliumAgent.yaml     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
index 2e40752f49..52413e8837 100644
--- a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
+++ b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
@@ -2,11 +2,12 @@
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT "prometheus"}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL "30s"}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE false}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST "(.*)"}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT 9965}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL "30s"}}
-{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST "|hubble_(.+)"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST "(.*)"}}
 
-{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
+{{if or $PROMETHEUS_SCRAPE_CILIUM_AGENT $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
 
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
@@ -17,8 +18,14 @@ metadata:
   namespace: monitoring
 spec:
   podMetricsEndpoints:
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
     - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL }}
       port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST }}
+          action: keep
+{{end}}
 {{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
     - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL }}
       port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT }}