diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 7ec34e64..f75857d1 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -443,6 +443,10 @@ PLATFORM_TEST_ACTIVITY_30D = ( 'or label_replace(sum by (status) (increase(metis_flashes_total[30d])), "source", "metis-flash", "__name__", ".*")' ) HECATE_SELECTOR = 'job="hecate-power"' +HECATE_UPS_DB_NAME = "Pyrphoros" +HECATE_UPS_DB_NODE = "titan-db" +HECATE_UPS_TETHYS_NAME = "Statera" +HECATE_UPS_TETHYS_NODE = "titan-24" HECATE_UPS_ON_BATTERY = f"sum(hecate_ups_on_battery{{{HECATE_SELECTOR}}}) or on() vector(0)" HECATE_UPS_LOW_BATTERY = f"sum(hecate_ups_low_battery{{{HECATE_SELECTOR}}}) or on() vector(0)" HECATE_UPS_RUNTIME_MIN = f"min(hecate_ups_runtime_seconds{{{HECATE_SELECTOR}}}) or on() vector(0)" @@ -1289,20 +1293,38 @@ def build_overview(): decimals=1, text_mode="name_and_value", targets=[ - {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB, "legendFormat": "titan-db Draw (W)", "instant": True}, - {"refId": "B", "expr": HECATE_UPS_RUNTIME_DB, "legendFormat": "titan-db Discharge ETA", "instant": True}, - {"refId": "C", "expr": HECATE_UPS_ON_BATTERY_DB, "legendFormat": "titan-db Status", "instant": True}, - {"refId": "D", "expr": HECATE_UPS_DRAW_WATTS_TETHYS, "legendFormat": "tethys Draw (W)", "instant": True}, - {"refId": "E", "expr": HECATE_UPS_RUNTIME_TETHYS, "legendFormat": "tethys Discharge ETA", "instant": True}, - {"refId": "F", "expr": HECATE_UPS_ON_BATTERY_TETHYS, "legendFormat": "tethys Status", "instant": True}, + {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Draw (W)", "instant": True}, + {"refId": "B", "expr": HECATE_UPS_RUNTIME_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Discharge ETA", "instant": True}, + {"refId": "C", "expr": HECATE_UPS_ON_BATTERY_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Status", "instant": True}, + {"refId": "D", "expr": HECATE_UPS_DRAW_WATTS_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Draw (W)", "instant": True}, + {"refId": "E", "expr": HECATE_UPS_RUNTIME_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Discharge ETA", "instant": True}, + {"refId": "F", "expr": HECATE_UPS_ON_BATTERY_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Status", "instant": True}, ], field_overrides=[ - {"matcher": {"id": "byName", "options": "titan-db Draw (W)"}, "properties": [{"id": "unit", "value": "watt"}]}, - {"matcher": {"id": "byName", "options": "tethys Draw (W)"}, "properties": [{"id": "unit", "value": "watt"}]}, - {"matcher": {"id": "byName", "options": "titan-db Discharge ETA"}, "properties": [{"id": "unit", "value": "s"}]}, - {"matcher": {"id": "byName", "options": "tethys Discharge ETA"}, "properties": [{"id": "unit", "value": "s"}]}, - {"matcher": {"id": "byName", "options": "titan-db Status"}, "properties": [{"id": "mappings", "value": status_mapping}]}, - {"matcher": {"id": "byName", "options": "tethys Status"}, "properties": [{"id": "mappings", "value": status_mapping}]}, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Draw (W)"}, + "properties": [{"id": "unit", "value": "watt"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Draw (W)"}, + "properties": [{"id": "unit", "value": "watt"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Discharge ETA"}, + "properties": [{"id": "unit", "value": "s"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Discharge ETA"}, + "properties": [{"id": "unit", "value": "s"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Status"}, + "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Status"}, + "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], + }, ], links=link_to("atlas-power"), description="Per-UPS live snapshot: current draw, discharge ETA, and charging/discharging status.", @@ -1316,8 +1338,8 @@ def build_overview(): {"h": 6, "w": 4, "x": 4, "y": 14}, unit="watt", targets=[ - {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": "titan-db"}, - {"refId": "B", "expr": HECATE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": "tethys"}, + {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": HECATE_UPS_DB_NAME}, + {"refId": "B", "expr": HECATE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": HECATE_UPS_TETHYS_NAME}, {"refId": "C", "expr": HECATE_UPS_DRAW_WATTS_TOTAL_SERIES, "legendFormat": "combined"}, ], legend_display="list", @@ -2971,25 +2993,37 @@ def build_power_dashboard(): decimals=1, text_mode="name_and_value", targets=[ - {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB, "legendFormat": "titan-db Draw (W)", "instant": True}, - {"refId": "B", "expr": HECATE_UPS_RUNTIME_DB, "legendFormat": "titan-db Discharge ETA", "instant": True}, - {"refId": "C", "expr": HECATE_UPS_ON_BATTERY_DB, "legendFormat": "titan-db Status", "instant": True}, - {"refId": "D", "expr": HECATE_UPS_DRAW_WATTS_TETHYS, "legendFormat": "tethys Draw (W)", "instant": True}, - {"refId": "E", "expr": HECATE_UPS_RUNTIME_TETHYS, "legendFormat": "tethys Discharge ETA", "instant": True}, - {"refId": "F", "expr": HECATE_UPS_ON_BATTERY_TETHYS, "legendFormat": "tethys Status", "instant": True}, + {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Draw (W)", "instant": True}, + {"refId": "B", "expr": HECATE_UPS_RUNTIME_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Discharge ETA", "instant": True}, + {"refId": "C", "expr": HECATE_UPS_ON_BATTERY_DB, "legendFormat": f"{HECATE_UPS_DB_NAME} Status", "instant": True}, + {"refId": "D", "expr": HECATE_UPS_DRAW_WATTS_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Draw (W)", "instant": True}, + {"refId": "E", "expr": HECATE_UPS_RUNTIME_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Discharge ETA", "instant": True}, + {"refId": "F", "expr": HECATE_UPS_ON_BATTERY_TETHYS, "legendFormat": f"{HECATE_UPS_TETHYS_NAME} Status", "instant": True}, ], field_overrides=[ - {"matcher": {"id": "byName", "options": "titan-db Draw (W)"}, "properties": [{"id": "unit", "value": "watt"}]}, - {"matcher": {"id": "byName", "options": "tethys Draw (W)"}, "properties": [{"id": "unit", "value": "watt"}]}, - {"matcher": {"id": "byName", "options": "titan-db Discharge ETA"}, "properties": [{"id": "unit", "value": "s"}]}, - {"matcher": {"id": "byName", "options": "tethys Discharge ETA"}, "properties": [{"id": "unit", "value": "s"}]}, { - "matcher": {"id": "byName", "options": "titan-db Status"}, - "properties": [{"id": "mappings", "value": status_mapping}], + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Draw (W)"}, + "properties": [{"id": "unit", "value": "watt"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], }, { - "matcher": {"id": "byName", "options": "tethys Status"}, - "properties": [{"id": "mappings", "value": status_mapping}], + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Draw (W)"}, + "properties": [{"id": "unit", "value": "watt"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Discharge ETA"}, + "properties": [{"id": "unit", "value": "s"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Discharge ETA"}, + "properties": [{"id": "unit", "value": "s"}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_DB_NAME} Status"}, + "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {HECATE_UPS_DB_NODE}"}], + }, + { + "matcher": {"id": "byName", "options": f"{HECATE_UPS_TETHYS_NAME} Status"}, + "properties": [{"id": "mappings", "value": status_mapping}, {"id": "description", "value": f"Attached node: {HECATE_UPS_TETHYS_NODE}"}], }, ], description=( @@ -3005,8 +3039,8 @@ def build_power_dashboard(): {"h": 8, "w": 12, "x": 12, "y": 0}, unit="watt", targets=[ - {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": "titan-db"}, - {"refId": "B", "expr": HECATE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": "tethys"}, + {"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": HECATE_UPS_DB_NAME}, + {"refId": "B", "expr": HECATE_UPS_DRAW_WATTS_TETHYS_SERIES, "legendFormat": HECATE_UPS_TETHYS_NAME}, {"refId": "C", "expr": HECATE_UPS_DRAW_WATTS_TOTAL_SERIES, "legendFormat": "combined"}, ], legend_display="table", @@ -3068,13 +3102,13 @@ def build_power_dashboard(): None, {"h": 8, "w": 12, "x": 0, "y": 16}, unit="none", - decimals=1, + decimals=0, text_mode="name_and_value", targets=[ - {"refId": "A", "expr": CLIMATE_FAN_OUTLET_CURRENT, "legendFormat": "Outlet", "instant": True}, - {"refId": "B", "expr": CLIMATE_FAN_INSIDE_INLET_CURRENT, "legendFormat": "Inside Inlet", "instant": True}, - {"refId": "C", "expr": CLIMATE_FAN_OUTSIDE_INLET_CURRENT, "legendFormat": "Outside Inlet", "instant": True}, - {"refId": "D", "expr": CLIMATE_FAN_INTERIOR_CURRENT, "legendFormat": "Interior", "instant": True}, + {"refId": "A", "expr": f"round({CLIMATE_FAN_OUTLET_CURRENT})", "legendFormat": "Outlet", "instant": True}, + {"refId": "B", "expr": f"round({CLIMATE_FAN_INSIDE_INLET_CURRENT})", "legendFormat": "Inside Inlet", "instant": True}, + {"refId": "C", "expr": f"round({CLIMATE_FAN_OUTSIDE_INLET_CURRENT})", "legendFormat": "Outside Inlet", "instant": True}, + {"refId": "D", "expr": f"round({CLIMATE_FAN_INTERIOR_CURRENT})", "legendFormat": "Interior", "instant": True}, ], thresholds={ "mode": "absolute", diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index 40077ae1..c6949bfd 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -1088,37 +1088,37 @@ { "refId": "A", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100) or on() vector(0)", - "legendFormat": "titan-db Draw (W)", + "legendFormat": "Pyrphoros Draw (W)", "instant": true }, { "refId": "B", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Discharge ETA", + "legendFormat": "Pyrphoros Discharge ETA", "instant": true }, { "refId": "C", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Status", + "legendFormat": "Pyrphoros Status", "instant": true }, { "refId": "D", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100) or on() vector(0)", - "legendFormat": "tethys Draw (W)", + "legendFormat": "Statera Draw (W)", "instant": true }, { "refId": "E", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Discharge ETA", + "legendFormat": "Statera Discharge ETA", "instant": true }, { "refId": "F", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Status", + "legendFormat": "Statera Status", "instant": true } ], @@ -1151,55 +1151,71 @@ { "matcher": { "id": "byName", - "options": "titan-db Draw (W)" + "options": "Pyrphoros Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Draw (W)" + "options": "Statera Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Discharge ETA" + "options": "Pyrphoros Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Discharge ETA" + "options": "Statera Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Status" + "options": "Pyrphoros Status" }, "properties": [ { @@ -1217,13 +1233,17 @@ } } ] + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Status" + "options": "Statera Status" }, "properties": [ { @@ -1241,6 +1261,10 @@ } } ] + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] } @@ -1286,12 +1310,12 @@ { "refId": "A", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100)", - "legendFormat": "titan-db" + "legendFormat": "Pyrphoros" }, { "refId": "B", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100)", - "legendFormat": "tethys" + "legendFormat": "Statera" }, { "refId": "C", diff --git a/services/monitoring/dashboards/atlas-power.json b/services/monitoring/dashboards/atlas-power.json index ac5706ff..3313f5ef 100644 --- a/services/monitoring/dashboards/atlas-power.json +++ b/services/monitoring/dashboards/atlas-power.json @@ -22,37 +22,37 @@ { "refId": "A", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100) or on() vector(0)", - "legendFormat": "titan-db Draw (W)", + "legendFormat": "Pyrphoros Draw (W)", "instant": true }, { "refId": "B", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Discharge ETA", + "legendFormat": "Pyrphoros Discharge ETA", "instant": true }, { "refId": "C", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Status", + "legendFormat": "Pyrphoros Status", "instant": true }, { "refId": "D", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100) or on() vector(0)", - "legendFormat": "tethys Draw (W)", + "legendFormat": "Statera Draw (W)", "instant": true }, { "refId": "E", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Discharge ETA", + "legendFormat": "Statera Discharge ETA", "instant": true }, { "refId": "F", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Status", + "legendFormat": "Statera Status", "instant": true } ], @@ -85,55 +85,71 @@ { "matcher": { "id": "byName", - "options": "titan-db Draw (W)" + "options": "Pyrphoros Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Draw (W)" + "options": "Statera Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Discharge ETA" + "options": "Pyrphoros Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Discharge ETA" + "options": "Statera Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Status" + "options": "Pyrphoros Status" }, "properties": [ { @@ -151,13 +167,17 @@ } } ] + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Status" + "options": "Statera Status" }, "properties": [ { @@ -175,6 +195,10 @@ } } ] + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] } @@ -213,12 +237,12 @@ { "refId": "A", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100)", - "legendFormat": "titan-db" + "legendFormat": "Pyrphoros" }, { "refId": "B", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100)", - "legendFormat": "tethys" + "legendFormat": "Statera" }, { "refId": "C", @@ -423,25 +447,25 @@ "targets": [ { "refId": "A", - "expr": "max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "Outlet", "instant": true }, { "refId": "B", - "expr": "max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"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", "instant": true } @@ -473,7 +497,7 @@ "custom": { "displayMode": "auto" }, - "decimals": 1 + "decimals": 0 }, "overrides": [] }, diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index e8869a58..2115ea78 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -1097,37 +1097,37 @@ data: { "refId": "A", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100) or on() vector(0)", - "legendFormat": "titan-db Draw (W)", + "legendFormat": "Pyrphoros Draw (W)", "instant": true }, { "refId": "B", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Discharge ETA", + "legendFormat": "Pyrphoros Discharge ETA", "instant": true }, { "refId": "C", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Status", + "legendFormat": "Pyrphoros Status", "instant": true }, { "refId": "D", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100) or on() vector(0)", - "legendFormat": "tethys Draw (W)", + "legendFormat": "Statera Draw (W)", "instant": true }, { "refId": "E", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Discharge ETA", + "legendFormat": "Statera Discharge ETA", "instant": true }, { "refId": "F", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Status", + "legendFormat": "Statera Status", "instant": true } ], @@ -1160,55 +1160,71 @@ data: { "matcher": { "id": "byName", - "options": "titan-db Draw (W)" + "options": "Pyrphoros Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Draw (W)" + "options": "Statera Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Discharge ETA" + "options": "Pyrphoros Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Discharge ETA" + "options": "Statera Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Status" + "options": "Pyrphoros Status" }, "properties": [ { @@ -1226,13 +1242,17 @@ data: } } ] + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Status" + "options": "Statera Status" }, "properties": [ { @@ -1250,6 +1270,10 @@ data: } } ] + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] } @@ -1295,12 +1319,12 @@ data: { "refId": "A", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100)", - "legendFormat": "titan-db" + "legendFormat": "Pyrphoros" }, { "refId": "B", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100)", - "legendFormat": "tethys" + "legendFormat": "Statera" }, { "refId": "C", diff --git a/services/monitoring/grafana-dashboard-power.yaml b/services/monitoring/grafana-dashboard-power.yaml index 9b025ef0..96bbb87b 100644 --- a/services/monitoring/grafana-dashboard-power.yaml +++ b/services/monitoring/grafana-dashboard-power.yaml @@ -31,37 +31,37 @@ data: { "refId": "A", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100) or on() vector(0)", - "legendFormat": "titan-db Draw (W)", + "legendFormat": "Pyrphoros Draw (W)", "instant": true }, { "refId": "B", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Discharge ETA", + "legendFormat": "Pyrphoros Discharge ETA", "instant": true }, { "refId": "C", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-db\"}) or on() vector(0)", - "legendFormat": "titan-db Status", + "legendFormat": "Pyrphoros Status", "instant": true }, { "refId": "D", "expr": "max((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100) or on() vector(0)", - "legendFormat": "tethys Draw (W)", + "legendFormat": "Statera Draw (W)", "instant": true }, { "refId": "E", "expr": "max(hecate_ups_runtime_seconds{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Discharge ETA", + "legendFormat": "Statera Discharge ETA", "instant": true }, { "refId": "F", "expr": "max(hecate_ups_on_battery{job=\"hecate-power\",instance=\"titan-24\"}) or on() vector(0)", - "legendFormat": "tethys Status", + "legendFormat": "Statera Status", "instant": true } ], @@ -94,55 +94,71 @@ data: { "matcher": { "id": "byName", - "options": "titan-db Draw (W)" + "options": "Pyrphoros Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Draw (W)" + "options": "Statera Draw (W)" }, "properties": [ { "id": "unit", "value": "watt" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Discharge ETA" + "options": "Pyrphoros Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Discharge ETA" + "options": "Statera Discharge ETA" }, "properties": [ { "id": "unit", "value": "s" + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] }, { "matcher": { "id": "byName", - "options": "titan-db Status" + "options": "Pyrphoros Status" }, "properties": [ { @@ -160,13 +176,17 @@ data: } } ] + }, + { + "id": "description", + "value": "Attached node: titan-db" } ] }, { "matcher": { "id": "byName", - "options": "tethys Status" + "options": "Statera Status" }, "properties": [ { @@ -184,6 +204,10 @@ data: } } ] + }, + { + "id": "description", + "value": "Attached node: titan-24" } ] } @@ -222,12 +246,12 @@ data: { "refId": "A", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-db\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-db\"}) / 100)", - "legendFormat": "titan-db" + "legendFormat": "Pyrphoros" }, { "refId": "B", "expr": "((hecate_ups_load_percent{job=\"hecate-power\",instance=\"titan-24\"} * hecate_ups_power_nominal_watts{job=\"hecate-power\",instance=\"titan-24\"}) / 100)", - "legendFormat": "tethys" + "legendFormat": "Statera" }, { "refId": "C", @@ -432,25 +456,25 @@ data: "targets": [ { "refId": "A", - "expr": "max(atlas_climate_fan_activity_level{fan_group=\"outlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "Outlet", "instant": true }, { "refId": "B", - "expr": "max(atlas_climate_fan_activity_level{fan_group=\"inside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "max(atlas_climate_fan_activity_level{fan_group=\"outside_inlet\"}) or max(atlas_climate_fan_activity_level{position=\"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": "max(atlas_climate_fan_activity_level{fan_group=\"interior\"}) or max(atlas_climate_fan_activity_level{position=\"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", "instant": true } @@ -482,7 +506,7 @@ data: "custom": { "displayMode": "auto" }, - "decimals": 1 + "decimals": 0 }, "overrides": [] }, diff --git a/services/monitoring/helmrelease.yaml b/services/monitoring/helmrelease.yaml index b1221512..ec836405 100644 --- a/services/monitoring/helmrelease.yaml +++ b/services/monitoring/helmrelease.yaml @@ -296,7 +296,7 @@ spec: podAnnotations: vault.hashicorp.com/agent-inject: "true" vault.hashicorp.com/role: "monitoring" - monitoring.bstein.dev/restart-rev: "10" + monitoring.bstein.dev/restart-rev: "11" vault.hashicorp.com/agent-inject-secret-grafana-env.sh: "kv/data/atlas/monitoring/grafana-admin" vault.hashicorp.com/agent-inject-template-grafana-env.sh: | {{ with secret "kv/data/atlas/monitoring/grafana-admin" }}