Issue #1

Heating Margin update Main Dashboard - Heating Margin thresholds are now 0-5 Red, 5-10 Green, 10+ Orange - Heating Margin is now based on the lower value over 24 hours - The Site table values is now based on the 24 hours average instead of using instantaneous values - Host Coverage decimal number reduced to 0 Site Dashboard - Heating Margin thresholds is now 0-5 Red, 5-10 Green, 10+ Orange - Heating Margin is now based on the lower value over 24 hours - Heating Margin Hosts Distribution is now based on the lower value over 24 hours - The Recommended Max Site Temperature based on a 24 hour interval - Yearly Savings take into account the new Recommended Max Site Max Site Temperature - The Host table reports values over 24 hours instead of instantaneous values - Coverage decimal number reduced to 0
sentrysoftware · Feb 14, 2024 · 0b3486d · 0b3486d
1 parent 39f5257
commit 0b3486d
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 48 deletions.
diff --git a/src/dashboards/hardware-sentry/Hardware Sentry - Main.json b/src/dashboards/hardware-sentry/Hardware Sentry - Main.json
@@ -199,6 +199,7 @@
           "color": {
             "mode": "thresholds"
           },
+          "decimals": 0,
           "mappings": [],
           "noValue": "0%",
           "thresholds": {
@@ -2152,6 +2153,10 @@
               {
                 "id": "custom.align",
                 "value": "center"
+              },
+              {
+                "id": "decimals",
+                "value": 0
               }
             ]
           },
@@ -2245,7 +2250,7 @@
               {
                 "id": "color",
                 "value": {
-                  "mode": "continuous-RdYlGr"
+                  "mode": "thresholds"
                 }
               },
               {
@@ -2262,6 +2267,30 @@
               {
                 "id": "custom.align",
                 "value": "center"
+              },
+              {
+                "id": "thresholds",
+                "value": {
+                  "mode": "absolute",
+                  "steps": [
+                    {
+                      "color": "red",
+                      "value": null
+                    },
+                    {
+                      "color": "green",
+                      "value": 5
+                    },
+                    {
+                      "color": "orange",
+                      "value": 10
+                    }
+                  ]
+                }
+              },
+              {
+                "id": "decimals",
+                "value": 0
               }
             ]
           },
@@ -2274,6 +2303,10 @@
               {
                 "id": "custom.align",
                 "value": "center"
+              },
+              {
+                "id": "decimals",
+                "value": 0
               }
             ]
           },
@@ -2344,7 +2377,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "avg by (site) (hw_site_electricity_cost{site != \"\"})",
+          "expr": "avg by (site) (avg_over_time(hw_site_electricity_cost{site != \"\"}[1d]))",
           "format": "table",
           "instant": true,
           "interval": "",
@@ -2358,7 +2391,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "avg by (site) (hw_site_carbon_intensity_grams{site != \"\"})",
+          "expr": "avg by (site) (avg_over_time(hw_site_carbon_intensity_grams{site != \"\"}[1d]))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2386,8 +2419,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (site) (hw_host_power_watts{site != \"\"})",
+          "expr": "sum by (site) (avg_over_time(hw_host_power_watts{site != \"\"}[1d]))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2400,8 +2434,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (site) (hardware_sentry_host_up)",
+          "expr": "sum by (site) (avg_over_time(hardware_sentry_host_up[1d]))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2414,8 +2449,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "(sum by (site) (hardware_sentry_host_up)) / scalar(sum(hardware_sentry_host_up))",
+          "expr": "(sum by (site) (avg_over_time(hardware_sentry_host_up[1d]))) / scalar(sum(avg_over_time(hardware_sentry_host_up[1d])))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2428,8 +2464,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "avg by (site) (hw_host_ambient_temperature_celsius{site != \"\"})",
+          "expr": "avg by (site) (avg_over_time(hw_host_ambient_temperature_celsius{site != \"\"}[1d]))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2442,8 +2479,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "min by (site) (hw_host_heating_margin_celsius{site != \"\"})",
+          "expr": "min by (site) (min_over_time(hw_host_heating_margin_celsius{site != \"\"}[1d]))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -3342,12 +3380,14 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
           "expr": "topk(25, hw_host_ambient_temperature_celsius)",
           "format": "table",
           "instant": true,
           "interval": "",
           "legendFormat": "",
+          "range": false,
           "refId": "A"
         }
       ],
@@ -3476,12 +3516,14 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
           "expr": "topk(25, max by (site, host_name) (hw_temperature_celsius))",
           "format": "table",
           "instant": true,
           "interval": "",
           "legendFormat": "",
+          "range": false,
           "refId": "A"
         }
       ],

diff --git a/src/dashboards/hardware-sentry/Hardware Sentry - Site.json b/src/dashboards/hardware-sentry/Hardware Sentry - Site.json
@@ -240,6 +240,7 @@
           "color": {
             "mode": "thresholds"
           },
+          "decimals": 0,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2438,6 +2439,7 @@
           "color": {
             "mode": "thresholds"
           },
+          "decimals": 0,
           "links": [],
           "mappings": [],
           "max": 20,
@@ -2454,11 +2456,11 @@
                 "value": 0
               },
               {
-                "color": "orange",
+                "color": "green",
                 "value": 5
               },
               {
-                "color": "green",
+                "color": "orange",
                 "value": 10
               }
             ]
@@ -2498,7 +2500,8 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "min(hw_host_heating_margin_celsius{site=~\"$site\"})",
+          "expr": "min(min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d]))",
+          "hide": false,
           "instant": true,
           "interval": "",
           "intervalFactor": 1,
