scripts/dashboards_render_atlas.py

@@ -605,43 +605,47 @@ ANANKE_UPS_RUNTIME_BY_SOURCE = f"ananke_ups_runtime_seconds{{{ANANKE_SELECTOR}}}
 ANANKE_UPS_LOAD_BY_SOURCE = f"ananke_ups_load_percent{{{ANANKE_SELECTOR}}}"
 ANANKE_UPS_CHARGE_BY_SOURCE = f"ananke_ups_battery_charge_percent{{{ANANKE_SELECTOR}}}"
 ANANKE_UPS_TRIGGER_BY_SOURCE = f"ananke_ups_trigger_active{{{ANANKE_SELECTOR}}}"
-CLIMATE_SENSOR_COUNT = "count(typhon_temperature_celsius) or on() vector(0)"
+CLIMATE_SENSOR_COUNT = "count(atlas_climate_temperature_celsius) or on() vector(0)"
-CLIMATE_TEMP_MAX = "max(typhon_temperature_celsius) or on() vector(0)"
+CLIMATE_TEMP_MAX = "max(atlas_climate_tent_temperature_celsius) or max(atlas_climate_temperature_celsius) or on() vector(0)"
-CLIMATE_PRESSURE_CURRENT = "max(typhon_vpd_kpa) or on() vector(0)"
+CLIMATE_PRESSURE_CURRENT = "max(atlas_climate_tent_pressure_kpa) or max(atlas_climate_pressure_kpa) or on() vector(0)"
-CLIMATE_HUMIDITY_MAX = "max(typhon_relative_humidity_percent) or on() vector(0)"
+CLIMATE_HUMIDITY_MAX = "max(atlas_climate_humidity_percent) or on() vector(0)"
-CLIMATE_TEMP_SERIES = "typhon_temperature_celsius"
+CLIMATE_TEMP_SERIES = "(atlas_climate_tent_temperature_celsius or atlas_climate_temperature_celsius)"
-CLIMATE_PRESSURE_SERIES = "typhon_vpd_kpa"
+CLIMATE_PRESSURE_SERIES = "(atlas_climate_tent_pressure_kpa or atlas_climate_pressure_kpa)"
-CLIMATE_HUMIDITY_SERIES = "typhon_relative_humidity_percent"
-CLIMATE_DEWPOINT_SERIES = (
-    "(243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + "
-    "(17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / "
-    "(17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + "
-    "(17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))"
-)
-CLIMATE_DEWPOINT_CURRENT = f"max({CLIMATE_DEWPOINT_SERIES}) or on() vector(0)"
 CLIMATE_FAN_OUTLET_CURRENT = (
-    'max(typhon_fan_speed_level{fan_group="outlet"}) or on() vector(0)'
+    'max(atlas_climate_fan_activity_level{fan_group="outlet"}) '
+    'or max(atlas_climate_fan_activity_level{position="outlet"}) '
+    "or on() vector(0)"
 )
 CLIMATE_FAN_INSIDE_INLET_CURRENT = (
-    'max(typhon_fan_speed_level{fan_group="inside_inlet"}) or on() vector(0)'
+    'max(atlas_climate_fan_activity_level{fan_group="inside_inlet"}) '
+    'or max(atlas_climate_fan_activity_level{position="inside_inlet"}) '
+    "or on() vector(0)"
 )
 CLIMATE_FAN_OUTSIDE_INLET_CURRENT = (
-    'max(typhon_fan_speed_level{fan_group="outside_inlet"}) or on() vector(0)'
+    'max(atlas_climate_fan_activity_level{fan_group="outside_inlet"}) '
+    'or max(atlas_climate_fan_activity_level{position="outside_inlet"}) '
+    "or on() vector(0)"
 )
 CLIMATE_FAN_INTERIOR_CURRENT = (
-    'max(typhon_fan_speed_level{fan_group="interior"}) or on() vector(0)'
+    'max(atlas_climate_fan_activity_level{fan_group="interior"}) '
+    'or max(atlas_climate_fan_activity_level{position="interior"}) '
+    "or on() vector(0)"
 )
 CLIMATE_FAN_OUTLET_SERIES = (
-    'typhon_fan_speed_level{fan_group="outlet"}'
+    '(atlas_climate_fan_activity_level{fan_group="outlet"} '
+    'or atlas_climate_fan_activity_level{position="outlet"})'
 )
 CLIMATE_FAN_INSIDE_INLET_SERIES = (
-    'typhon_fan_speed_level{fan_group="inside_inlet"}'
+    '(atlas_climate_fan_activity_level{fan_group="inside_inlet"} '
+    'or atlas_climate_fan_activity_level{position="inside_inlet"})'
 )
 CLIMATE_FAN_OUTSIDE_INLET_SERIES = (
-    'typhon_fan_speed_level{fan_group="outside_inlet"}'
+    '(atlas_climate_fan_activity_level{fan_group="outside_inlet"} '
+    'or atlas_climate_fan_activity_level{position="outside_inlet"})'
 )
 CLIMATE_FAN_INTERIOR_SERIES = (
-    'typhon_fan_speed_level{fan_group="interior"}'
+    '(atlas_climate_fan_activity_level{fan_group="interior"} '
+    'or atlas_climate_fan_activity_level{position="interior"})'
 )
 POSTGRES_CONN_USED = (
     'label_replace(sum(pg_stat_activity_count), "conn", "used", "__name__", ".*") '
@@ -1405,8 +1409,6 @@ def build_overview():
                     "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {ANANKE_UPS_TETHYS_NODE}"}],
                 },
             ],
