Grafana dashboards (#21)

* don't use external option
stackhpc · Aug 23, 2024 · 6f60577 · 6f60577
1 parent 262894d
commit 6f60577
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 92 deletions.
diff --git a/charts/files/operator_dashboard.json b/charts/files/operator_dashboard.json
@@ -1,35 +1,4 @@
 {
-    "__inputs": [
-      {
-        "name": "DS_PROMETHEUS",
-        "label": "Prometheus",
-        "description": "",
-        "type": "datasource",
-        "pluginId": "prometheus",
-        "pluginName": "Prometheus"
-      }
-    ],
-    "__elements": {},
-    "__requires": [
-      {
-        "type": "grafana",
-        "id": "grafana",
-        "name": "Grafana",
-        "version": "10.4.0"
-      },
-      {
-        "type": "datasource",
-        "id": "prometheus",
-        "name": "Prometheus",
-        "version": "1.0.0"
-      },
-      {
-        "type": "panel",
-        "id": "timeseries",
-        "name": "Time series",
-        "version": ""
-      }
-    ],
     "annotations": {
       "list": [
         {
@@ -49,7 +18,7 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "id": null,
+    "id": 43,
     "links": [],
     "panels": [
       {
@@ -68,7 +37,7 @@
       {
         "datasource": {
           "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
+          "uid": "prometheus"
         },
         "description": "",
         "fieldConfig": {
@@ -155,7 +124,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -172,7 +141,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -204,7 +173,7 @@
       {
         "datasource": {
           "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
+          "uid": "prometheus"
         },
         "description": "",
         "fieldConfig": {
@@ -250,8 +219,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -291,7 +259,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -325,7 +293,7 @@
       {
         "datasource": {
           "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
+          "uid": "prometheus"
         },
         "description": "",
         "fieldConfig": {
@@ -371,8 +339,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -412,7 +379,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -428,7 +395,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -462,7 +429,7 @@
       {
         "datasource": {
           "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
+          "uid": "prometheus"
         },
         "description": "",
         "fieldConfig": {
@@ -508,8 +475,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -549,7 +515,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -566,7 +532,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -591,10 +557,14 @@
       "list": [
         {
           "allValue": "",
-          "current": {},
+          "current": {
+            "selected": false,
+            "text": "5fcc12ae-513f-4eac-a2e0-e7772f191282",
+            "value": "5fcc12ae-513f-4eac-a2e0-e7772f191282"
+          },
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "prometheus"
           },
           "definition": "label_values(coral_credits_allocation_hours_per_project,project_id)",
           "hide": 0,
@@ -615,10 +585,18 @@
           "type": "query"
         },
         {
-          "current": {},
+          "current": {
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "prometheus"
           },
           "definition": "label_values(coral_credits_allocation_hours_per_project,resource_class)",
           "hide": 2,

diff --git a/charts/files/user_dashboard.json b/charts/files/user_dashboard.json
@@ -1,35 +1,4 @@
 {
-    "__inputs": [
-      {
-        "name": "DS_PROMETHEUS",
-        "label": "Prometheus",
-        "description": "",
-        "type": "datasource",
-        "pluginId": "prometheus",
-        "pluginName": "Prometheus"
-      }
-    ],
-    "__elements": {},
-    "__requires": [
-      {
-        "type": "grafana",
-        "id": "grafana",
-        "name": "Grafana",
-        "version": "10.4.0"
-      },
-      {
-        "type": "datasource",
-        "id": "prometheus",
-        "name": "Prometheus",
-        "version": "1.0.0"
-      },
-      {
-        "type": "panel",
-        "id": "timeseries",
-        "name": "Time series",
-        "version": ""
-      }
-    ],
     "annotations": {
       "list": [
         {
@@ -49,13 +18,13 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "id": null,
+    "id": 42,
     "links": [],
     "panels": [
       {
         "datasource": {
           "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
+          "uid": "prometheus"
         },
         "description": "",
         "fieldConfig": {
@@ -142,7 +111,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -158,7 +127,7 @@
           {
             "datasource": {
               "type": "prometheus",
-              "uid": "${DS_PROMETHEUS}"
+              "uid": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
@@ -183,10 +152,14 @@
       "list": [
         {
           "allValue": "",
-          "current": {},
+          "current": {
+            "selected": false,
+            "text": "5fcc12ae-513f-4eac-a2e0-e7772f191282",
+            "value": "5fcc12ae-513f-4eac-a2e0-e7772f191282"
+          },
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "prometheus"
           },
           "definition": "label_values(coral_credits_allocation_hours_per_project,project_id)",
           "hide": 0,
@@ -207,10 +180,18 @@
           "type": "query"
         },
         {
-          "current": {},
+          "current": {
+            "selected": true,
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "prometheus"
           },
           "definition": "label_values(coral_credits_allocation_hours_per_project,resource_class)",
           "hide": 2,