@@ -2646,7 +2649,7 @@
             }
           },
           "mappings": [],
-          "max": 40,
+          "max": 15,
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -2862,13 +2865,11 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(hw_host_power_watts{site=~\"$site\"}) * (avg(hw_site_pue_ratio{site=~\"$site\"}) - 1.15) * 24 * 365 * (clamp_max(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}) + min(hw_host_heating_margin_celsius{site=~\"$site\"}) - 5 - ((avg(max_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d:1h])) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}))), 29) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})) * 0.05",
+          "expr": "sum(avg_over_time(hw_host_power_watts{site=~\"$site\"}[1d])) * (avg(avg_over_time(hw_site_pue_ratio{site=~\"$site\"}[1d])) - 1.15) * 24 * 365 * (clamp_max(avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])) + min(min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d])) - 5 - ((avg(max_over_time(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})[1d:])) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])))), 29) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d]))) * 0.05",
           "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "Potential Yearly Energy Savings",
-          "range": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -2928,6 +2929,7 @@
         "y": 26
       },
       "id": 157,
+      "maxDataPoints": 1,
       "options": {
         "bucketOffset": 0,
         "bucketSize": 1,
@@ -2947,11 +2949,12 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "min by (host_name) (hw_host_heating_margin_celsius{site = \"$site\"})",
+          "expr": "min by (host_name) (min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d]))",
+          "hide": false,
           "instant": true,
-          "interval": "",
-          "legendFormat": "{{hostname}}",
-          "refId": "A"
+          "legendFormat": "__auto",
+          "range": false,
+          "refId": "B"
         }
       ],
       "title": "Heating Margin Host Distribution",
@@ -3019,13 +3022,11 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(hw_host_power_watts{site=~\"$site\"}) * (avg(hw_site_pue_ratio{site=~\"$site\"}) - 1.15) * 24 * 365 * (clamp_max(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}) + min(hw_host_heating_margin_celsius{site=~\"$site\"}) - 5 - ((avg(max_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d:1h])) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}))), 29) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})) * 0.05 * avg(hw_site_electricity_cost{site=~\"$site\"}) / 1000",
+          "expr": "sum(avg_over_time(hw_host_power_watts{site=~\"$site\"}[1d])) * (avg(avg_over_time(hw_site_pue_ratio{site=~\"$site\"}[1d])) - 1.15) * 24 * 365 * (clamp_max(avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])) + min(min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d])) - 5 - ((max_over_time(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})[1d:]) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])))), 29) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d]))) * 0.05 * avg(avg_over_time(hw_site_electricity_cost{site=~\"$site\"}[1d])) / 1000",
           "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "Potential Yearly Savings",
-          "range": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -3099,14 +3100,12 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "clamp_min(clamp_max(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}) + (min(hw_host_heating_margin_celsius{site=~\"$site\"}) - 5) - (avg(max_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d:1h])) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})), 29), 15)",
+          "expr": "clamp_min(clamp_max(avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])) * 2 + min(min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d])) - max_over_time(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})[1d:]) - 5, 29), 15)",
           "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "Recommended Maximum Site Temperature",
-          "range": false,
-          "refId": "D"
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
         }
       ],
       "title": "Recommended Max Site Temperature",
@@ -3175,13 +3174,11 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(hw_host_power_watts{site=~\"$site\"}) * (avg(hw_site_pue_ratio{site=~\"$site\"}) - 1.15) * 24 * 365 * (clamp_max(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}) + min(hw_host_heating_margin_celsius{site=~\"$site\"}) - 5 - ((avg(max_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d:1h])) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"}))), 29) - avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})) * 0.05 * avg(hw_site_carbon_intensity_grams{site=~\"$site\"}) / 1000 / 1000000",
+          "expr": "sum(avg_over_time(hw_host_power_watts{site=~\"$site\"}[1d])) * (avg(avg_over_time(hw_site_pue_ratio{site=~\"$site\"}[1d])) - 1.15) * 24 * 365 * (clamp_max(avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])) + min(min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d])) - 5 - ((max_over_time(avg(hw_host_ambient_temperature_celsius{site=~\"$site\"})[1d:]) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])))), 29) - avg(avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d]))) * 0.05 * avg(avg_over_time(hw_site_carbon_intensity_grams{site=~\"$site\"}[1d])) / 1000 / 1000000",
           "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "Potential Yearly CO₂ Reduction",
-          "range": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -3326,11 +3323,11 @@
                       "value": 0
                     },
                     {
-                      "color": "orange",
+                      "color": "green",
                       "value": 5
                     },
                     {
-                      "color": "green",
+                      "color": "orange",
                       "value": 10
                     }
                   ]
@@ -3498,8 +3495,8 @@
         "showHeader": true,
         "sortBy": [
           {
-            "desc": true,
-            "displayName": "Power Consumption"
+            "desc": false,
+            "displayName": "Heating Margin"
           }
         ]
       },
@@ -3524,8 +3521,9 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "hw_host_heating_margin_celsius{site=~\"$site\"}",
+          "expr": "min_over_time(hw_host_heating_margin_celsius{site=~\"$site\"}[1d])",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -3554,7 +3552,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "hw_host_ambient_temperature_celsius{site=~\"$site\"}",
+          "expr": "avg_over_time(hw_host_ambient_temperature_celsius{site=~\"$site\"}[1d])",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -3786,7 +3784,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "blue"
+                "color": "blue",
+                "value": null
               }
             ]
           },