-            orientation="horizontal",
-            wide_layout=True,
             links=link_to("atlas-power"),
             description="Per-UPS live snapshot: current draw, discharge, and charging/discharging status.",
         )
@@ -1439,20 +1441,16 @@ def build_overview():
             text_mode="value",
             targets=[
                 {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "Tent Temp (°C)", "instant": True},
-                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent VPD (kPa)", "instant": True},
+                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent Pressure (kPa)", "instant": True},
-                {"refId": "C", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "Tent RH (%)", "instant": True},
-                {"refId": "D", "expr": CLIMATE_DEWPOINT_CURRENT, "legendFormat": "Dew Point (°C)", "instant": True},
             ],
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "Tent Temp (°C)"}, "properties": [{"id": "unit", "value": "celsius"}]},
-                {"matcher": {"id": "byName", "options": "Tent VPD (kPa)"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
+                {"matcher": {"id": "byName", "options": "Tent Pressure (kPa)"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
-                {"matcher": {"id": "byName", "options": "Tent RH (%)"}, "properties": [{"id": "unit", "value": "percent"}]},
-                {"matcher": {"id": "byName", "options": "Dew Point (°C)"}, "properties": [{"id": "unit", "value": "celsius"}]},
             ],
             links=link_to("atlas-power"),
-            description="Current tent temperature, humidity, VPD, and dew point.",
+            description="Current tent temperature and pressure.",
-            orientation="horizontal",
+            orientation="vertical",
-            wide_layout=True,
+            wide_layout=False,
         )
     )
     panels.append(
@@ -1464,19 +1462,11 @@ def build_overview():
             unit="celsius",
             targets=[
                 {"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "Temperature (°C)"},
-                {"refId": "B", "expr": CLIMATE_HUMIDITY_SERIES, "legendFormat": "Humidity (%)"},
+                {"refId": "B", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "Pressure (kPa)"},
-                {"refId": "C", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "VPD (kPa)"},
-                {"refId": "D", "expr": CLIMATE_DEWPOINT_SERIES, "legendFormat": "Dew Point (°C)"},
             ],
             field_overrides=[
                 {
-                    "matcher": {"id": "byName", "options": "Humidity (%)"},
+                    "matcher": {"id": "byName", "options": "Pressure (kPa)"},
-                    "properties": [
-                        {"id": "unit", "value": "percent"},
-                    ],
-                },
-                {
-                    "matcher": {"id": "byName", "options": "VPD (kPa)"},
                     "properties": [
                         {"id": "unit", "value": "none"},
                         {"id": "custom.axisPlacement", "value": "right"},
@@ -1488,7 +1478,6 @@ def build_overview():
             legend_display="list",
             legend_placement="bottom",
             links=link_to("atlas-power"),
-            description="Two-axis chart: tent temperature/humidity/dew point (left axis) and VPD in kPa (right axis).",
         )
     )
     panels.append(
@@ -1514,8 +1503,6 @@ def build_overview():
                     {"color": "red", "value": 9},
                 ],
             },
-            orientation="horizontal",
-            wide_layout=True,
             links=link_to("atlas-power"),
         )
     )
@@ -3202,8 +3189,6 @@ def build_power_dashboard():
                     "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {ANANKE_UPS_TETHYS_NODE}"}],
                 },
             ],
-            orientation="horizontal",
-            wide_layout=True,
             description=(
                 "Per-UPS live snapshot: current draw in watts, estimated battery runtime if discharge started now, and charging/discharging status."
             ),
