Merge pull request #466 from nickbabcock/layout

Update layout of prometheus dashboard

assets/dashboards/ohm-prometheus.json

@@ -1809,8 +1809,8 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
-        "w": 24,
+        "h": 8,
+        "w": 12,
         "x": 0,
         "y": 16
       },
@@ -1916,10 +1916,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
-        "w": 24,
-        "x": 0,
-        "y": 25
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 16
       },
       "id": 103,
       "options": {
@@ -2041,9 +2041,9 @@
       },
       "gridPos": {
         "h": 9,
-        "w": 24,
+        "w": 12,
         "x": 0,
-        "y": 34
+        "y": 24
       },
       "id": 107,
       "options": {
@@ -2157,9 +2157,9 @@
       },
       "gridPos": {
         "h": 9,
-        "w": 24,
-        "x": 0,
-        "y": 43
+        "w": 12,
+        "x": 12,
+        "y": 24
       },
       "id": 105,
       "options": {
@@ -2250,8 +2250,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2267,7 +2266,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 52
+        "y": 33
       },
       "id": 26,
       "options": {
@@ -2311,7 +2310,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 61
+        "y": 42
       },
       "id": 109,
       "panels": [],
@@ -2369,8 +2368,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2384,9 +2382,9 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 24,
+        "w": 12,
         "x": 0,
-        "y": 62
+        "y": 43
       },
       "id": 18,
       "options": {
@@ -2491,8 +2489,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2500,17 +2497,17 @@
               }
             ]
           },
-          "unit": "watt"
+          "unit": "hertz"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 70
+        "x": 12,
+        "y": 43
       },
-      "id": 116,
+      "id": 120,
       "options": {
         "legend": {
           "calcs": [
@@ -2536,12 +2533,12 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_watts{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpunvidia_hertz{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
+          "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{sensor}}",
-          "range": true,
           "refId": "A"
         },
         {
@@ -2551,17 +2548,17 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_watts{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_hertz{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
+          "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{sensor}}",
-          "range": true,
           "refId": "B"
         }
       ],
-      "title": "Wattage",
+      "title": "Frequencies",
       "type": "timeseries"
     },
     {
@@ -2614,8 +2611,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2623,17 +2619,17 @@
               }
             ]
           },
-          "unit": "hertz"
+          "unit": "watt"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 70
+        "x": 0,
+        "y": 51
       },
-      "id": 120,
+      "id": 116,
       "options": {
         "legend": {
           "calcs": [
@@ -2659,12 +2655,12 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_hertz{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpunvidia_watts{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
-          "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{sensor}}",
+          "range": true,
           "refId": "A"
         },
         {
@@ -2674,17 +2670,17 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_hertz{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_watts{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
-          "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "{{sensor}}",
+          "range": true,
           "refId": "B"
         }
       ],
-      "title": "Frequencies",
+      "title": "Wattage",
       "type": "timeseries"
     },
     {
@@ -2703,7 +2699,6 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
-            "axisSoftMax": 100,
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
@@ -2728,7 +2723,7 @@
               "mode": "none"
             },
             "thresholdsStyle": {
-              "mode": "off"
+              "mode": "line"
             }
           },
           "links": [],
@@ -2738,8 +2733,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2747,17 +2741,45 @@
               }
             ]
           },
-          "unit": "celsius"
+          "unit": "rotrpm"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "High RPM"
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": true,
+                  "viz": false
+                }
+              },
+              {
+                "id": "custom.spanNulls",
+                "value": true
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
-        "h": 9,
+        "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 78
+        "x": 12,
+        "y": 51
       },
