Update kube prometheus (#656)

* Update kube-prometheus to 0.13 * Add make target to sanitise dashboards and update all dashboards for grafana 9 * Update config/observability/README.md Co-authored-by: Evan Hearne <[email protected]> --------- Co-authored-by: Evan Hearne <[email protected]>
Kuadrant · May 17, 2024 · 57bf1e8 · 57bf1e8
1 parent 1af8b73
commit 57bf1e8
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 68 deletions.
diff --git a/config/observability/README.md b/config/observability/README.md
@@ -49,10 +49,10 @@ Some example alerting rules are available in the [/examples](/examples) folder.
 
 ## Exporting a dashboard for use with Grafana Community Platform or other Grafana Instances
 
-Following the steps in [Editing dashboards](#editing-dashboards), we need to make one export where the toggle "Export for sharing manually" is toggled. Once this is saved, run the following from `config/observability` . 
+Following the steps in [Editing dashboards](#editing-dashboards), export the dashboard json into `examples/dashboards/` with the toggle "Export for sharing manually" on. Once all dashboard json files sare saved/updated, run the following make target to sanitise it for use in both the Grafana Community Platform for sharing, and for use as a mounted configmap volume locally.
 
 ```bash
-universal-dashboard.sh <"Export for sharing manually" JSON file> /path/to/<JSON file>
+make dashboard-cleanup
 ```
 
 Now, you have a universal dashboard file you can use to import into your Grafana instance, but also use for uploading to the Grafana Community Platform.
diff --git a/config/observability/kustomization.yaml b/config/observability/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - github.com/prometheus-operator/kube-prometheus?ref=release-0.11
+  - github.com/prometheus-operator/kube-prometheus?ref=release-0.13
   - github.com/Kuadrant/gateway-api-state-metrics?ref=main
   - github.com/Kuadrant/gateway-api-state-metrics/config/examples/dashboards?ref=main
 # To scrape istio metrics, 3 configurations are required:

diff --git a/examples/dashboards/app_developer.json b/examples/dashboards/app_developer.json
@@ -1,5 +1,4 @@
 {
-  "__elements": [],
   "__requires": [
     {
       "type": "panel",
@@ -11,7 +10,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "8.5.5"
+      "version": "9.5.3"
     },
     {
       "type": "datasource",
@@ -72,7 +71,6 @@
   "gnetId": 7630,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1715589343999,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -100,7 +98,7 @@
           "kuadrant"
         ]
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "title": "Kuadrant Dashboards",
       "type": "dashlist"
     },
@@ -118,10 +116,15 @@
       },
       "id": 153,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "#### Overview of API/HTTPRoute Metrics\n\nThe row of panels below is repeated for each HTTPRoute resource in your cluster.\nThey provide real-time & historical insights into the performance and health of each API.\nMetrics displayed include request rates, success/error breakdown, and latency percentiles, giving a snapshot of API efficiency and reliability.\nUse this dashboard to monitor traffic patterns, identify potential issues, and ensure optimal performance of your services.\n\n*Important: HTTPRoutes must include a \"service\" and \"deployment\" label with a value that matches the name of the service & deployment being routed to. eg. \"service=myapp, deployment=myapp\"*",
         "mode": "markdown"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "title": "App Developer Dashboard",
       "type": "text"
     },
@@ -152,7 +155,9 @@
           },
           "custom": {
             "align": "center",
-            "displayMode": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
             "inspect": false
           },
           "mappings": [],
@@ -169,14 +174,16 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 2,
+        "h": 3,
         "w": 24,
         "x": 0,
         "y": 8
       },
       "id": 97,
       "options": {
+        "cellHeight": "sm",
         "footer": {
+          "countRows": false,
           "fields": "",
           "reducer": [
             "sum"
@@ -185,7 +192,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -346,6 +353,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -439,14 +448,15 @@
         "h": 6,
         "w": 9,
         "x": 0,
-        "y": 10
+        "y": 11
       },
       "id": 99,
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -524,7 +534,7 @@
         "h": 2,
         "w": 2,
         "x": 9,
-        "y": 10
+        "y": 11
       },
       "id": 137,
       "options": {
@@ -541,7 +551,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -592,7 +602,7 @@
         "h": 2,
         "w": 2,
         "x": 11,
-        "y": 10
+        "y": 11
       },
       "id": 149,
       "options": {
@@ -609,7 +619,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -641,6 +651,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -736,14 +748,15 @@
         "h": 6,
         "w": 9,
         "x": 13,
-        "y": 10
+        "y": 11
       },
       "id": 129,
       "options": {
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "multi",
@@ -820,7 +833,7 @@
         "h": 2,
         "w": 2,
         "x": 22,
-        "y": 10
+        "y": 11
       },
       "id": 139,
       "options": {
@@ -837,7 +850,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -888,7 +901,7 @@
         "h": 2,
         "w": 2,
         "x": 9,
-        "y": 12
+        "y": 13
       },
       "id": 147,
       "options": {
@@ -905,7 +918,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -956,7 +969,7 @@
         "h": 2,
         "w": 2,
         "x": 11,
-        "y": 12
+        "y": 13
       },
       "id": 150,
       "options": {
@@ -973,7 +986,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -1023,7 +1036,7 @@
         "h": 2,
         "w": 2,
         "x": 22,
-        "y": 12
+        "y": 13
       },
       "id": 146,
       "options": {
@@ -1040,7 +1053,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -1091,7 +1104,7 @@
         "h": 2,
         "w": 2,
         "x": 9,
-        "y": 14
+        "y": 15
       },
       "id": 148,
       "options": {
@@ -1108,7 +1121,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -1159,7 +1172,7 @@
         "h": 2,
         "w": 2,
         "x": 11,
-        "y": 14
+        "y": 15
       },
       "id": 151,
       "options": {
@@ -1176,7 +1189,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -1226,7 +1239,7 @@
         "h": 2,
         "w": 2,
         "x": 22,
-        "y": 14
+        "y": 15
       },
       "id": 138,
       "options": {
@@ -1243,7 +1256,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.5.3",
       "targets": [
         {
           "datasource": {
@@ -1264,7 +1277,7 @@
     }
   ],
   "refresh": "30s",
-  "schemaVersion": 36,
+  "schemaVersion": 38,
   "style": "dark",
   "tags": [
     "kuadrant"