From b014eaeadaa2157cf9f4484b437882884ea72385 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Tue, 14 May 2024 22:27:45 +0800
Subject: [PATCH] fix(cilium): move Hubble dashboards to Grafana HR

to upgrade legacy queries?
---
 .../core/_networking/cilium/app/hr.yaml       |  7 +++---
 .../core/monitoring/grafana/app/hr.yaml       | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/kube/deploy/core/_networking/cilium/app/hr.yaml b/kube/deploy/core/_networking/cilium/app/hr.yaml
index c0216419..0ce0ebe7 100644
--- a/kube/deploy/core/_networking/cilium/app/hr.yaml
+++ b/kube/deploy/core/_networking/cilium/app/hr.yaml
@@ -104,9 +104,10 @@ spec:
                 - kubernetes_node
               targetLabel: instance
         dashboards:
-          enabled: true
-          annotations:
-            grafana_folder: "Cilium"
+          enabled: false # managed in Grafana HR to upgrade queries
+          #enabled: true
+          #annotations:
+          #  grafana_folder: "Cilium"
     operator:
       prometheus:
         enabled: true
diff --git a/kube/deploy/core/monitoring/grafana/app/hr.yaml b/kube/deploy/core/monitoring/grafana/app/hr.yaml
index c17d84ee..249752ce 100644
--- a/kube/deploy/core/monitoring/grafana/app/hr.yaml
+++ b/kube/deploy/core/monitoring/grafana/app/hr.yaml
@@ -121,6 +121,14 @@ spec:
             editable: true
             options:
               path: /var/lib/grafana/dashboards/ceph
+          - name: cilium
+            orgId: 1
+            folder: Cilium
+            type: file
+            disableDeletion: false
+            editable: true
+            options:
+              path: /var/lib/grafana/dashboards/cilium
           - name: flux
             orgId: 1
             folder: Flux
@@ -217,6 +225,21 @@ spec:
           gnetId: 5336
           revision: 9
           datasource: Prometheus
+      cilium:
+        hubble-dashboard:
+          url: https://raw.githubusercontent.com/cilium/cilium/main/install/kubernetes/cilium/files/hubble/dashboards/hubble-dashboard.json
+          datasource: Prometheus
+        hubble-l7:
+          url: https://raw.githubusercontent.com/cilium/cilium/main/install/kubernetes/cilium/files/hubble/dashboards/hubble-l7-http-metrics-by-workload.json
+          datasource: Prometheus
+        hubble-dns-namespace:
+          url: https://raw.githubusercontent.com/cilium/cilium/main/install/kubernetes/cilium/files/hubble/dashboards/hubble-dns-namespace.json
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
+        hubble-network-overview-namespace:
+          url: https://raw.githubusercontent.com/cilium/cilium/main/install/kubernetes/cilium/files/hubble/dashboards/hubble-network-overview-namespace.json
+          datasource:
+            - { name: DS_PROMETHEUS, value: Prometheus }
       flux:
         flux-cluster:
           url: https://raw.githubusercontent.com/fluxcd/flux2/main/manifests/monitoring/monitoring-config/dashboards/cluster.json