monitoring(overview): swap jobs and power rows; tighten climate/fan display
This commit is contained in:
parent
3c21b470ed
commit
12ce0f8e2a
@ -646,6 +646,7 @@ def stat_panel(
|
|||||||
targets=None,
|
targets=None,
|
||||||
field_overrides=None,
|
field_overrides=None,
|
||||||
description=None,
|
description=None,
|
||||||
|
orientation=None,
|
||||||
):
|
):
|
||||||
"""Return a Grafana stat panel definition."""
|
"""Return a Grafana stat panel definition."""
|
||||||
defaults = {
|
defaults = {
|
||||||
@ -684,6 +685,8 @@ def stat_panel(
|
|||||||
"textMode": text_mode,
|
"textMode": text_mode,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
if orientation:
|
||||||
|
panel["options"]["orientation"] = orientation
|
||||||
if legend and len(panel["targets"]) == 1:
|
if legend and len(panel["targets"]) == 1:
|
||||||
panel["targets"][0]["legendFormat"] = legend
|
panel["targets"][0]["legendFormat"] = legend
|
||||||
if instant:
|
if instant:
|
||||||
@ -1278,7 +1281,7 @@ def build_overview():
|
|||||||
40,
|
40,
|
||||||
"UPS Current Load",
|
"UPS Current Load",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 0, "y": 11},
|
{"h": 6, "w": 4, "x": 0, "y": 14},
|
||||||
unit="none",
|
unit="none",
|
||||||
decimals=1,
|
decimals=1,
|
||||||
text_mode="name_and_value",
|
text_mode="name_and_value",
|
||||||
@ -1307,7 +1310,7 @@ def build_overview():
|
|||||||
41,
|
41,
|
||||||
"UPS History (Power Draw)",
|
"UPS History (Power Draw)",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 4, "y": 11},
|
{"h": 6, "w": 4, "x": 4, "y": 14},
|
||||||
unit="watt",
|
unit="watt",
|
||||||
targets=[
|
targets=[
|
||||||
{"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": "titan-db"},
|
{"refId": "A", "expr": HECATE_UPS_DRAW_WATTS_DB_SERIES, "legendFormat": "titan-db"},
|
||||||
@ -1324,10 +1327,10 @@ def build_overview():
|
|||||||
42,
|
42,
|
||||||
"Current Climate",
|
"Current Climate",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 8, "y": 11},
|
{"h": 6, "w": 4, "x": 8, "y": 14},
|
||||||
unit="none",
|
unit="none",
|
||||||
decimals=2,
|
decimals=2,
|
||||||
text_mode="name_and_value",
|
text_mode="value",
|
||||||
targets=[
|
targets=[
|
||||||
{"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "Tent Temp (°C)", "instant": True},
|
{"refId": "A", "expr": CLIMATE_TEMP_MAX, "legendFormat": "Tent Temp (°C)", "instant": True},
|
||||||
{"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent Pressure (kPa)", "instant": True},
|
{"refId": "B", "expr": CLIMATE_PRESSURE_CURRENT, "legendFormat": "Tent Pressure (kPa)", "instant": True},
|
||||||
@ -1338,6 +1341,7 @@ def build_overview():
|
|||||||
],
|
],
|
||||||
links=link_to("atlas-power"),
|
links=link_to("atlas-power"),
|
||||||
description="Current tent temperature and pressure.",
|
description="Current tent temperature and pressure.",
|
||||||
|
orientation="vertical",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
panels.append(
|
panels.append(
|
||||||
@ -1345,7 +1349,7 @@ def build_overview():
|
|||||||
43,
|
43,
|
||||||
"Climate History",
|
"Climate History",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 12, "y": 11},
|
{"h": 6, "w": 4, "x": 12, "y": 14},
|
||||||
unit="celsius",
|
unit="celsius",
|
||||||
targets=[
|
targets=[
|
||||||
{"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "Temperature (°C)"},
|
{"refId": "A", "expr": CLIMATE_TEMP_SERIES, "legendFormat": "Temperature (°C)"},
|
||||||
@ -1372,9 +1376,9 @@ def build_overview():
|
|||||||
140,
|
140,
|
||||||
"Fan Activity",
|
"Fan Activity",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 16, "y": 11},
|
{"h": 6, "w": 4, "x": 16, "y": 14},
|
||||||
unit="none",
|
unit="none",
|
||||||
decimals=1,
|
decimals=0,
|
||||||
text_mode="name_and_value",
|
text_mode="name_and_value",
|
||||||
targets=[
|
targets=[
|
||||||
{"refId": "A", "expr": CLIMATE_FAN_OUTLET_CURRENT, "legendFormat": "Outlet", "instant": True},
|
{"refId": "A", "expr": CLIMATE_FAN_OUTLET_CURRENT, "legendFormat": "Outlet", "instant": True},
|
||||||
@ -1398,7 +1402,7 @@ def build_overview():
|
|||||||
141,
|
141,
|
||||||
"Fan History (0-10)",
|
"Fan History (0-10)",
|
||||||
None,
|
None,
|
||||||
{"h": 6, "w": 4, "x": 20, "y": 11},
|
{"h": 6, "w": 4, "x": 20, "y": 14},
|
||||||
unit="none",
|
unit="none",
|
||||||
max_value=10,
|
max_value=10,
|
||||||
targets=[
|
targets=[
|
||||||
@ -1418,7 +1422,7 @@ def build_overview():
|
|||||||
44,
|
44,
|
||||||
"One-off Job Pods >1h",
|
"One-off Job Pods >1h",
|
||||||
f"({ONEOFF_JOB_POD_AGE_HOURS}) > 1",
|
f"({ONEOFF_JOB_POD_AGE_HOURS}) > 1",
|
||||||
{"h": 3, "w": 6, "x": 0, "y": 17},
|
{"h": 3, "w": 6, "x": 0, "y": 11},
|
||||||
unit="h",
|
unit="h",
|
||||||
instant=True,
|
instant=True,
|
||||||
transformations=[
|
transformations=[
|
||||||
@ -1434,7 +1438,7 @@ def build_overview():
|
|||||||
45,
|
45,
|
||||||
"Ariadne Attempts (24h)",
|
"Ariadne Attempts (24h)",
|
||||||
"sum(increase(ariadne_task_runs_total[24h]))",
|
"sum(increase(ariadne_task_runs_total[24h]))",
|
||||||
{"h": 3, "w": 6, "x": 6, "y": 17},
|
{"h": 3, "w": 6, "x": 6, "y": 11},
|
||||||
unit="none",
|
unit="none",
|
||||||
decimals=0,
|
decimals=0,
|
||||||
links=link_to("atlas-jobs"),
|
links=link_to("atlas-jobs"),
|
||||||
@ -1444,7 +1448,7 @@ def build_overview():
|
|||||||
46,
|
46,
|
||||||
"Platform Test Success Rate",
|
"Platform Test Success Rate",
|
||||||
TEST_SUCCESS_RATE,
|
TEST_SUCCESS_RATE,
|
||||||
{"h": 3, "w": 6, "x": 12, "y": 17},
|
{"h": 3, "w": 6, "x": 12, "y": 11},
|
||||||
unit="percent",
|
unit="percent",
|
||||||
decimals=2,
|
decimals=2,
|
||||||
thresholds={
|
thresholds={
|
||||||
@ -1467,7 +1471,7 @@ def build_overview():
|
|||||||
47,
|
47,
|
||||||
"Platform Test Failures (24h)",
|
"Platform Test Failures (24h)",
|
||||||
TEST_FAILURES_24H_TOTAL,
|
TEST_FAILURES_24H_TOTAL,
|
||||||
{"h": 3, "w": 6, "x": 18, "y": 17},
|
{"h": 3, "w": 6, "x": 18, "y": 11},
|
||||||
unit="none",
|
unit="none",
|
||||||
decimals=0,
|
decimals=0,
|
||||||
instant=True,
|
instant=True,
|
||||||
|
|||||||
@ -1082,7 +1082,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1280,7 +1280,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 4,
|
"x": 4,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1334,7 +1334,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 8,
|
"x": 8,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1413,7 +1413,8 @@
|
|||||||
"fields": "",
|
"fields": "",
|
||||||
"values": false
|
"values": false
|
||||||
},
|
},
|
||||||
"textMode": "name_and_value"
|
"textMode": "value",
|
||||||
|
"orientation": "vertical"
|
||||||
},
|
},
|
||||||
"links": [
|
"links": [
|
||||||
{
|
{
|
||||||
@ -1436,7 +1437,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 12,
|
"x": 12,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1510,7 +1511,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 16,
|
"x": 16,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1565,7 +1566,7 @@
|
|||||||
"custom": {
|
"custom": {
|
||||||
"displayMode": "auto"
|
"displayMode": "auto"
|
||||||
},
|
},
|
||||||
"decimals": 1
|
"decimals": 0
|
||||||
},
|
},
|
||||||
"overrides": []
|
"overrides": []
|
||||||
},
|
},
|
||||||
@ -1602,7 +1603,7 @@
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 20,
|
"x": 20,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1662,7 +1663,7 @@
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1721,7 +1722,7 @@
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 6,
|
"x": 6,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1789,7 +1790,7 @@
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 12,
|
"x": 12,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1866,7 +1867,7 @@
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 18,
|
"x": 18,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1091,7 +1091,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1289,7 +1289,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 4,
|
"x": 4,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1343,7 +1343,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 8,
|
"x": 8,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1422,7 +1422,8 @@ data:
|
|||||||
"fields": "",
|
"fields": "",
|
||||||
"values": false
|
"values": false
|
||||||
},
|
},
|
||||||
"textMode": "name_and_value"
|
"textMode": "value",
|
||||||
|
"orientation": "vertical"
|
||||||
},
|
},
|
||||||
"links": [
|
"links": [
|
||||||
{
|
{
|
||||||
@ -1445,7 +1446,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 12,
|
"x": 12,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1519,7 +1520,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 16,
|
"x": 16,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1574,7 +1575,7 @@ data:
|
|||||||
"custom": {
|
"custom": {
|
||||||
"displayMode": "auto"
|
"displayMode": "auto"
|
||||||
},
|
},
|
||||||
"decimals": 1
|
"decimals": 0
|
||||||
},
|
},
|
||||||
"overrides": []
|
"overrides": []
|
||||||
},
|
},
|
||||||
@ -1611,7 +1612,7 @@ data:
|
|||||||
"h": 6,
|
"h": 6,
|
||||||
"w": 4,
|
"w": 4,
|
||||||
"x": 20,
|
"x": 20,
|
||||||
"y": 11
|
"y": 14
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1671,7 +1672,7 @@ data:
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1730,7 +1731,7 @@ data:
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 6,
|
"x": 6,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1798,7 +1799,7 @@ data:
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 12,
|
"x": 12,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
@ -1875,7 +1876,7 @@ data:
|
|||||||
"h": 3,
|
"h": 3,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 18,
|
"x": 18,
|
||||||
"y": 17
|
"y": 11
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user