Merge pull request #31 from albarbaro/fix-dashboard

Update dashboard
redhat-appstudio · Oct 4, 2023 · 630e08a · 630e08a
2 parents 454c983 + d2879f3
commit 630e08a
Showing 1 changed file with 35 additions and 92 deletions.
diff --git a/dashboards/grafana-dashboard-dora-metrics.configmap.yaml b/dashboards/grafana-dashboard-dora-metrics.configmap.yaml
@@ -2,63 +2,6 @@ apiVersion: v1
 data:
   dora-metrics.json: |-
     {
-      "__inputs": [
-        {
-          "name": "DS_RHTAP-OBSERVATORIUM-STAGE",
-          "label": "rhtap-observatorium-stage",
-          "description": "",
-          "type": "datasource",
-          "pluginId": "prometheus",
-          "pluginName": "Prometheus"
-        },
-        {
-          "name": "DS_RHTAP-OBSERVATORIUM-PRODUCTION",
-          "label": "rhtap-observatorium-production",
-          "description": "",
-          "type": "datasource",
-          "pluginId": "prometheus",
-          "pluginName": "Prometheus"
-        }
-      ],
-      "__elements": {},
-      "__requires": [
-        {
-          "type": "grafana",
-          "id": "grafana",
-          "name": "Grafana",
-          "version": "9.3.8"
-        },
-        {
-          "type": "datasource",
-          "id": "prometheus",
-          "name": "Prometheus",
-          "version": "1.0.0"
-        },
-        {
-          "type": "panel",
-          "id": "stat",
-          "name": "Stat",
-          "version": ""
-        },
-        {
-          "type": "panel",
-          "id": "table",
-          "name": "Table",
-          "version": ""
-        },
-        {
-          "type": "panel",
-          "id": "text",
-          "name": "Text",
-          "version": ""
-        },
-        {
-          "type": "panel",
-          "id": "timeseries",
-          "name": "Time series",
-          "version": ""
-        }
-      ],
       "annotations": {
         "list": [
           {
@@ -84,7 +27,7 @@ data:
       "editable": true,
       "fiscalYearStartMonth": 0,
       "graphTooltip": 0,
-      "id": null,
+      "id": 622052,
       "links": [],
       "liveNow": false,
       "panels": [
@@ -181,7 +124,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "description": "",
           "fieldConfig": {
@@ -245,7 +188,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "expr": "avg(\n    (( min by (image, commit_hash)( min_over_time(dora:deploytime{app!~\".*gitopsdepl.*\"}[$__range]) - on (image) group_left (commit_hash) (min by (image, commit_hash) (min_over_time(dora:committime{app!~\".*gitopsdepl.*\"}[$__range]))))))\n)",
@@ -260,7 +203,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -323,7 +266,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -341,7 +284,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -404,7 +347,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -422,7 +365,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "description": "",
           "fieldConfig": {
@@ -486,7 +429,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "expr": "avg(\n    (( min by (image, commit_hash)( min_over_time(dora:deploytime{app!~\".*gitopsdepl.*\"}[$__range]) - on (image) group_left (commit_hash) (min by (image, commit_hash) (min_over_time(dora:committime{app!~\".*gitopsdepl.*\"}[$__range]))))))\n)",
@@ -501,7 +444,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -564,7 +507,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -582,7 +525,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -645,7 +588,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -663,7 +606,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -744,7 +687,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -762,7 +705,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -842,7 +785,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "expr": "count(count by (image)(count_over_time(dora:deploytime{app!~\".*gitopsdepl.*\"}[$__range])))\n",
@@ -857,7 +800,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -938,7 +881,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -956,7 +899,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1036,7 +979,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "expr": "count(count by (image)(count_over_time(dora:deploytime{app!~\".*gitopsdepl.*\"}[$__range])))\n",
@@ -1051,7 +994,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1115,7 +1058,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1133,7 +1076,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1197,7 +1140,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1215,7 +1158,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1279,7 +1222,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1297,7 +1240,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1361,7 +1304,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1379,7 +1322,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+            "uid": "${datasource_staging}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1496,7 +1439,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-STAGE}"
+                "uid": "${datasource_staging}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1535,7 +1478,7 @@ data:
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+            "uid": "${datasource_production}"
           },
           "fieldConfig": {
             "defaults": {
@@ -1652,7 +1595,7 @@ data:
             {
               "datasource": {
                 "type": "prometheus",
-                "uid": "${DS_RHTAP-OBSERVATORIUM-PRODUCTION}"
+                "uid": "${datasource_production}"
               },
               "editorMode": "code",
               "exemplar": false,
@@ -1714,7 +1657,7 @@ data:
           },
           {
             "current": {
-              "selected": true,
+              "selected": false,
               "text": "rhtap-observatorium-production",
               "value": "rhtap-observatorium-production"
             },
@@ -1764,7 +1707,7 @@ data:
       "timezone": "",
       "title": "RHTAP dora metrics",
       "uid": "rhtapdorametrics",
-      "version": 4,
+      "version": 5,
       "weekStart": ""
     }
 kind: ConfigMap