Fix dashboards

Author: syepes

.github/workflows/rust.yml

@@ -7,14 +7,20 @@ on:
       - main
     paths-ignore:
       - "**.md"
+      - "**.json"
       - "docs/**"
+      - "images/**"
+      - "grafana/**"
   push:
     branches:
       - master
       - main
     paths-ignore:
       - "**.md"
+      - "**.json"
       - "docs/**"
+      - "images/**"
+      - "grafana/**"
 
 env:
   CARGO_TERM_COLOR: always

grafana/1 - PowerFlex - Cluster.json

@@ -59,22 +59,11 @@
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": null,
-<<<<<<< HEAD
   "iteration": 1644015937410,
-=======
-  "iteration": 1643394544402,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
   "links": [],
   "liveNow": false,
   "panels": [
     {
-<<<<<<< HEAD
-=======
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -204,7 +193,6 @@
       ],
       "timeFrom": "1m",
       "title": "Write OPS",
-<<<<<<< HEAD
       "type": "stat"
     },
     {
@@ -265,8 +253,6 @@
       ],
       "timeFrom": "1w",
       "title": "Write ratio",
-=======
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "type": "stat"
     },
     {
@@ -1567,11 +1553,7 @@
       "type": "timeseries"
     }
   ],
-<<<<<<< HEAD
   "refresh": "",
-=======
-  "refresh": false,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
   "schemaVersion": 34,
   "style": "dark",
   "tags": [
@@ -1599,11 +1581,7 @@
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-<<<<<<< HEAD
         "sort": 1,
-=======
-        "sort": 0,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
         "type": "query"
       }
     ]
@@ -1640,10 +1618,6 @@
   "timezone": "browser",
   "title": "1 - PowerFlex - Cluster",
   "uid": "Jetc3MK7k",
-<<<<<<< HEAD
   "version": 11,
-=======
-  "version": 4,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
   "weekStart": ""
 }

grafana/2 - PowerFlex - SDS.json

@@ -59,22 +59,11 @@
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": null,
-<<<<<<< HEAD
   "iteration": 1644015979500,
-=======
-  "iteration": 1643394565115,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
   "links": [],
   "liveNow": false,
   "panels": [
     {
-<<<<<<< HEAD
-=======
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -130,21 +119,11 @@
           "step": 1800
         }
       ],
-<<<<<<< HEAD
       "timeFrom": "1m",
-=======
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "title": "Read OPS",
       "type": "stat"
     },
     {
-<<<<<<< HEAD
-=======
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -200,21 +179,11 @@
           "step": 1800
         }
       ],
-<<<<<<< HEAD
       "timeFrom": "1m",
-=======
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "title": "Write OPS",
       "type": "stat"
     },
     {
-<<<<<<< HEAD
-=======
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -270,21 +239,11 @@
           "step": 1800
         }
       ],
-<<<<<<< HEAD
       "timeFrom": "1m",
-=======
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "title": "Read Bandwidth",
       "type": "stat"
     },
     {
-<<<<<<< HEAD
-=======
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -340,10 +299,7 @@
           "step": 1800
         }
       ],
-<<<<<<< HEAD
       "timeFrom": "1m",
-=======
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
       "title": "Write Bandwidth",
       "type": "stat"
     },
@@ -854,11 +810,7 @@
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-<<<<<<< HEAD
         "sort": 1,
-=======
-        "sort": 0,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
         "type": "query"
       },
       {
@@ -881,11 +833,7 @@
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-<<<<<<< HEAD
         "sort": 1,
-=======
-        "sort": 0,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
         "type": "query"
       },
       {
@@ -908,11 +856,7 @@
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-<<<<<<< HEAD
         "sort": 1,
-=======
-        "sort": 0,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
         "type": "query"
       },
       {
@@ -956,11 +900,7 @@
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-<<<<<<< HEAD
         "sort": 1,
-=======
-        "sort": 0,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
         "type": "query"
       }
     ]
@@ -997,10 +937,6 @@
   "timezone": "browser",
   "title": "2 - PowerFlex - SDS",
   "uid": "R_2yqGFnz",
-<<<<<<< HEAD
   "version": 5,
-=======
-  "version": 3,
->>>>>>> 08f3f7194c9e05973f6a2f1697709ceb70febf8c
   "weekStart": ""
 }