From c8e57ec88d4b9bf9e3df74d9734faee5a3449166 Mon Sep 17 00:00:00 2001
From: Kochetkov S <kochetkov.s@sarex.io>
Date: Mon, 15 Jun 2026 15:21:49 +0300
Subject: [PATCH] Fix brusnika-stage observability dashboard scrapes

---
 .../istio-dashboard-compat-vmrule.yaml         | 18 ++++++++++++++++++
 .../istio-gateway-podmonitor.yaml              | 18 ++++++++++++++++++
 .../infrastructure/kustomization.yaml          |  2 ++
 .../infrastructure/patches/kafka-exporter.yaml |  2 +-
 .../patches/prometheus-stack.yaml              |  4 ++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml
 create mode 100644 clusters/brusnika-stage/infrastructure/istio-gateway-podmonitor.yaml

diff --git a/clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml b/clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml
new file mode 100644
index 0000000..a310122
--- /dev/null
+++ b/clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml
@@ -0,0 +1,18 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMRule
+metadata:
+  name: istio-dashboard-compat
+  namespace: vmstack
+spec:
+  groups:
+    - name: istio-dashboard-compat.rules
+      rules:
+        - record: kube_deployment_status_replicas_available
+          expr: |
+            label_replace(
+              kube_deployment_status_replicas_available{deployment="istio-ingressgateway", namespace="ingress-nginx"},
+              "namespace",
+              "istio-system",
+              "namespace",
+              ".*"
+            )
diff --git a/clusters/brusnika-stage/infrastructure/istio-gateway-podmonitor.yaml b/clusters/brusnika-stage/infrastructure/istio-gateway-podmonitor.yaml
new file mode 100644
index 0000000..7db47a2
--- /dev/null
+++ b/clusters/brusnika-stage/infrastructure/istio-gateway-podmonitor.yaml
@@ -0,0 +1,18 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: istio-ingressgateway-stats
+  namespace: prometheus-stack
+  labels:
+    release: prometheus
+spec:
+  namespaceSelector:
+    matchNames:
+      - ingress-nginx
+  selector:
+    matchLabels:
+      istio: ingressgateway
+  podMetricsEndpoints:
+    - path: /stats/prometheus
+      targetPort: 15020
+      interval: 15s
diff --git a/clusters/brusnika-stage/infrastructure/kustomization.yaml b/clusters/brusnika-stage/infrastructure/kustomization.yaml
index 0a1060e..0db9281 100644
--- a/clusters/brusnika-stage/infrastructure/kustomization.yaml
+++ b/clusters/brusnika-stage/infrastructure/kustomization.yaml
@@ -18,6 +18,8 @@ resources:
   - ./lb-service-override.yaml
   - ./vault-ingress.yaml
   - ./clusterissuer-letsencrypt.yaml
+  - ./istio-gateway-podmonitor.yaml
+  - ./istio-dashboard-compat-vmrule.yaml
   - ../../../infrastructure/failed-pod-cleanup
 patches:
   - path: ./patches/istio-gateway.yaml
diff --git a/clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml b/clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml
index 06ecfff..1e02e59 100644
--- a/clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml
+++ b/clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml
@@ -30,7 +30,7 @@ spec:
     kafkaExporter:
       kafka:
         servers:
-          - kafka.kafka.svc.cluster.local:9092
+          - brusnika-stage-kafka-bootstrap.kafka.svc.cluster.local:9092
       sasl:
         enabled: false
       tls:
diff --git a/clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml b/clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml
index c879c87..2764b54 100644
--- a/clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml
+++ b/clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml
@@ -33,6 +33,10 @@ spec:
         monitor:
           enabled: true
           jobLabel: node-exporter
+          metricRelabelings:
+            - action: replace
+              targetLabel: job
+              replacement: vm-stack/vm-prod-node-exporter
     extraServiceMonitors:
       - name: zitadel-external-metrics
         namespace: prometheus-stack