@@ -3237,19 +3222,13 @@ def build_power_dashboard():
             text_mode="name_and_value",
             targets=[
                 {"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "Tent Temp (°C)", "instant": True},
-                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent VPD (kPa)", "instant": True},
+                {"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent Pressure (kPa)", "instant": True},
-                {"refId": "C", "expr": CLIMATE_HUMIDITY_MAX, "legendFormat": "Tent RH (%)", "instant": True},
-                {"refId": "D", "expr": CLIMATE_DEWPOINT_CURRENT, "legendFormat": "Dew Point (°C)", "instant": True},
             ],
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "Tent Temp (°C)"}, "properties": [{"id": "unit", "value": "celsius"}]},
-                {"matcher": {"id": "byName", "options": "Tent VPD (kPa)"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
+                {"matcher": {"id": "byName", "options": "Tent Pressure (kPa)"}, "properties": [{"id": "unit", "value": "none"}]},
-                {"matcher": {"id": "byName", "options": "Tent RH (%)"}, "properties": [{"id": "unit", "value": "percent"}]},
-                {"matcher": {"id": "byName", "options": "Dew Point (°C)"}, "properties": [{"id": "unit", "value": "celsius"}]},
             ],
-            orientation="horizontal",
+            description="Current tent temperature and air pressure. These render once climate telemetry is online.",
-            wide_layout=True,
-            description="Current tent temperature, humidity, VPD, and dew point. These render once Typhon climate telemetry is online.",
         )
     )
     panels.append(
@@ -3261,19 +3240,11 @@ def build_power_dashboard():
             unit="celsius",
             targets=[
                 {"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "Temperature (°C)"},
-                {"refId": "B", "expr": CLIMATE_HUMIDITY_SERIES, "legendFormat": "Humidity (%)"},
+                {"refId": "B", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "Pressure (kPa)"},
-                {"refId": "C", "expr": CLIMATE_PRESSURE_SERIES, "legendFormat": "VPD (kPa)"},
-                {"refId": "D", "expr": CLIMATE_DEWPOINT_SERIES, "legendFormat": "Dew Point (°C)"},
             ],
             field_overrides=[
                 {
-                    "matcher": {"id": "byName", "options": "Humidity (%)"},
+                    "matcher": {"id": "byName", "options": "Pressure (kPa)"},
-                    "properties": [
-                        {"id": "unit", "value": "percent"},
-                    ],
-                },
-                {
-                    "matcher": {"id": "byName", "options": "VPD (kPa)"},
                     "properties": [
                         {"id": "unit", "value": "none"},
                         {"id": "custom.axisPlacement", "value": "right"},
@@ -3284,7 +3255,7 @@ def build_power_dashboard():
             ],
             legend_display="table",
             legend_placement="right",
-            description="Two-axis chart: tent temperature/humidity/dew point (left axis) and tent VPD in kPa (right axis).",
+            description="Two-axis chart: tent temperature (left axis) and tent pressure in kPa (right axis).",
         )
     )
     panels.append(
@@ -3310,8 +3281,6 @@ def build_power_dashboard():
                     {"color": "red", "value": 9},
                 ],
             },
-            orientation="horizontal",
-            wide_layout=True,
             description="Current fan activity levels (0-10): inside outlet, inside inlet, outside inlet, and interior fans.",
         )
     )

services/maintenance/soteria-configmap.yaml

@@ -12,11 +12,3 @@ data:
   SOTERIA_ALLOWED_GROUPS: admin,maintenance
   SOTERIA_BACKUP_MAX_AGE_HOURS: "24"
   SOTERIA_METRICS_REFRESH_SECONDS: "300"
-  SOTERIA_B2_ENABLED: "true"
-  SOTERIA_B2_SECRET_NAMESPACE: maintenance
-  SOTERIA_B2_SECRET_NAME: soteria-restic
-  SOTERIA_B2_ACCESS_KEY_FIELD: AWS_ACCESS_KEY_ID
-  SOTERIA_B2_SECRET_KEY_FIELD: AWS_SECRET_ACCESS_KEY
-  SOTERIA_B2_ENDPOINT_FIELD: AWS_ENDPOINTS
-  SOTERIA_B2_SCAN_INTERVAL_SECONDS: "900"
-  SOTERIA_B2_SCAN_TIMEOUT_SECONDS: "120"

services/monitoring/dashboards/atlas-overview.json

@@ -1281,9 +1281,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value",
+        "textMode": "name_and_value"
-        "orientation": "horizontal",
-        "wideLayout": true
       },
       "links": [
         {
@@ -1365,26 +1363,14 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "max(typhon_temperature_celsius) or on() vector(0)",
+          "expr": "max(atlas_climate_tent_temperature_celsius) or max(atlas_climate_temperature_celsius) or on() vector(0)",
           "legendFormat": "Tent Temp (\u00b0C)",
           "instant": true
         },
         {
           "refId": "B",
-          "expr": "max(typhon_vpd_kpa) or on() vector(0)",
+          "expr": "max(atlas_climate_tent_pressure_kpa) or max(atlas_climate_pressure_kpa) or on() vector(0)",
-          "legendFormat": "Tent VPD (kPa)",
+          "legendFormat": "Tent Pressure (kPa)",
-          "instant": true
-        },
-        {
-          "refId": "C",
-          "expr": "max(typhon_relative_humidity_percent) or on() vector(0)",
-          "legendFormat": "Tent RH (%)",
-          "instant": true
-        },
-        {
-          "refId": "D",
-          "expr": "max((243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))) or on() vector(0)",
-          "legendFormat": "Dew Point (\u00b0C)",
           "instant": true
         }
       ],