-      "id": 118,
+      "id": 123,
       "options": {
         "legend": {
           "calcs": [
@@ -2782,14 +2804,32 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_celsius{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpunvidia_revolutions_per_minute{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
+          "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{sensor}}",
+          "legendFormat": "Fan",
           "refId": "A"
         },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "(max_over_time(ohm_gpunvidia_revolutions_per_minute{instance=\"$instance\"}[$__range]) / (max_over_time(ohm_gpunvidia_control_percent{instance=\"$instance\"}[$__range]) / 100)) * 0.9",
+          "format": "time_series",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "High RPM",
+          "range": false,
+          "refId": "C"
+        },
         {
           "datasource": {
             "type": "prometheus",
@@ -2797,17 +2837,52 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_celsius{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_revolutions_per_minute{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{sensor}}",
+          "legendFormat": "Fan",
           "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "exemplar": false,
+          "expr": "(max_over_time(ohm_gpuati_revolutions_per_minute{instance=\"$instance\"}[$__range]) / (max_over_time(ohm_gpuati_control_percent{instance=\"$instance\"}[$__range]) / 100)) * 0.9",
+          "format": "time_series",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "High RPM",
+          "range": false,
+          "refId": "D"
+        }
+      ],
+      "title": "Fan",
+      "transformations": [
+        {
+          "id": "configFromData",
+          "options": {
+            "applyTo": {
+              "id": "byFrameRefID",
+              "options": "A"
+            },
+            "configRefId": "C",
+            "mappings": [
+              {
+                "fieldName": "High RPM",
+                "handlerKey": "threshold1"
+              }
+            ]
+          }
         }
       ],
-      "title": "Temperatures",
       "type": "timeseries"
     },
     {
@@ -2826,6 +2901,7 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
+            "axisSoftMax": 100,
             "barAlignment": 0,
             "barWidthFactor": 0.6,
             "drawStyle": "line",
@@ -2850,7 +2926,7 @@
               "mode": "none"
             },
             "thresholdsStyle": {
-              "mode": "line"
+              "mode": "off"
             }
           },
           "links": [],
@@ -2860,8 +2936,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2869,45 +2944,17 @@
               }
             ]
           },
-          "unit": "rotrpm"
+          "unit": "celsius"
         },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "High RPM"
-            },
-            "properties": [
-              {
-                "id": "custom.hideFrom",
-                "value": {
-                  "legend": false,
-                  "tooltip": true,
-                  "viz": false
-                }
-              },
-              {
-                "id": "custom.spanNulls",
-                "value": true
-              },
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "red",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          }
-        ]
+        "overrides": []
       },
       "gridPos": {
         "h": 9,
         "w": 12,
-        "x": 12,
-        "y": 78
+        "x": 0,
+        "y": 59
       },
