From b65076f836cce8b02c427e3becbff405894b34ba Mon Sep 17 00:00:00 2001 From: Amilcar Aponte Jimenez Date: Wed, 29 Jan 2025 18:34:02 +0000 Subject: [PATCH 1/5] Updating grafana dashboards --- deploy/hubble/grafana/dashboards/clusters.json | 4 ++-- deploy/hubble/grafana/dashboards/dns.json | 4 ++-- deploy/hubble/grafana/dashboards/pod-flows-namespace.json | 4 ++-- deploy/hubble/grafana/dashboards/pod-flows-workload.json | 4 ++-- deploy/standard/grafana/dashboards/clusters.json | 2 +- deploy/standard/grafana/dashboards/dns.json | 2 +- deploy/standard/grafana/dashboards/pod-level.json | 2 +- docs/02-Installation/05-grafana.md | 8 +++++++- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/deploy/hubble/grafana/dashboards/clusters.json b/deploy/hubble/grafana/dashboards/clusters.json index 05eaa8c6c4..ada3ba3041 100644 --- a/deploy/hubble/grafana/dashboards/clusters.json +++ b/deploy/hubble/grafana/dashboards/clusters.json @@ -3728,7 +3728,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Clusters", - "uid": "NetObs6738", + "title": "Kubernetes / Networking / Retina (Hubble) / Clusters", + "uid": "RetinaHubbleClusters", "version": 39 } diff --git a/deploy/hubble/grafana/dashboards/dns.json b/deploy/hubble/grafana/dashboards/dns.json index d2ad642910..55538b5a08 100644 --- a/deploy/hubble/grafana/dashboards/dns.json +++ b/deploy/hubble/grafana/dashboards/dns.json @@ -1016,7 +1016,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / DNS", - "uid": "NetObsDNS6741", + "title": "Kubernetes / Networking / Retina (Hubble) / DNS", + "uid": "RetinaHubbleDNS", "version": 1 } diff --git a/deploy/hubble/grafana/dashboards/pod-flows-namespace.json b/deploy/hubble/grafana/dashboards/pod-flows-namespace.json index 76480447d6..7507a6adeb 100644 --- a/deploy/hubble/grafana/dashboards/pod-flows-namespace.json +++ b/deploy/hubble/grafana/dashboards/pod-flows-namespace.json @@ -4263,7 +4263,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Pod Flows (Namespace)", - "uid": "NetObsFlowsNamespace6739", + "title": "Kubernetes / Networking / Retina (Hubble) / Pod Flows (Namespace)", + "uid": "RetinaHubblePodFlowsNamespace", "version": 1 } diff --git a/deploy/hubble/grafana/dashboards/pod-flows-workload.json b/deploy/hubble/grafana/dashboards/pod-flows-workload.json index 98123c1d30..d9cd1e7448 100644 --- a/deploy/hubble/grafana/dashboards/pod-flows-workload.json +++ b/deploy/hubble/grafana/dashboards/pod-flows-workload.json @@ -4013,7 +4013,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Pod Flows (Workload)", - "uid": "NetObsFlowsWorkload6740", + "title": "Kubernetes / Networking / Retina (Hubble) / Pod Flows (Workload)", + "uid": "RetinaHubblePodFlowsWorkload", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/clusters.json b/deploy/standard/grafana/dashboards/clusters.json index c5045314c9..fd71afbe52 100644 --- a/deploy/standard/grafana/dashboards/clusters.json +++ b/deploy/standard/grafana/dashboards/clusters.json @@ -3753,7 +3753,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Clusters", + "title": "Kubernetes / Networking / Retina / Clusters", "uid": "Retina11", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/dns.json b/deploy/standard/grafana/dashboards/dns.json index 542e4c9a64..ffb6fdaef9 100644 --- a/deploy/standard/grafana/dashboards/dns.json +++ b/deploy/standard/grafana/dashboards/dns.json @@ -920,7 +920,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / DNS", + "title": "Kubernetes / Networking / Retina / DNS", "uid": "Retina55", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/pod-level.json b/deploy/standard/grafana/dashboards/pod-level.json index 7ccfdf970a..260648eba7 100755 --- a/deploy/standard/grafana/dashboards/pod-level.json +++ b/deploy/standard/grafana/dashboards/pod-level.json @@ -1108,7 +1108,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Kubernetes / Networking / Pod Traffic", + "title": "Kubernetes / Networking / Retina / Pod Traffic", "uid": "Retina22", "version": 1 } diff --git a/docs/02-Installation/05-grafana.md b/docs/02-Installation/05-grafana.md index 1f476b7525..63d68f913d 100644 --- a/docs/02-Installation/05-grafana.md +++ b/docs/02-Installation/05-grafana.md @@ -34,10 +34,14 @@ If you followed the steps to install and configure [Prometheus](./04-prometheus. ![Grafana datasources](./img/grafana-datasources.png) -5. Import the [kubernetes-networking-observability](https://grafana.com/grafana/dashboards/18814/) dashboard by id `18814` at [localhost:8080/dashboard/import](http://localhost:8080/dashboard/import) +5. Import the [kubernetes-networking-retina-cluster](https://grafana.com/grafana/dashboards/22771/) dashboard by id `22771` at [localhost:8080/dashboard/import](http://localhost:8080/dashboard/import) ![Grafana import](./img/grafana-import.png) + Some other dashboards available are: + - [kubernetes-networking-retina-DNS](https://grafana.com/grafana/dashboards/22772/) dashboard (id `22772`) + - [kubernetes-networking-retina-PodTraffic](https://grafana.com/grafana/dashboards/22773/) dashboard (id `22773`) + 6. Kubernetes cluster metrics shouold be visible ![Grafana kubernetes-networking-observability dashboard](./img/grafana-kubernetes-networking-dash.png) @@ -49,3 +53,5 @@ There is a set of Retina dashboards that you can import directly into Grafana as Here is an example of the Retina `dns.json` dashboard. ![Grafana retina DNS dashboard](./img/grafana-retina-dns-dash.png) + +These dashboards are also available at the [Grafana Portal Retina Page](https://grafana.com/orgs/retina1/dashboards) From fb38af214c356a786506eaa6693c9eab198e1921 Mon Sep 17 00:00:00 2001 From: Amilcar Aponte Jimenez Date: Fri, 31 Jan 2025 09:40:43 +0000 Subject: [PATCH 2/5] Updating grafana dashboards --- docs/02-Installation/05-grafana.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/02-Installation/05-grafana.md b/docs/02-Installation/05-grafana.md index 63d68f913d..c4075faceb 100644 --- a/docs/02-Installation/05-grafana.md +++ b/docs/02-Installation/05-grafana.md @@ -38,7 +38,7 @@ If you followed the steps to install and configure [Prometheus](./04-prometheus. ![Grafana import](./img/grafana-import.png) - Some other dashboards available are: + Some other available dashboards are: - [kubernetes-networking-retina-DNS](https://grafana.com/grafana/dashboards/22772/) dashboard (id `22772`) - [kubernetes-networking-retina-PodTraffic](https://grafana.com/grafana/dashboards/22773/) dashboard (id `22773`) From 9c9a15dad5ff996d8a2fe13a7887e88a244b62d0 Mon Sep 17 00:00:00 2001 From: Amilcar Aponte Jimenez Date: Wed, 5 Feb 2025 17:46:07 +0000 Subject: [PATCH 3/5] Updating grafana dashboards --- deploy/hubble/grafana/dashboards/dns.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/hubble/grafana/dashboards/dns.json b/deploy/hubble/grafana/dashboards/dns.json index 55538b5a08..e1d55a6c9a 100644 --- a/deploy/hubble/grafana/dashboards/dns.json +++ b/deploy/hubble/grafana/dashboards/dns.json @@ -950,6 +950,7 @@ "type": "datasource" }, { + "allValue": "(.*)", "current": {}, "datasource": { "type": "prometheus", @@ -957,7 +958,7 @@ }, "definition": "label_values(kube_node_info, cluster)", "hide": 0, - "includeAll": true, + "includeAll": false, "label": "Cluster", "multi": false, "name": "cluster", From fee94678a6a86a97bb348194bd758be2cf0a3cc7 Mon Sep 17 00:00:00 2001 From: Amilcar Aponte Jimenez Date: Wed, 5 Feb 2025 18:13:34 +0000 Subject: [PATCH 4/5] Updating grafana dashboards --- deploy/hubble/grafana/dashboards/clusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/hubble/grafana/dashboards/clusters.json b/deploy/hubble/grafana/dashboards/clusters.json index ada3ba3041..39cae029da 100644 --- a/deploy/hubble/grafana/dashboards/clusters.json +++ b/deploy/hubble/grafana/dashboards/clusters.json @@ -85,7 +85,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "# Network Observability Metrics\n\nUse this dashboard to visualise metrics from the Network Observability add-on for AKS. Dashboard displays metrics from Linux and Windows Clusters. To hide the irrelevant metrics, simply collapse the unwanted sections. Alternatively, you can edit the dashboard to delete unwanted panels. For any questions or issues, please see [our documentation](https://aka.ms/NetObsAddonDoc).", + "content": "# Retina Network Observability\n\nVisualize metrics for any Kubernetes cluster using [Retina](https://retina.sh/) (any cloud provider, any CNI, any OS). Cycle between all dashboards in the dropdown above.", "mode": "markdown" }, "type": "text" From 9b711b1c239977377bd34c19ce6beeed08f1402c Mon Sep 17 00:00:00 2001 From: Amilcar Aponte Jimenez Date: Thu, 6 Feb 2025 13:20:27 +0000 Subject: [PATCH 5/5] Updating grafana dashboards --- deploy/hubble/grafana/dashboards/clusters.json | 14 +++++++------- deploy/hubble/grafana/dashboards/dns.json | 12 ++++++------ .../grafana/dashboards/pod-flows-namespace.json | 12 ++++++------ .../grafana/dashboards/pod-flows-workload.json | 12 ++++++------ deploy/standard/grafana/dashboards/clusters.json | 12 ++++++------ deploy/standard/grafana/dashboards/dns.json | 12 ++++++------ deploy/standard/grafana/dashboards/pod-level.json | 12 ++++++------ 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/deploy/hubble/grafana/dashboards/clusters.json b/deploy/hubble/grafana/dashboards/clusters.json index 39cae029da..85d2d258be 100644 --- a/deploy/hubble/grafana/dashboards/clusters.json +++ b/deploy/hubble/grafana/dashboards/clusters.json @@ -48,10 +48,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -66,7 +66,7 @@ "title": "Documentation", "tooltip": "", "type": "link", - "url": "https://aka.ms/NetObsAddonDoc" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -3640,7 +3640,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -3728,7 +3728,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina (Hubble) / Clusters", - "uid": "RetinaHubbleClusters", - "version": 39 + "title": "Kubernetes / Networking / Retina / Clusters", + "uid": "RetinaClusters", + "version": 1 } diff --git a/deploy/hubble/grafana/dashboards/dns.json b/deploy/hubble/grafana/dashboards/dns.json index e1d55a6c9a..2956000eab 100644 --- a/deploy/hubble/grafana/dashboards/dns.json +++ b/deploy/hubble/grafana/dashboards/dns.json @@ -36,10 +36,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -54,7 +54,7 @@ "title": "Documentation", "tooltip": "", "type": "link", - "url": "https://aka.ms/NetObsAddonDoc" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -930,7 +930,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -1017,7 +1017,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina (Hubble) / DNS", - "uid": "RetinaHubbleDNS", + "title": "Kubernetes / Networking / Retina / DNS", + "uid": "RetinaDNS", "version": 1 } diff --git a/deploy/hubble/grafana/dashboards/pod-flows-namespace.json b/deploy/hubble/grafana/dashboards/pod-flows-namespace.json index 7507a6adeb..583ff2f6a4 100644 --- a/deploy/hubble/grafana/dashboards/pod-flows-namespace.json +++ b/deploy/hubble/grafana/dashboards/pod-flows-namespace.json @@ -48,10 +48,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -66,7 +66,7 @@ "title": "Documentation", "tooltip": "Documentation", "type": "link", - "url": "https://aka.ms/NetObsAddonDoc" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -4150,7 +4150,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -4263,7 +4263,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina (Hubble) / Pod Flows (Namespace)", - "uid": "RetinaHubblePodFlowsNamespace", + "title": "Kubernetes / Networking / Retina / Pod Flows (Namespace)", + "uid": "RetinaPodFlowsNamespace", "version": 1 } diff --git a/deploy/hubble/grafana/dashboards/pod-flows-workload.json b/deploy/hubble/grafana/dashboards/pod-flows-workload.json index d9cd1e7448..19fb3ad2af 100644 --- a/deploy/hubble/grafana/dashboards/pod-flows-workload.json +++ b/deploy/hubble/grafana/dashboards/pod-flows-workload.json @@ -42,10 +42,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -60,7 +60,7 @@ "title": "Documentation", "tooltip": "Documentation", "type": "link", - "url": "https://aka.ms/NetObsAddonDoc" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -3875,7 +3875,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -4013,7 +4013,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina (Hubble) / Pod Flows (Workload)", - "uid": "RetinaHubblePodFlowsWorkload", + "title": "Kubernetes / Networking / Retina / Pod Flows (Workload)", + "uid": "RetinaPodFlowsWorkload", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/clusters.json b/deploy/standard/grafana/dashboards/clusters.json index fd71afbe52..e382eae2fd 100644 --- a/deploy/standard/grafana/dashboards/clusters.json +++ b/deploy/standard/grafana/dashboards/clusters.json @@ -48,10 +48,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -66,7 +66,7 @@ "title": "Documentation", "tooltip": "", "type": "link", - "url": "https://www.retina.sh" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -3669,7 +3669,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -3753,7 +3753,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina / Clusters", - "uid": "Retina11", + "title": "Kubernetes / Networking / Retina (Standard) / Clusters", + "uid": "RetinaStandardClusters", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/dns.json b/deploy/standard/grafana/dashboards/dns.json index ffb6fdaef9..48f1bc3ace 100644 --- a/deploy/standard/grafana/dashboards/dns.json +++ b/deploy/standard/grafana/dashboards/dns.json @@ -36,10 +36,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -54,7 +54,7 @@ "title": "Documentation", "tooltip": "", "type": "link", - "url": "https://www.retina.sh" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": true, @@ -836,7 +836,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -920,7 +920,7 @@ ] }, "timezone": "", - "title": "Kubernetes / Networking / Retina / DNS", - "uid": "Retina55", + "title": "Kubernetes / Networking / Retina (Standard) / DNS", + "uid": "RetinaStandardDNS", "version": 1 } diff --git a/deploy/standard/grafana/dashboards/pod-level.json b/deploy/standard/grafana/dashboards/pod-level.json index 260648eba7..5436b63348 100755 --- a/deploy/standard/grafana/dashboards/pod-level.json +++ b/deploy/standard/grafana/dashboards/pod-level.json @@ -36,10 +36,10 @@ "includeVars": true, "keepTime": true, "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "targetBlank": false, - "title": "Dashboards: Network Observability", + "title": "Dashboards: Retina Network Observability", "tooltip": "", "type": "dashboards", "url": "" @@ -54,7 +54,7 @@ "title": "Documentation", "tooltip": "", "type": "link", - "url": "https://www.retina.sh" + "url": "https://retina.sh/docs/Introduction/intro" } ], "liveNow": false, @@ -1058,7 +1058,7 @@ "schemaVersion": 38, "style": "dark", "tags": [ - "k8s:network-observability" + "k8s:retina-network-observability" ], "templating": { "list": [ @@ -1108,7 +1108,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Kubernetes / Networking / Retina / Pod Traffic", - "uid": "Retina22", + "title": "Kubernetes / Networking / Retina (Standard) / Pod Traffic", + "uid": "RetinaStandardPodTraffic", "version": 1 }