From a63c270044ea668f13f5d380356dbdfedea91c3b Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 26 Feb 2024 11:25:40 +0100
Subject: [PATCH] fix home dashboard to use station state enums

---
 dashboards/home.json | 46 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/dashboards/home.json b/dashboards/home.json
index 6ed31ef..7203cdd 100644
--- a/dashboards/home.json
+++ b/dashboards/home.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 95,
+  "id": 90,
   "links": [
     {
       "asDropdown": true,
@@ -126,7 +126,7 @@
           "calcs": [
             "lastNotNull"
           ],
-          "fields": "/^str_value$/",
+          "fields": "/^ds_station_state$/",
           "values": false
         },
         "showPercentChange": false,
@@ -142,11 +142,11 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "ds_station_state_info",
+          "expr": "ds_station_state{host=\"$station\"} > 0",
           "format": "table",
           "instant": true,
           "interval": "",
-          "legendFormat": "{{state_value}}",
+          "legendFormat": "__auto",
           "range": false,
           "refId": "A"
         }
@@ -553,7 +553,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "# obtain geographical location as a \"geohash\" label\r\nlabel_join(ds_antenna_reference_geohash_info{host=\"$station\"}, \"geohash\", \"\", \"str_value\")\r\n\r\n# obtain antenna name as an \"antenna_name\" label\r\n* on(x, member) group_right(geohash)\r\nlabel_join(ds_antenna_names_info{host=\"$station\"}, \"antenna_name\", \"\", \"str_value\")\r\n\r\n# # obtain the value of the marker\r\n* on(x, member) group_right(geohash, antenna_name, antenna_quality)\r\n(\r\n    # select antennas that are in an active field and in the usage mask\r\n    (label_join(ds_active_antenna_fields_info,\"member\",\"\",\"str_value\") * on(member) group_right ds_antenna_usage_mask{access=\"r\",family=\"DigitalBeam\"}) or\r\n    # add antennas in inactive fields\r\n    (ds_antenna_usage_mask{access=\"r\",family=\"DigitalBeam\"} * 0)\r\n)\r\n",
+          "expr": "# obtain geographical location as a \"geohash\" label\r\nlabel_join(ds_antenna_reference_geohash_info{host=\"$station\"}, \"geohash\", \"\", \"str_value\")\r\n\r\n# obtain antenna name as an \"antenna_name\" label\r\n* on(x, member) group_right(geohash)\r\nlabel_join(ds_antenna_names_info{host=\"$station\"}, \"antenna_name\", \"\", \"str_value\")\r\n\r\n# # obtain the value of the marker\r\n* on(x, member) group_right(geohash, antenna_name, antenna_quality)\r\n(\r\n    # select antennas that are in an active field and in the usage mask\r\n    (label_join(ds_active_antenna_fields_info,\"member\",\"\",\"str_value\") * on(x, member) group_right ds_antenna_usage_mask{access=\"r\",family=\"DigitalBeam\"}) or\r\n    # add antennas in inactive fields\r\n    (ds_antenna_usage_mask{access=\"r\",family=\"DigitalBeam\"} * 0)\r\n)\r\n",
           "format": "table",
           "instant": true,
           "legendFormat": "{{idx}}: {{antenna_name}} = {{Value}}",
@@ -619,7 +619,7 @@
           "calcs": [
             "lastNotNull"
           ],
-          "fields": "/^str_value$/",
+          "fields": "/^ds_requested_station_state$/",
           "values": false
         },
         "showPercentChange": false,
@@ -635,41 +635,17 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "ds_station_state_transitioning * on(station) group_left(str_value) ds_last_requested_transition_info",
+          "expr": "(ds_requested_station_state{host=\"$station\"} > 0) * on(host) group_right(ds_requested_station_state) (ds_station_state_transitioning{host=\"$station\"} +1)",
           "format": "table",
           "instant": true,
           "interval": "",
-          "legendFormat": "{{state_value}}",
+          "legendFormat": "__auto",
           "range": false,
           "refId": "A"
         }
       ],
       "title": "Active State Transition",
-      "transformations": [
-        {
-          "id": "filterByValue",
-          "options": {
-            "filters": [
-              {
-                "config": {
-                  "id": "equal",
-                  "options": {
-                    "value": ""
-                  }
-                },
-                "fieldName": "Value"
-              }
-            ],
-            "match": "any",
-            "type": "exclude"
-          }
-        },
-        {
-          "disabled": true,
-          "id": "labelsToFields",
-          "options": {}
-        }
-      ],
+      "transformations": [],
       "type": "stat"
     },
     {
@@ -757,6 +733,6 @@
   "timezone": "",
   "title": "Home",
   "uid": "home",
-  "version": 7,
+  "version": 2,
   "weekStart": ""
-}
+}
\ No newline at end of file
-- 
GitLab