@@ -1429,7 +1415,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Tent VPD (kPa)"
+              "options": "Tent Pressure (kPa)"
             },
             "properties": [
               {
@@ -1437,30 +1423,6 @@
                 "value": "suffix:kPa"
               }
             ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Tent RH (%)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "percent"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Dew Point (\u00b0C)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "celsius"
-              }
-            ]
           }
         ]
       },
@@ -1476,8 +1438,8 @@
           "values": false
         },
         "textMode": "value",
-        "orientation": "horizontal",
+        "orientation": "vertical",
-        "wideLayout": true
+        "wideLayout": false
       },
       "links": [
         {
@@ -1486,7 +1448,7 @@
           "targetBlank": true
         }
       ],
-      "description": "Current tent temperature, humidity, VPD, and dew point."
+      "description": "Current tent temperature and pressure."
     },
     {
       "id": 43,
@@ -1505,23 +1467,13 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "typhon_temperature_celsius",
+          "expr": "(atlas_climate_tent_temperature_celsius or atlas_climate_temperature_celsius)",
           "legendFormat": "Temperature (\u00b0C)"
         },
         {
           "refId": "B",
-          "expr": "typhon_relative_humidity_percent",
+          "expr": "(atlas_climate_tent_pressure_kpa or atlas_climate_pressure_kpa)",
-          "legendFormat": "Humidity (%)"
+          "legendFormat": "Pressure (kPa)"
-        },
-        {
-          "refId": "C",
-          "expr": "typhon_vpd_kpa",
-          "legendFormat": "VPD (kPa)"
-        },
-        {
-          "refId": "D",
-          "expr": "(243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))",
-          "legendFormat": "Dew Point (\u00b0C)"
         }
       ],
       "fieldConfig": {
@@ -1532,19 +1484,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Humidity (%)"
+              "options": "Pressure (kPa)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "percent"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "VPD (kPa)"
             },
             "properties": [
               {
@@ -1582,8 +1522,7 @@
           "url": "/d/atlas-power",
           "targetBlank": true
         }
-      ],
+      ]
-      "description": "Two-axis chart: tent temperature/humidity/dew point (left axis) and VPD in kPa (right axis)."
     },
     {
       "id": 140,
@@ -1602,25 +1541,25 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"outlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"outlet\"}) or on() vector(0))",
           "legendFormat": "Inside Outlet",
           "instant": true
         },
         {
           "refId": "B",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"inside_inlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"inside_inlet\"}) or on() vector(0))",
           "legendFormat": "Inside Inlet",
           "instant": true
         },
         {
           "refId": "C",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"outside_inlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"outside_inlet\"}) or on() vector(0))",
           "legendFormat": "Outside Inlet",
           "instant": true
         },
         {
           "refId": "D",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"interior\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"interior\"}) or on() vector(0))",
           "legendFormat": "Interior Fans",
           "instant": true
         }
@@ -1667,9 +1606,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value",
+        "textMode": "name_and_value"
-        "orientation": "horizontal",
-        "wideLayout": true
       },
       "links": [
         {
@@ -1696,22 +1633,22 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "typhon_fan_speed_level{fan_group=\"outlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"outlet\"} or atlas_climate_fan_activity_level{position=\"outlet\"})",
           "legendFormat": "Inside Outlet"
         },
         {
           "refId": "B",
-          "expr": "typhon_fan_speed_level{fan_group=\"inside_inlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"} or atlas_climate_fan_activity_level{position=\"inside_inlet\"})",
           "legendFormat": "Inside Inlet"
         },
         {
           "refId": "C",
-          "expr": "typhon_fan_speed_level{fan_group=\"outside_inlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"} or atlas_climate_fan_activity_level{position=\"outside_inlet\"})",
           "legendFormat": "Outside Inlet"
         },
         {
           "refId": "D",
-          "expr": "typhon_fan_speed_level{fan_group=\"interior\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"interior\"} or atlas_climate_fan_activity_level{position=\"interior\"})",
           "legendFormat": "Interior Fans"
         }
       ],

services/monitoring/dashboards/atlas-power.json

