monitoring(overview): align enclosure fonts and shorten fan labels

scripts/dashboards_render_atlas.py

@@ -771,8 +771,8 @@ CLIMATE_CURRENT_ROW_EXPR = " or ".join(
 CLIMATE_FAN_CURRENT_ROW_EXPR = " or ".join(
     [
         with_metric_label(f"round({CLIMATE_FAN_OUTLET_CURRENT})", "Outlet"),
-        with_metric_label(f"round({CLIMATE_FAN_INSIDE_INLET_CURRENT})", "Inlet - Inside"),
-        with_metric_label(f"round({CLIMATE_FAN_OUTSIDE_INLET_CURRENT})", "Inlet - Outside"),
+        with_metric_label(f"round({CLIMATE_FAN_INSIDE_INLET_CURRENT})", "Inlet - In"),
+        with_metric_label(f"round({CLIMATE_FAN_OUTSIDE_INLET_CURRENT})", "Inlet - Out"),
         with_metric_label(f"round({CLIMATE_FAN_INTERIOR_CURRENT})", "Interior"),
     ]
 )
@@ -2025,6 +2025,8 @@ def build_overview():
             text_mode="name_and_value",
             legend="{{metric}}",
             instant=True,
+            title_size=14,
+            value_size=30,
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "°C"}, "properties": [{"id": "unit", "value": "celsius"}]},
                 {"matcher": {"id": "byName", "options": "°F"}, "properties": [{"id": "unit", "value": "fahrenheit"}]},
@@ -2047,6 +2049,8 @@ def build_overview():
             text_mode="name_and_value",
             legend="{{metric}}",
             instant=True,
+            title_size=14,
+            value_size=30,
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "%RH"}, "properties": [{"id": "unit", "value": "suffix:%RH"}]},
                 {"matcher": {"id": "byName", "options": "kPa"}, "properties": [{"id": "unit", "value": "suffix:kPa"}]},
@@ -2174,8 +2178,8 @@ def build_overview():
             },
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "Outlet"}, "properties": [{"id": "decimals", "value": 0}]},
-                {"matcher": {"id": "byName", "options": "Inlet - Inside"}, "properties": [{"id": "decimals", "value": 0}]},
-                {"matcher": {"id": "byName", "options": "Inlet - Outside"}, "properties": [{"id": "decimals", "value": 0}]},
+                {"matcher": {"id": "byName", "options": "Inlet - In"}, "properties": [{"id": "decimals", "value": 0}]},
+                {"matcher": {"id": "byName", "options": "Inlet - Out"}, "properties": [{"id": "decimals", "value": 0}]},
                 {"matcher": {"id": "byName", "options": "Interior"}, "properties": [{"id": "decimals", "value": 0}]},
             ],
             links=link_to("atlas-power"),
@@ -4349,8 +4353,8 @@ def build_power_dashboard():
             },
             field_overrides=[
                 {"matcher": {"id": "byName", "options": "Outlet"}, "properties": [{"id": "decimals", "value": 0}]},
-                {"matcher": {"id": "byName", "options": "Inlet - Inside"}, "properties": [{"id": "decimals", "value": 0}]},
-                {"matcher": {"id": "byName", "options": "Inlet - Outside"}, "properties": [{"id": "decimals", "value": 0}]},
+                {"matcher": {"id": "byName", "options": "Inlet - In"}, "properties": [{"id": "decimals", "value": 0}]},
+                {"matcher": {"id": "byName", "options": "Inlet - Out"}, "properties": [{"id": "decimals", "value": 0}]},
                 {"matcher": {"id": "byName", "options": "Interior"}, "properties": [{"id": "decimals", "value": 0}]},
             ],
             orientation="vertical",

services/monitoring/dashboards/atlas-overview.json

@@ -1404,7 +1404,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value"
+        "textMode": "name_and_value",
+        "text": {
+          "titleSize": 14,
+          "valueSize": 30
+        }
       },
       "links": [
         {
@@ -1498,7 +1502,11 @@
           "fields": "",
           "values": false
         },
-        "textMode": "name_and_value"
+        "textMode": "name_and_value",
+        "text": {
+          "titleSize": 14,
+          "valueSize": 30
+        }
       },
       "links": [
         {
@@ -1831,7 +1839,7 @@
       },
       "targets": [
         {
-          "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - Inside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Outside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
+          "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - In\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Out\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
           "refId": "A",
           "legendFormat": "{{metric}}",
           "instant": true
@@ -1882,7 +1890,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Inlet - Inside"
+              "options": "Inlet - In"
             },
             "properties": [
               {
@@ -1894,7 +1902,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Inlet - Outside"
+              "options": "Inlet - Out"
             },
             "properties": [
               {

services/monitoring/dashboards/atlas-power.json

@@ -424,7 +424,7 @@
       },
       "targets": [
         {
-          "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - Inside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Outside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
+          "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - In\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Out\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
           "refId": "A",
           "legendFormat": "{{metric}}",
           "instant": true
@@ -475,7 +475,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Inlet - Inside"
+              "options": "Inlet - In"
             },
             "properties": [
               {
@@ -487,7 +487,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Inlet - Outside"
+              "options": "Inlet - Out"
             },
             "properties": [
               {

services/monitoring/grafana-dashboard-overview.yaml

@@ -1413,7 +1413,11 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value"
+            "textMode": "name_and_value",
+            "text": {
+              "titleSize": 14,
+              "valueSize": 30
+            }
           },
           "links": [
             {
@@ -1507,7 +1511,11 @@ data:
               "fields": "",
               "values": false
             },
-            "textMode": "name_and_value"
+            "textMode": "name_and_value",
+            "text": {
+              "titleSize": 14,
+              "valueSize": 30
+            }
           },
           "links": [
             {
@@ -1840,7 +1848,7 @@ data:
           },
           "targets": [
             {
-              "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - Inside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Outside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
+              "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - In\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Out\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
               "refId": "A",
               "legendFormat": "{{metric}}",
               "instant": true
@@ -1891,7 +1899,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Inlet - Inside"
+                  "options": "Inlet - In"
                 },
                 "properties": [
                   {
@@ -1903,7 +1911,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Inlet - Outside"
+                  "options": "Inlet - Out"
                 },
                 "properties": [
                   {

services/monitoring/grafana-dashboard-power.yaml

@@ -433,7 +433,7 @@ data:
           },
           "targets": [
             {
-              "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - Inside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Outside\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
+              "expr": "label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"1\"})) or on() vector(0))), \"metric\", \"Outlet\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"2\"})) or on() vector(0))), \"metric\", \"Inlet - In\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"3\"})) or on() vector(0))), \"metric\", \"Inlet - Out\", \"__name__\", \".*\") or label_replace((round(max(max without (job,instance,pod,service,endpoint,namespace,controller_name,port_name,fan_group) (typhon_fan_speed_level{port=\"4\"})) or on() vector(0))), \"metric\", \"Interior\", \"__name__\", \".*\")",
               "refId": "A",
               "legendFormat": "{{metric}}",
               "instant": true
@@ -484,7 +484,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Inlet - Inside"
+                  "options": "Inlet - In"
                 },
                 "properties": [
                   {
@@ -496,7 +496,7 @@ data:
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "Inlet - Outside"
+                  "options": "Inlet - Out"
                 },
                 "properties": [
                   {