fix: improve dash json sharing

NEIAAC · Nov 26, 2024 · e8bdcc4 · e8bdcc4
1 parent d3a3000
commit e8bdcc4
Show file tree

Hide file tree

Showing 4 changed files with 378 additions and 636 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -52,7 +52,7 @@ services:
       - ${GRAFANA_PORT}:3000
     volumes:
       - ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
-      - ./grafana-dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+      - ./grafana-dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml
       - ./grafana-metrics-dashboard.json:/var/lib/grafana/dashboards/metrics.json
       - ./grafana-logs-dashboard.json:/var/lib/grafana/dashboards/logs.json
       - grafana-data:/var/lib/grafana

diff --git a/grafana-dashboard.yaml → grafana-dashboards.yaml b/grafana-dashboard.yaml → grafana-dashboards.yaml
@@ -3,7 +3,7 @@
 apiVersion: 1
 
 providers:
-  - name: "Dashboard"
+  - name: Dashboards
     orgId: 1
     type: file
 

diff --git a/grafana-logs-dashboard.json b/grafana-logs-dashboard.json
@@ -1,4 +1,35 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOKI",
+      "label": "Loki",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "loki",
+      "pluginName": "Loki"
+    }
+  ],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "11.3.1"
+    },
+    {
+      "type": "panel",
+      "id": "logs",
+      "name": "Logs",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "loki",
+      "name": "Loki",
+      "version": "1.0.0"
+    }
+  ],
   "annotations": {
     "list": [
       {
@@ -24,18 +55,14 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": null,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": {
         "type": "loki",
         "uid": "${datasource}"
       },
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 15,
         "w": 24,
@@ -54,7 +81,7 @@
         {
           "datasource": {
             "type": "loki",
-            "uid": "${datasource}"
+            "uid": "${DS_LOKI}"
           },
           "expr": "{container_name=~\"$container_name.+\"}",
           "refId": "A"
@@ -64,7 +91,6 @@
       "type": "logs"
     }
   ],
-  "preload": false,
   "refresh": "",
   "schemaVersion": 40,
   "tags": [
@@ -74,11 +100,11 @@
     "list": [
       {
         "allValue": ".*",
-        "current": {
-          "text": "All",
-          "value": "$__all"
+        "current": {},
+        "datasource": {
+          "type": "loki",
+          "uid": "${DS_LOKI}"
         },
-        "datasource": "${datasource}",
         "includeAll": true,
         "label": "Container",
         "multi": true,
@@ -89,10 +115,7 @@
         "type": "query"
       },
       {
-        "current": {
-          "text": "Loki",
-          "value": "P8E80F9AEF21F6940"
-        },
+        "current": {},
         "label": "Datasource",
         "name": "datasource",
         "options": [],
@@ -120,5 +143,7 @@
   "timepicker": {},
   "timezone": "",
   "title": "Logs",
+  "uid": "be54tqkbqhse8d",
+  "version": 28,
   "weekStart": ""
-}
+}