@@ -215,9 +215,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value",
+        "textMode": "name_and_value"
-        "orientation": "horizontal",
-        "wideLayout": true
       },
       "description": "Per-UPS live snapshot: current draw in watts, estimated battery runtime if discharge started now, and charging/discharging status."
     },
@@ -286,26 +284,14 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "max(typhon_temperature_celsius) or on() vector(0)",
+          "expr": "max(atlas_climate_tent_temperature_celsius) or max(atlas_climate_temperature_celsius) or on() vector(0)",
           "legendFormat": "Tent Temp (\u00b0C)",
           "instant": true
         },
         {
           "refId": "B",
-          "expr": "max(typhon_vpd_kpa) or on() vector(0)",
+          "expr": "max(atlas_climate_tent_pressure_kpa) or max(atlas_climate_pressure_kpa) or on() vector(0)",
-          "legendFormat": "Tent VPD (kPa)",
+          "legendFormat": "Tent Pressure (kPa)",
-          "instant": true
-        },
-        {
-          "refId": "C",
-          "expr": "max(typhon_relative_humidity_percent) or on() vector(0)",
-          "legendFormat": "Tent RH (%)",
-          "instant": true
-        },
-        {
-          "refId": "D",
-          "expr": "max((243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))) or on() vector(0)",
-          "legendFormat": "Dew Point (\u00b0C)",
           "instant": true
         }
       ],
@@ -350,36 +336,12 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Tent VPD (kPa)"
+              "options": "Tent Pressure (kPa)"
             },
             "properties": [
               {
                 "id": "unit",
-                "value": "suffix:kPa"
+                "value": "none"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Tent RH (%)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "percent"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Dew Point (\u00b0C)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "celsius"
               }
             ]
           }
@@ -396,11 +358,9 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value",
+        "textMode": "name_and_value"
-        "orientation": "horizontal",
-        "wideLayout": true
       },
-      "description": "Current tent temperature, humidity, VPD, and dew point. These render once Typhon climate telemetry is online."
+      "description": "Current tent temperature and air pressure. These render once climate telemetry is online."
     },
     {
       "id": 4,
@@ -419,23 +379,13 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "typhon_temperature_celsius",
+          "expr": "(atlas_climate_tent_temperature_celsius or atlas_climate_temperature_celsius)",
           "legendFormat": "Temperature (\u00b0C)"
         },
         {
           "refId": "B",
-          "expr": "typhon_relative_humidity_percent",
+          "expr": "(atlas_climate_tent_pressure_kpa or atlas_climate_pressure_kpa)",
-          "legendFormat": "Humidity (%)"
+          "legendFormat": "Pressure (kPa)"
-        },
-        {
-          "refId": "C",
-          "expr": "typhon_vpd_kpa",
-          "legendFormat": "VPD (kPa)"
-        },
-        {
-          "refId": "D",
-          "expr": "(243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))",
-          "legendFormat": "Dew Point (\u00b0C)"
         }
       ],
       "fieldConfig": {
@@ -446,19 +396,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Humidity (%)"
+              "options": "Pressure (kPa)"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "percent"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "VPD (kPa)"
             },
             "properties": [
               {
@@ -490,7 +428,7 @@
           "mode": "multi"
         }
       },
-      "description": "Two-axis chart: tent temperature/humidity/dew point (left axis) and tent VPD in kPa (right axis)."
+      "description": "Two-axis chart: tent temperature (left axis) and tent pressure in kPa (right axis)."
     },
     {
       "id": 5,
@@ -509,25 +447,25 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"outlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"outlet\"}) or on() vector(0))",
           "legendFormat": "Inside Outlet",
           "instant": true
         },
         {
           "refId": "B",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"inside_inlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"inside_inlet\"}) or on() vector(0))",
           "legendFormat": "Inside Inlet",
           "instant": true
         },
         {
           "refId": "C",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"outside_inlet\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"outside_inlet\"}) or on() vector(0))",
           "legendFormat": "Outside Inlet",
           "instant": true
         },
         {
           "refId": "D",
-          "expr": "round(max(typhon_fan_speed_level{fan_group=\"interior\"}) or on() vector(0))",
+          "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"interior\"}) or on() vector(0))",
           "legendFormat": "Interior Fans",
           "instant": true
         }
@@ -574,9 +512,7 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value",
+        "textMode": "name_and_value"
-        "orientation": "horizontal",
-        "wideLayout": true
       },
       "description": "Current fan activity levels (0-10): inside outlet, inside inlet, outside inlet, and interior fans."
     },
