From 2aa47037cd9540596f1f394da8d20d008a24cf36 Mon Sep 17 00:00:00 2001
From: Dawud M <7688823+technowhizz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:36:19 +0000
Subject: [PATCH] Fix temperature graph on hardware overview dash

Fixes the hardware overview dashboard to use the correct metric for
displaying drive temps. Now uses an `or` to display whichever metric is
compatible with the drives in the system. The two metrics are
temperature_case_raw_value and temperature_celsius_raw_value.
---
 .../grafana/dashboards/openstack/hardware_overview.json    | 6 +++---
 ...-hardware-overview-dashboard-temp-ecc047ba46305668.yaml | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/fix-hardware-overview-dashboard-temp-ecc047ba46305668.yaml

diff --git a/etc/kayobe/kolla/config/grafana/dashboards/openstack/hardware_overview.json b/etc/kayobe/kolla/config/grafana/dashboards/openstack/hardware_overview.json
index 63bbf4af3..60649ff28 100644
--- a/etc/kayobe/kolla/config/grafana/dashboards/openstack/hardware_overview.json
+++ b/etc/kayobe/kolla/config/grafana/dashboards/openstack/hardware_overview.json
@@ -530,7 +530,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "smartmon_temperature_case_raw_value{instance=~\"$node\"}",
+          "expr": "smartmon_temperature_case_raw_value{instance=~\"$node\"} or smartmon_temperature_celsius_raw_value{instance=~\"$node\"}",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -664,7 +664,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "avg_over_time(smartmon_temperature_case_raw_value{instance=~\"$node\"}[1h])",
+          "expr": "avg_over_time(smartmon_temperature_case_raw_value{instance=~\"$node\"}[1h]) or avg_over_time(smartmon_temperature_celsius_raw_value{instance=~\"$node\"}[1h])",
           "instant": false,
           "interval": "",
           "legendFormat": "{{instance}} - {{disk}} - {{serial_number}}",
@@ -752,4 +752,4 @@
   "version": 5,
   "weekStart": ""
 }
-{% endraw %}
\ No newline at end of file
+{% endraw %}
diff --git a/releasenotes/notes/fix-hardware-overview-dashboard-temp-ecc047ba46305668.yaml b/releasenotes/notes/fix-hardware-overview-dashboard-temp-ecc047ba46305668.yaml
new file mode 100644
index 000000000..6a395888b
--- /dev/null
+++ b/releasenotes/notes/fix-hardware-overview-dashboard-temp-ecc047ba46305668.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes the hardware overview dashboard to use the correct metric for
+    displaying drive temps. Now uses an `or` to display whichever metric
+    is compatible with the drives in the system. The two metrics are
+    temperature_case_raw_value and temperature_celsius_raw_value.