Revert "graph changes"

This reverts commit 8857fca797.

salt/grafana/defaults.yaml

@@ -1388,10 +1388,10 @@ grafana:
             w: 4
         monitor_interface_traffic_stat:
           gridPos:
-            x: 0
+            x: 8
             y: 5
             h: 4
-            w: 12
+            w: 4
         zeek_packet_loss_stat:
           gridPos:
             x: 12

salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja

@@ -79,8 +79,6 @@
     "legend": {
       "displayMode": "table",
       "placement": "right",
-      "sort": "lastNotNull",
-      "sortDesc": false,
       "calcs": [
         "max",
         "mean",

salt/grafana/panels/system_uptime_graph.json.jinja

@@ -1,139 +1,148 @@
 {
-  "id": 69016,
+  "type": "graph",
-  "gridPos": {
-    "h": 8,
-    "w": 12,
-    "x": 0,
-    "y": 1
-  },
-  "type": "timeseries",
   "title": "System Uptime",
-  "datasource": "InfluxDB",
+  "gridPos": {
-  "pluginVersion": "8.2.1",
+    "x": {{ PANELS.system_uptime_graph.gridPos.x }},
-  "fieldConfig": {
+    "y": {{ PANELS.system_uptime_graph.gridPos.y }},
-    "defaults": {
+    "w": {{ PANELS.system_uptime_graph.gridPos.w }},
-      "custom": {
+    "h": {{ PANELS.system_uptime_graph.gridPos.h }}
-        "drawStyle": "line",
-        "lineInterpolation": "linear",
-        "barAlignment": 0,
-        "lineWidth": 1,
-        "fillOpacity": 0,
-        "gradientMode": "none",
-        "spanNulls": false,
-        "showPoints": "never",
-        "pointSize": 5,
-        "stacking": {
-          "mode": "none",
-          "group": "A"
-        },
-        "axisPlacement": "auto",
-        "axisLabel": "",
-        "scaleDistribution": {
-          "type": "linear"
-        },
-        "hideFrom": {
-          "tooltip": false,
-          "viz": false,
-          "legend": false
-        },
-        "thresholdsStyle": {
-          "mode": "off"
-        }
-      },
-      "color": {
-        "mode": "palette-classic"
-      },
-      "thresholds": {
-        "mode": "absolute",
-        "steps": [
-          {
-            "color": "green",
-            "value": null
-          }
-        ]
-      },
-      "mappings": [],
-      "unit": "s",
-      "decimals": 1,
-      "min": 0,
-      "max": 604800
-    },
-    "overrides": []
-  },
-  "options": {
-    "tooltip": {
-      "mode": "single"
-    },
-    "legend": {
-      "displayMode": "table",
-      "placement": "right",
-      "sort": "lastNotNull",
-      "sortDesc": false,
-      "calcs": [
-        "lastNotNull"
-      ]
-    }
   },
+  "id": 69016,
   "targets": [
     {
-      "alias": "$tag_host $tag_role",
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "host"
-          ],
-          "type": "tag"
-        },
-        {
-          "params": [
-            "role"
-          ],
-          "type": "tag"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "measurement": "system",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "queryType": "randomWalk",
       "refId": "A",
+      "queryType": "randomWalk",
+      "policy": "default",
       "resultFormat": "time_series",
-      "select": [
+      "orderByTime": "ASC",
-        [
-          {
-            "params": [
-              "uptime"
-            ],
-            "type": "field"
-          },
-          {
-            "params": [],
-            "type": "last"
-          }
-        ]
-      ],
       "tags": [
         {
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
         }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "role"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
           ]
         }
       ],
-  "description": "",
+      "select": [
-  "timeFrom": null,
+        [
-  "timeShift": null,
+          {
-  "interval": "30"
+            "type": "field",
+            "params": [
+              "uptime"
+            ]
+          },
+          {
+            "type": "last",
+            "params": []
+          }
+        ]
+      ],
+      "measurement": "system",
+      "alias": "$tag_host $tag_role"
+    }
+  ],
+  "options": {
+    "alertThreshold": true
+  },
+  "datasource": "InfluxDB",
+  "fieldConfig": {
+    "defaults": {},
+    "overrides": []
+  },
+  "pluginVersion": "7.5.4",
+  "renderer": "flot",
+  "yaxes": [
+    {
+      "label": "",
+      "show": true,
+      "logBase": 1,
+      "min": "0",
+      "max": "604800",
+      "format": "s",
+      "$$hashKey": "object:213",
+      "decimals": 1
+    },
+    {
+      "label": null,
+      "show": true,
+      "logBase": 1,
+      "min": null,
+      "max": null,
+      "format": "short",
+      "$$hashKey": "object:214"
+    }
+  ],
+  "xaxis": {
+    "show": true,
+    "mode": "time",
+    "name": null,
+    "values": [],
+    "buckets": null
+  },
+  "yaxis": {
+    "align": false,
+    "alignLevel": null
+  },
+  "lines": true,
+  "linewidth": 1,
+  "dashLength": 10,
+  "spaceLength": 10,
+  "pointradius": 2,
+  "legend": {
+    "show": true,
+    "values": true,
+    "min": false,
+    "max": false,
+    "current": true,
+    "total": false,
+    "avg": false,
+    "alignAsTable": true,
+    "rightSide": true
+  },
+  "nullPointMode": "connected",
+  "tooltip": {
+    "value_type": "individual",
+    "shared": true,
+    "sort": 1
+  },
+  "aliasColors": {},
+  "seriesOverrides": [],
+  "thresholds": [],
+  "timeRegions": [],
+  "fill": 0,
+  "fillGradient": 0,
+  "dashes": false,
+  "hiddenSeries": false,
+  "points": false,
+  "bars": false,
+  "stack": false,
+  "percentage": false,
+  "steppedLine": false,
+  "decimals": 1,
+  "description": ""
 }

salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja

@@ -1,29 +1,43 @@
 {
-  "id": 68896,
+  "aliasColors": {},
+  "dashLength": 10,
+  "datasource": "InfluxDB",
+  "decimals": 1,
+  "fieldConfig": {
+    "defaults": {},
+    "overrides": []
+  },
   "gridPos": {
     "x": {{ PANELS.uptime_docker_combined_current_graph.gridPos.x }},
     "y": {{ PANELS.uptime_docker_combined_current_graph.gridPos.y }},
     "w": {{ PANELS.uptime_docker_combined_current_graph.gridPos.w }},
     "h": {{ PANELS.uptime_docker_combined_current_graph.gridPos.h }}
   },
-  "type": "timeseries",
+  "id": 68896,
-  "title": "Container Uptime Current",
-  "datasource": "InfluxDB",
-  "pluginVersion": "8.2.1",
-  "options": {
-    "tooltip": {
-      "mode": "single"
-    },
   "legend": {
-      "displayMode": "table",
+    "alignAsTable": true,
-      "placement": "right",
+    "avg": false,
-      "sort": "lastNotNull",
+    "current": true,
+    "max": false,
+    "min": false,
+    "rightSide": true,
+    "show": true,
+    "sort": "current",
     "sortDesc": false,
-      "calcs": [
+    "total": false,
-        "lastNotNull"
+    "values": true
-      ]
-    }
   },
+  "lines": true,
+  "linewidth": 1,
+  "nullPointMode": "connected",
+  "options": {
+    "alertThreshold": true
+  },
+  "pluginVersion": "7.5.4",
+  "pointradius": 2,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "spaceLength": 10,
   "targets": [
     {
       "alias": "$tag_host $tag_role $tag_container_name",
@@ -41,16 +55,16 @@
           "type": "tag"
         },
         {
+          "type": "tag",
           "params": [
             "host"
-          ],
+          ]
-          "type": "tag"
         },
         {
+          "type": "tag",
           "params": [
             "role"
-          ],
+          ]
-          "type": "tag"
         },
         {
           "params": [
@@ -59,7 +73,6 @@
           "type": "fill"
         }
       ],
-      "limit": "",
       "measurement": "docker_container_status",
       "orderByTime": "ASC",
       "policy": "default",
@@ -71,18 +84,17 @@
       "select": [
         [
           {
+            "type": "field",
             "params": [
               "uptime_ns"
-            ],
+            ]
-            "type": "field"
           },
           {
-            "params": [],
+            "type": "last",
-            "type": "last"
+            "params": []
           }
         ]
       ],
-      "slimit": "",
       "tags": [
         {
           "key": "host",
@@ -95,60 +107,62 @@
           "operator": "=~",
           "value": "/^$containers$/"
         }
-      ]
+      ],
+      "slimit": "",
+      "limit": ""
     }
   ],
-  "fieldConfig": {
+  "thresholds": [],
-    "defaults": {
+  "timeRegions": [],
-      "custom": {
+  "title": "Container Uptime Current",
-        "drawStyle": "line",
+  "tooltip": {
-        "lineInterpolation": "linear",
+    "shared": true,
-        "barAlignment": 0,
+    "sort": 1,
-        "lineWidth": 1,
+    "value_type": "individual"
-        "fillOpacity": 0,
-        "gradientMode": "none",
-        "spanNulls": false,
-        "showPoints": "never",
-        "pointSize": 5,
-        "stacking": {
-          "mode": "none",
-          "group": "A"
   },
-        "axisPlacement": "auto",
+  "type": "graph",
-        "axisLabel": "",
+  "xaxis": {
-        "scaleDistribution": {
+    "buckets": null,
-          "type": "linear"
+    "mode": "time",
+    "name": null,
+    "show": true,
+    "values": []
   },
-        "hideFrom": {
+  "yaxes": [
-          "tooltip": false,
-          "viz": false,
-          "legend": false
-        },
-        "thresholdsStyle": {
-          "mode": "off"
-        }
-      },
-      "color": {
-        "mode": "palette-classic"
-      },
-      "thresholds": {
-        "mode": "absolute",
-        "steps": [
     {
-            "color": "green",
+      "$$hashKey": "object:192",
-            "value": null
+      "format": "ns",
+      "label": null,
+      "logBase": 1,
+      "max": "604800000000000",
+      "min": "0",
+      "show": true,
+      "decimals": 1
+    },
+    {
+      "$$hashKey": "object:193",
+      "decimals": 2,
+      "format": "short",
+      "label": "",
+      "logBase": 1,
+      "max": null,
+      "min": "0",
+      "show": false
     }
-        ]
+  ],
+  "yaxis": {
+    "align": false,
+    "alignLevel": null
   },
-      "mappings": [],
+  "bars": false,
-      "unit": "ns",
+  "dashes": false,
-      "decimals": 1,
+  "fill": 0,
-      "min": 0,
+  "fillGradient": 0,
-      "max": 604800000000000
+  "hiddenSeries": false,
-    },
+  "percentage": false,
-    "overrides": []
+  "points": false,
-  },
+  "stack": false,
-  "interval": "30s",
+  "steppedLine": false,
   "timeFrom": null,
   "timeShift": null
 }