@@ -597,22 +533,22 @@
       "targets": [
         {
           "refId": "A",
-          "expr": "typhon_fan_speed_level{fan_group=\"outlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"outlet\"} or atlas_climate_fan_activity_level{position=\"outlet\"})",
           "legendFormat": "Inside Outlet"
         },
         {
           "refId": "B",
-          "expr": "typhon_fan_speed_level{fan_group=\"inside_inlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"} or atlas_climate_fan_activity_level{position=\"inside_inlet\"})",
           "legendFormat": "Inside Inlet"
         },
         {
           "refId": "C",
-          "expr": "typhon_fan_speed_level{fan_group=\"outside_inlet\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"} or atlas_climate_fan_activity_level{position=\"outside_inlet\"})",
           "legendFormat": "Outside Inlet"
         },
         {
           "refId": "D",
-          "expr": "typhon_fan_speed_level{fan_group=\"interior\"}",
+          "expr": "(atlas_climate_fan_activity_level{fan_group=\"interior\"} or atlas_climate_fan_activity_level{position=\"interior\"})",
           "legendFormat": "Interior Fans"
         }
       ],

services/monitoring/grafana-alerting-config.yaml

@@ -543,54 +543,6 @@ data:
               summary: "One or more PVCs are stale, missing, or failed per Soteria backup health"
             labels:
               severity: warning
-          - uid: maint-soteria-b2-scan-unhealthy
-            title: "Soteria B2 usage scan failing or stale"
-            condition: C
-            for: "15m"
-            data:
-              - refId: A
-                relativeTimeRange:
-                  from: 1800
-                  to: 0
-                datasourceUid: atlas-vm
-                model:
-                  expr: sum((((soteria_b2_scan_success < bool 1) and (time() - soteria_b2_scan_timestamp_seconds > 600)) or (time() - soteria_b2_scan_timestamp_seconds > 1800))) or on() vector(0)
-                  intervalMs: 60000
-                  maxDataPoints: 43200
-                  legendFormat: soteria-b2-scan-unhealthy
-                  datasource:
-                    type: prometheus
-                    uid: atlas-vm
-              - refId: B
-                datasourceUid: __expr__
-                model:
-                  expression: A
-                  intervalMs: 60000
-                  maxDataPoints: 43200
-                  reducer: last
-                  type: reduce
-              - refId: C
-                datasourceUid: __expr__
-                model:
-                  expression: B
-                  intervalMs: 60000
-                  maxDataPoints: 43200
-                  type: threshold
-                  conditions:
-                    - evaluator:
-                        params: [0]
-                        type: gt
-                      operator:
-                        type: and
-                      reducer:
-                        type: last
-                      type: query
-            noDataState: OK
-            execErrState: Alerting
-            annotations:
-              summary: "Soteria B2 consumption scan is failing or stale for >15m"
-            labels:
-              severity: warning
           - uid: maint-soteria-authz-denials
             title: "Soteria authorization denials elevated"
             condition: C

services/monitoring/grafana-dashboard-overview.yaml

@@ -1290,9 +1290,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value",
+            "textMode": "name_and_value"
-            "orientation": "horizontal",
-            "wideLayout": true
           },
           "links": [
             {
@@ -1374,26 +1372,14 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "max(typhon_temperature_celsius) or on() vector(0)",
+              "expr": "max(atlas_climate_tent_temperature_celsius) or max(atlas_climate_temperature_celsius) or on() vector(0)",
               "legendFormat": "Tent Temp (\u00b0C)",
               "instant": true
             },
             {
               "refId": "B",
-              "expr": "max(typhon_vpd_kpa) or on() vector(0)",
+              "expr": "max(atlas_climate_tent_pressure_kpa) or max(atlas_climate_pressure_kpa) or on() vector(0)",
-              "legendFormat": "Tent VPD (kPa)",
+              "legendFormat": "Tent Pressure (kPa)",
-              "instant": true
-            },
-            {
-              "refId": "C",
-              "expr": "max(typhon_relative_humidity_percent) or on() vector(0)",
-              "legendFormat": "Tent RH (%)",
-              "instant": true
-            },
-            {
-              "refId": "D",
-              "expr": "max((243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))) or on() vector(0)",
-              "legendFormat": "Dew Point (\u00b0C)",
               "instant": true
             }
           ],
@@ -1438,7 +1424,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Tent VPD (kPa)"
+                  "options": "Tent Pressure (kPa)"
                 },
                 "properties": [
                   {
@@ -1446,30 +1432,6 @@ data:
                     "value": "suffix:kPa"
                   }
                 ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Tent RH (%)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "percent"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Dew Point (\u00b0C)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "celsius"
-                  }
-                ]
               }
             ]
           },
@@ -1485,8 +1447,8 @@ data:
               "values": false
             },
             "textMode": "value",
-            "orientation": "horizontal",
+            "orientation": "vertical",
-            "wideLayout": true
+            "wideLayout": false
           },
           "links": [
             {
@@ -1495,7 +1457,7 @@ data:
               "targetBlank": true
             }
           ],