-      "id": 123,
+      "id": 118,
       "options": {
         "legend": {
           "calcs": [
@@ -2932,32 +2979,14 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_revolutions_per_minute{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpunvidia_celsius{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
-          "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Fan",
+          "legendFormat": "{{sensor}}",
           "refId": "A"
         },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "(max_over_time(ohm_gpunvidia_revolutions_per_minute{instance=\"$instance\"}[$__range]) / (max_over_time(ohm_gpunvidia_control_percent{instance=\"$instance\"}[$__range]) / 100)) * 0.9",
-          "format": "time_series",
-          "hide": false,
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "High RPM",
-          "range": false,
-          "refId": "C"
-        },
         {
           "datasource": {
             "type": "prometheus",
@@ -2965,52 +2994,17 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_revolutions_per_minute{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_celsius{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Fan",
+          "legendFormat": "{{sensor}}",
           "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "(max_over_time(ohm_gpuati_revolutions_per_minute{instance=\"$instance\"}[$__range]) / (max_over_time(ohm_gpuati_control_percent{instance=\"$instance\"}[$__range]) / 100)) * 0.9",
-          "format": "time_series",
-          "hide": false,
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "High RPM",
-          "range": false,
-          "refId": "D"
-        }
-      ],
-      "title": "Fan",
-      "transformations": [
-        {
-          "id": "configFromData",
-          "options": {
-            "applyTo": {
-              "id": "byFrameRefID",
-              "options": "A"
-            },
-            "configRefId": "C",
-            "mappings": [
-              {
-                "fieldName": "High RPM",
-                "handlerKey": "threshold1"
-              }
-            ]
-          }
         }
       ],
+      "title": "Temperatures",
       "type": "timeseries"
     },
     {
@@ -3063,8 +3057,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -3072,17 +3065,17 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "binBps"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 9,
         "w": 12,
-        "x": 0,
-        "y": 87
+        "x": 12,
+        "y": 59
       },
-      "id": 122,
+      "id": 121,
       "options": {
         "legend": {
           "calcs": [
@@ -3105,8 +3098,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_bytes{instance=\"$instance\"}",
+          "expr": "ohm_gpunvidia_bytes_per_second{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -3121,7 +3115,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_bytes{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_bytes_per_second{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -3131,7 +3125,7 @@
           "refId": "B"
         }
       ],
-      "title": "Memory",
+      "title": "Data Rate",
       "type": "timeseries"
     },
     {
@@ -3184,8 +3178,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -3193,17 +3186,17 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "bytes"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 9,
         "w": 12,
-        "x": 12,
-        "y": 87
+        "x": 0,
+        "y": 68
       },
-      "id": 121,
+      "id": 122,
       "options": {
         "legend": {
           "calcs": [
@@ -3226,9 +3219,8 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpunvidia_bytes_per_second{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpunvidia_bytes{instance=\"$instance\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -3243,7 +3235,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "ohm_gpuati_bytes_per_second{instance=\"$instance\",hw_instance=\"$gpu\"}",
+          "expr": "ohm_gpuati_bytes{instance=\"$instance\",hw_instance=\"$gpu\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -3253,7 +3245,7 @@
           "refId": "B"
         }
       ],
-      "title": "Data Rate",
+      "title": "Memory",
       "type": "timeseries"
     },
     {
@@ -3262,7 +3254,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 96
+        "y": 77
       },
       "id": 41,
       "panels": [],
@@ -3291,8 +3283,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "#EAB839",
@@ -3345,8 +3336,7 @@
                   "mode": "absolute",
                   "steps": [
                     {
-                      "color": "green",
-                      "value": null
+                      "color": "green"
                     },
                     {
                       "color": "#EAB839",
@@ -3452,8 +3442,7 @@
                   "mode": "absolute",
                   "steps": [
                     {
-                      "color": "green",
-                      "value": null
+                      "color": "green"
                     },
                     {
                       "color": "#EAB839",
@@ -3506,8 +3495,7 @@
                   "mode": "absolute",
                   "steps": [
                     {
-                      "color": "green",
-                      "value": null
+                      "color": "green"
                     },
                     {
                       "color": "red",
@@ -3540,7 +3528,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 97
+        "y": 78
       },
       "id": 43,
       "options": {
@@ -3735,7 +3723,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 104
+        "y": 85
       },
       "id": 52,
       "panels": [],
@@ -3766,7 +3754,7 @@
         "h": 5,
         "w": 12,
         "x": 0,
-        "y": 105
+        "y": 86
       },
       "id": 12,
       "options": {
@@ -3870,7 +3858,7 @@
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 105
+        "y": 86
       },
       "id": 65,
       "options": {
@@ -3967,7 +3955,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 110
+        "y": 91
       },
       "id": 58,
       "options": {
@@ -4076,7 +4064,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 110
+        "y": 91
       },
       "id": 59,
       "options": {
@@ -4127,7 +4115,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 132
+        "y": 113
       },
       "id": 130,
       "panels": [],
@@ -4197,7 +4185,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 133
+        "y": 114
       },
       "id": 136,
       "options": {
@@ -4301,7 +4289,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 133
+        "y": 114
       },
       "id": 138,
       "options": {
@@ -4435,7 +4423,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 142
+        "y": 123
       },
       "id": 140,
       "options": {
@@ -4481,7 +4469,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 151
+        "y": 132
       },
       "id": 30,
       "panels": [],
@@ -4573,9 +4561,9 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 24,
+        "w": 8,
         "x": 0,
-        "y": 152
+        "y": 133
       },
       "id": 32,
       "options": {
@@ -4732,7 +4720,7 @@
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 160
+        "y": 141
       },
       "id": 34,
       "maxPerRow": 3,
@@ -4893,6 +4881,6 @@
   "timezone": "",
   "title": "Ohm Windows Desktop",
   "uid": "EEQD4wv7z",
-  "version": 7,
+  "version": 8,
   "weekStart": ""
 }