From 57d517af7780c774e40c3487fafa7fb4b9b58571 Mon Sep 17 00:00:00 2001
From: Ultradesu <ultradesu@hexor.cy>
Date: Tue, 18 Nov 2025 22:21:17 +0200
Subject: [PATCH] Fixed iperf3 monitor

---
 .../iperf3/iperf3-exporter-daemonset.yaml     | 54 +++++++++++++++++++
 k8s/apps/iperf3/servicemonitor.yaml           |  6 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml b/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
index 36b3a7b..b5ac31d 100644
--- a/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
+++ b/k8s/apps/iperf3/iperf3-exporter-daemonset.yaml
@@ -14,6 +14,60 @@ spec:
       labels:
         app: iperf3-exporter
     spec:
+      serviceAccountName: iperf3-server
+      initContainers:
+      - name: create-exporter-service
+        image: bitnami/kubectl:latest
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        command:
+          - /bin/bash
+          - -c
+          - |
+            # Clean node name for service name
+            NODE_CLEAN=$(echo "$NODE_NAME" | cut -d'.' -f1 | tr '[:upper:]' '[:lower:]' | tr '_' '-')
+            SERVICE_NAME="iperf3-exporter-${NODE_CLEAN}"
+            
+            # Create service for this exporter pod
+            kubectl apply -f - <<EOF
+            apiVersion: v1
+            kind: Service
+            metadata:
+              name: ${SERVICE_NAME}
+              namespace: iperf3
+              labels:
+                app: iperf3-exporter-service
+                target-node: "${NODE_NAME}"
+            spec:
+              type: ClusterIP
+              ports:
+                - name: metrics
+                  port: 9579
+                  protocol: TCP
+            ---
+            apiVersion: v1
+            kind: Endpoints
+            metadata:
+              name: ${SERVICE_NAME}
+              namespace: iperf3
+              labels:
+                app: iperf3-exporter-service
+                target-node: "${NODE_NAME}"
+            subsets:
+              - addresses:
+                  - ip: ${POD_IP}
+                ports:
+                  - name: metrics
+                    port: 9579
+                    protocol: TCP
+            EOF
       containers:
       - name: iperf3-exporter
         image: ghcr.io/edgard/iperf3_exporter:1.2.2
diff --git a/k8s/apps/iperf3/servicemonitor.yaml b/k8s/apps/iperf3/servicemonitor.yaml
index 56d415c..cc66436 100644
--- a/k8s/apps/iperf3/servicemonitor.yaml
+++ b/k8s/apps/iperf3/servicemonitor.yaml
@@ -34,8 +34,10 @@ spec:
           targetLabel: instance
         - sourceLabels: [__param_target]
           targetLabel: __param_target
-        - targetLabel: __address__
-          replacement: iperf3-exporter.iperf3.svc.cluster.local:9579
+        - sourceLabels: [__param_target]
+          targetLabel: __address__
+          regex: iperf3-(.+)\.iperf3\.svc\.cluster\.local:5201
+          replacement: iperf3-exporter-${1}.iperf3.svc.cluster.local:9579
       metricRelabelings:
         - sourceLabels: [__name__]
           regex: iperf3_(.+)