-          "description": "Current tent temperature, humidity, VPD, and dew point."
+          "description": "Current tent temperature and pressure."
         },
         {
           "id": 43,
@@ -1514,23 +1476,13 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "typhon_temperature_celsius",
+              "expr": "(atlas_climate_tent_temperature_celsius or atlas_climate_temperature_celsius)",
               "legendFormat": "Temperature (\u00b0C)"
             },
             {
               "refId": "B",
-              "expr": "typhon_relative_humidity_percent",
+              "expr": "(atlas_climate_tent_pressure_kpa or atlas_climate_pressure_kpa)",
-              "legendFormat": "Humidity (%)"
+              "legendFormat": "Pressure (kPa)"
-            },
-            {
-              "refId": "C",
-              "expr": "typhon_vpd_kpa",
-              "legendFormat": "VPD (kPa)"
-            },
-            {
-              "refId": "D",
-              "expr": "(243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))",
-              "legendFormat": "Dew Point (\u00b0C)"
             }
           ],
           "fieldConfig": {
@@ -1541,19 +1493,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Humidity (%)"
+                  "options": "Pressure (kPa)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "percent"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "VPD (kPa)"
                 },
                 "properties": [
                   {
@@ -1591,8 +1531,7 @@ data:
               "url": "/d/atlas-power",
               "targetBlank": true
             }
-          ],
+          ]
-          "description": "Two-axis chart: tent temperature/humidity/dew point (left axis) and VPD in kPa (right axis)."
         },
         {
           "id": 140,
@@ -1611,25 +1550,25 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"outlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"outlet\"}) or on() vector(0))",
               "legendFormat": "Inside Outlet",
               "instant": true
             },
             {
               "refId": "B",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"inside_inlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"inside_inlet\"}) or on() vector(0))",
               "legendFormat": "Inside Inlet",
               "instant": true
             },
             {
               "refId": "C",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"outside_inlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"outside_inlet\"}) or on() vector(0))",
               "legendFormat": "Outside Inlet",
               "instant": true
             },
             {
               "refId": "D",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"interior\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"interior\"}) or on() vector(0))",
               "legendFormat": "Interior Fans",
               "instant": true
             }
@@ -1676,9 +1615,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value",
+            "textMode": "name_and_value"
-            "orientation": "horizontal",
-            "wideLayout": true
           },
           "links": [
             {
@@ -1705,22 +1642,22 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "typhon_fan_speed_level{fan_group=\"outlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"outlet\"} or atlas_climate_fan_activity_level{position=\"outlet\"})",
               "legendFormat": "Inside Outlet"
             },
             {
               "refId": "B",
-              "expr": "typhon_fan_speed_level{fan_group=\"inside_inlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"} or atlas_climate_fan_activity_level{position=\"inside_inlet\"})",
               "legendFormat": "Inside Inlet"
             },
             {
               "refId": "C",
-              "expr": "typhon_fan_speed_level{fan_group=\"outside_inlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"} or atlas_climate_fan_activity_level{position=\"outside_inlet\"})",
               "legendFormat": "Outside Inlet"
             },
             {
               "refId": "D",
-              "expr": "typhon_fan_speed_level{fan_group=\"interior\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"interior\"} or atlas_climate_fan_activity_level{position=\"interior\"})",
               "legendFormat": "Interior Fans"
             }
           ],

services/monitoring/grafana-dashboard-power.yaml

@@ -224,9 +224,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value",
+            "textMode": "name_and_value"
-            "orientation": "horizontal",
-            "wideLayout": true
           },
           "description": "Per-UPS live snapshot: current draw in watts, estimated battery runtime if discharge started now, and charging/discharging status."
         },
@@ -295,26 +293,14 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "max(typhon_temperature_celsius) or on() vector(0)",
+              "expr": "max(atlas_climate_tent_temperature_celsius) or max(atlas_climate_temperature_celsius) or on() vector(0)",
               "legendFormat": "Tent Temp (\u00b0C)",
               "instant": true
             },
             {
               "refId": "B",
-              "expr": "max(typhon_vpd_kpa) or on() vector(0)",
+              "expr": "max(atlas_climate_tent_pressure_kpa) or max(atlas_climate_pressure_kpa) or on() vector(0)",
-              "legendFormat": "Tent VPD (kPa)",
+              "legendFormat": "Tent Pressure (kPa)",
-              "instant": true
-            },
-            {
-              "refId": "C",
-              "expr": "max(typhon_relative_humidity_percent) or on() vector(0)",
-              "legendFormat": "Tent RH (%)",
-              "instant": true
-            },
-            {
-              "refId": "D",
-              "expr": "max((243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))) or on() vector(0)",
-              "legendFormat": "Dew Point (\u00b0C)",
               "instant": true
             }
           ],
