chore: fix format of input in dashboard lint script (#5830)

* Fix format of input in dashboard lint script * Fix inputs on remaining dashboards
ChainSafe · Aug 1, 2023 · 6ab2f65 · 6ab2f65
1 parent 00b94f3
commit 6ab2f65
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/dashboards/lodestar_networking.json b/dashboards/lodestar_networking.json
@@ -1,12 +1,12 @@
 {
   "__inputs": [
     {
-      "name": "DS_PROMETHEUS",
-      "type": "datasource",
-      "label": "Prometheus",
       "description": "",
+      "label": "Prometheus",
+      "name": "DS_PROMETHEUS",
       "pluginId": "prometheus",
-      "pluginName": "Prometheus"
+      "pluginName": "Prometheus",
+      "type": "datasource"
     }
   ],
   "annotations": {

diff --git a/dashboards/lodestar_rest_api.json b/dashboards/lodestar_rest_api.json
@@ -1,12 +1,12 @@
 {
   "__inputs": [
     {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
       "description": "",
-      "type": "datasource",
+      "label": "Prometheus",
+      "name": "DS_PROMETHEUS",
       "pluginId": "prometheus",
-      "pluginName": "Prometheus"
+      "pluginName": "Prometheus",
+      "type": "datasource"
     }
   ],
   "annotations": {

diff --git a/dashboards/lodestar_summary.json b/dashboards/lodestar_summary.json
@@ -9,18 +9,18 @@
       "type": "datasource"
     },
     {
+      "description": "",
+      "label": "Beacon node job name",
       "name": "VAR_BEACON_JOB",
       "type": "constant",
-      "label": "Beacon node job name",
-      "value": "beacon",
-      "description": ""
+      "value": "beacon"
     },
     {
+      "description": "",
+      "label": "Validator client job name",
       "name": "VAR_VALIDATOR_JOB",
       "type": "constant",
-      "label": "Validator client job name",
-      "value": "validator",
-      "description": ""
+      "value": "validator"
     }
   ],
   "annotations": {

diff --git a/dashboards/lodestar_sync.json b/dashboards/lodestar_sync.json
@@ -7,13 +7,6 @@
       "pluginId": "prometheus",
       "pluginName": "Prometheus",
       "type": "datasource"
-    },
-    {
-      "description": "",
-      "label": "Beacon node job name",
-      "name": "VAR_BEACON_JOB",
-      "type": "constant",
-      "value": "beacon"
     }
   ],
   "annotations": {

diff --git a/scripts/lint-grafana-dashboard.mjs b/scripts/lint-grafana-dashboard.mjs
@@ -98,12 +98,12 @@ export function lintGrafanaDashboard(json) {
   // Always add Prometheus to __inputs
   const inputs = [
     {
-      name: variableNameDatasource,
-      type: "datasource",
-      label: "Prometheus",
       description: "",
+      label: "Prometheus",
+      name: variableNameDatasource,
       pluginId: "prometheus",
       pluginName: "Prometheus",
+      type: "datasource",
     },
   ];
 
@@ -112,19 +112,19 @@ export function lintGrafanaDashboard(json) {
     for (const item of json.templating.list) {
       if (item.query === "${VAR_BEACON_JOB}") {
         inputs.push({
+          description: "",
+          label: "Beacon node job name",
           name: "VAR_BEACON_JOB",
           type: "constant",
-          label: "Beacon node job name",
           value: "beacon",
-          description: "",
         });
       } else if (item.query === "${VAR_VALIDATOR_JOB}") {
         inputs.push({
+          description: "",
+          label: "Validator client job name",
           name: "VAR_VALIDATOR_JOB",
           type: "constant",
-          label: "Validator client job name",
           value: "validator",
-          description: "",
         });
       }
     }