@@ -359,36 +345,12 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Tent VPD (kPa)"
+                  "options": "Tent Pressure (kPa)"
                 },
                 "properties": [
                   {
                     "id": "unit",
-                    "value": "suffix:kPa"
+                    "value": "none"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Tent RH (%)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "percent"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Dew Point (\u00b0C)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "celsius"
                   }
                 ]
               }
@@ -405,11 +367,9 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value",
+            "textMode": "name_and_value"
-            "orientation": "horizontal",
-            "wideLayout": true
           },
-          "description": "Current tent temperature, humidity, VPD, and dew point. These render once Typhon climate telemetry is online."
+          "description": "Current tent temperature and air pressure. These render once climate telemetry is online."
         },
         {
           "id": 4,
@@ -428,23 +388,13 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "typhon_temperature_celsius",
+              "expr": "(atlas_climate_tent_temperature_celsius or atlas_climate_temperature_celsius)",
               "legendFormat": "Temperature (\u00b0C)"
             },
             {
               "refId": "B",
-              "expr": "typhon_relative_humidity_percent",
+              "expr": "(atlas_climate_tent_pressure_kpa or atlas_climate_pressure_kpa)",
-              "legendFormat": "Humidity (%)"
+              "legendFormat": "Pressure (kPa)"
-            },
-            {
-              "refId": "C",
-              "expr": "typhon_vpd_kpa",
-              "legendFormat": "VPD (kPa)"
-            },
-            {
-              "refId": "D",
-              "expr": "(243.12 * (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius))) / (17.62 - (ln(clamp_min(typhon_relative_humidity_percent, 1) / 100) + (17.62 * typhon_temperature_celsius) / (243.12 + typhon_temperature_celsius)))",
-              "legendFormat": "Dew Point (\u00b0C)"
             }
           ],
           "fieldConfig": {
@@ -455,19 +405,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Humidity (%)"
+                  "options": "Pressure (kPa)"
-                },
-                "properties": [
-                  {
-                    "id": "unit",
-                    "value": "percent"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "VPD (kPa)"
                 },
                 "properties": [
                   {
@@ -499,7 +437,7 @@ data:
               "mode": "multi"
             }
           },
-          "description": "Two-axis chart: tent temperature/humidity/dew point (left axis) and tent VPD in kPa (right axis)."
+          "description": "Two-axis chart: tent temperature (left axis) and tent pressure in kPa (right axis)."
         },
         {
           "id": 5,
@@ -518,25 +456,25 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"outlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"outlet\"}) or on() vector(0))",
               "legendFormat": "Inside Outlet",
               "instant": true
             },
             {
               "refId": "B",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"inside_inlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"inside_inlet\"}) or on() vector(0))",
               "legendFormat": "Inside Inlet",
               "instant": true
             },
             {
               "refId": "C",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"outside_inlet\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"outside_inlet\"}) or on() vector(0))",
               "legendFormat": "Outside Inlet",
               "instant": true
             },
             {
               "refId": "D",
-              "expr": "round(max(typhon_fan_speed_level{fan_group=\"interior\"}) or on() vector(0))",
+              "expr": "round(max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"interior\"}) or on() vector(0))",
               "legendFormat": "Interior Fans",
               "instant": true
             }
@@ -583,9 +521,7 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value",
+            "textMode": "name_and_value"
-            "orientation": "horizontal",
-            "wideLayout": true
           },
           "description": "Current fan activity levels (0-10): inside outlet, inside inlet, outside inlet, and interior fans."
         },
@@ -606,22 +542,22 @@ data:
           "targets": [
             {
               "refId": "A",
-              "expr": "typhon_fan_speed_level{fan_group=\"outlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"outlet\"} or atlas_climate_fan_activity_level{position=\"outlet\"})",
               "legendFormat": "Inside Outlet"
             },
             {
               "refId": "B",
-              "expr": "typhon_fan_speed_level{fan_group=\"inside_inlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"} or atlas_climate_fan_activity_level{position=\"inside_inlet\"})",
               "legendFormat": "Inside Inlet"
             },
             {
               "refId": "C",
-              "expr": "typhon_fan_speed_level{fan_group=\"outside_inlet\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"} or atlas_climate_fan_activity_level{position=\"outside_inlet\"})",
               "legendFormat": "Outside Inlet"
             },
             {
               "refId": "D",
-              "expr": "typhon_fan_speed_level{fan_group=\"interior\"}",
+              "expr": "(atlas_climate_fan_activity_level{fan_group=\"interior\"} or atlas_climate_fan_activity_level{position=\"interior\"})",
               "legendFormat": "Interior Fans"
             }
           ],