monitoring(jobs): switch cleanup stats to two-row layout

This commit is contained in:
Brad Stein 2026-04-12 20:38:04 -03:00
parent ed5a59f21d
commit d2672300a3
3 changed files with 90 additions and 30 deletions

View File

@ -3254,6 +3254,8 @@ def build_jobs_dashboard():
JENKINS_CLEANUP_SIGNAL_COUNT, JENKINS_CLEANUP_SIGNAL_COUNT,
{"h": 4, "w": 4, "x": 0, "y": 33}, {"h": 4, "w": 4, "x": 0, "y": 33},
unit="none", unit="none",
text_mode="name_and_value",
legend="Signal",
instant=True, instant=True,
thresholds={ thresholds={
"mode": "absolute", "mode": "absolute",
@ -3262,6 +3264,10 @@ def build_jobs_dashboard():
{"color": "green", "value": 1}, {"color": "green", "value": 1},
], ],
}, },
orientation="vertical",
wide_layout=True,
graph_mode="none",
justify_mode="auto",
) )
) )
panels.append( panels.append(
@ -3272,8 +3278,14 @@ def build_jobs_dashboard():
{"h": 4, "w": 4, "x": 4, "y": 33}, {"h": 4, "w": 4, "x": 4, "y": 33},
unit="h", unit="h",
decimals=2, decimals=2,
text_mode="name_and_value",
legend="Last Run",
instant=True, instant=True,
thresholds=age_thresholds, thresholds=age_thresholds,
orientation="vertical",
wide_layout=True,
graph_mode="none",
justify_mode="auto",
) )
) )
panels.append( panels.append(
@ -3284,8 +3296,14 @@ def build_jobs_dashboard():
{"h": 4, "w": 4, "x": 8, "y": 33}, {"h": 4, "w": 4, "x": 8, "y": 33},
unit="h", unit="h",
decimals=2, decimals=2,
text_mode="name_and_value",
legend="Last Success",
instant=True, instant=True,
thresholds=age_thresholds, thresholds=age_thresholds,
orientation="vertical",
wide_layout=True,
graph_mode="none",
justify_mode="auto",
) )
) )
panels.append( panels.append(
@ -3295,7 +3313,13 @@ def build_jobs_dashboard():
JENKINS_CLEANUP_LAST_PLANNED, JENKINS_CLEANUP_LAST_PLANNED,
{"h": 4, "w": 4, "x": 12, "y": 33}, {"h": 4, "w": 4, "x": 12, "y": 33},
unit="none", unit="none",
text_mode="name_and_value",
legend="Planned",
instant=True, instant=True,
orientation="vertical",
wide_layout=True,
graph_mode="none",
justify_mode="auto",
) )
) )
panels.append( panels.append(
@ -3305,7 +3329,13 @@ def build_jobs_dashboard():
JENKINS_CLEANUP_LAST_DELETED, JENKINS_CLEANUP_LAST_DELETED,
{"h": 4, "w": 4, "x": 16, "y": 33}, {"h": 4, "w": 4, "x": 16, "y": 33},
unit="none", unit="none",
text_mode="name_and_value",
legend="Deleted",
instant=True, instant=True,
orientation="vertical",
wide_layout=True,
graph_mode="none",
justify_mode="auto",
) )
) )
panels.append( panels.append(

View File

@ -1079,6 +1079,7 @@
{ {
"expr": "count(ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) or on() vector(0)", "expr": "count(ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Signal",
"instant": true "instant": true
} }
], ],
@ -1110,8 +1111,8 @@
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1119,7 +1120,9 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1140,6 +1143,7 @@
{ {
"expr": "((time() - ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) / 3600) or on() vector(999)", "expr": "((time() - ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) / 3600) or on() vector(999)",
"refId": "A", "refId": "A",
"legendFormat": "Last Run",
"instant": true "instant": true
} }
], ],
@ -1180,8 +1184,8 @@
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1189,7 +1193,9 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1210,6 +1216,7 @@
{ {
"expr": "((time() - ariadne_jenkins_workspace_cleanup_last_success_timestamp_seconds) / 3600) or on() vector(999)", "expr": "((time() - ariadne_jenkins_workspace_cleanup_last_success_timestamp_seconds) / 3600) or on() vector(999)",
"refId": "A", "refId": "A",
"legendFormat": "Last Success",
"instant": true "instant": true
} }
], ],
@ -1250,8 +1257,8 @@
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1259,7 +1266,9 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1280,6 +1289,7 @@
{ {
"expr": "ariadne_jenkins_workspace_cleanup_last_planned_total or on() vector(0)", "expr": "ariadne_jenkins_workspace_cleanup_last_planned_total or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Planned",
"instant": true "instant": true
} }
], ],
@ -1311,8 +1321,8 @@
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1320,7 +1330,9 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1341,6 +1353,7 @@
{ {
"expr": "ariadne_jenkins_workspace_cleanup_last_deleted_total or on() vector(0)", "expr": "ariadne_jenkins_workspace_cleanup_last_deleted_total or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Deleted",
"instant": true "instant": true
} }
], ],
@ -1372,8 +1385,8 @@
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1381,7 +1394,9 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {

View File

@ -1088,6 +1088,7 @@ data:
{ {
"expr": "count(ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) or on() vector(0)", "expr": "count(ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Signal",
"instant": true "instant": true
} }
], ],
@ -1119,8 +1120,8 @@ data:
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1128,7 +1129,9 @@ data:
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1149,6 +1152,7 @@ data:
{ {
"expr": "((time() - ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) / 3600) or on() vector(999)", "expr": "((time() - ariadne_jenkins_workspace_cleanup_last_run_timestamp_seconds) / 3600) or on() vector(999)",
"refId": "A", "refId": "A",
"legendFormat": "Last Run",
"instant": true "instant": true
} }
], ],
@ -1189,8 +1193,8 @@ data:
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1198,7 +1202,9 @@ data:
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1219,6 +1225,7 @@ data:
{ {
"expr": "((time() - ariadne_jenkins_workspace_cleanup_last_success_timestamp_seconds) / 3600) or on() vector(999)", "expr": "((time() - ariadne_jenkins_workspace_cleanup_last_success_timestamp_seconds) / 3600) or on() vector(999)",
"refId": "A", "refId": "A",
"legendFormat": "Last Success",
"instant": true "instant": true
} }
], ],
@ -1259,8 +1266,8 @@ data:
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1268,7 +1275,9 @@ data:
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1289,6 +1298,7 @@ data:
{ {
"expr": "ariadne_jenkins_workspace_cleanup_last_planned_total or on() vector(0)", "expr": "ariadne_jenkins_workspace_cleanup_last_planned_total or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Planned",
"instant": true "instant": true
} }
], ],
@ -1320,8 +1330,8 @@ data:
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1329,7 +1339,9 @@ data:
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {
@ -1350,6 +1362,7 @@ data:
{ {
"expr": "ariadne_jenkins_workspace_cleanup_last_deleted_total or on() vector(0)", "expr": "ariadne_jenkins_workspace_cleanup_last_deleted_total or on() vector(0)",
"refId": "A", "refId": "A",
"legendFormat": "Deleted",
"instant": true "instant": true
} }
], ],
@ -1381,8 +1394,8 @@ data:
}, },
"options": { "options": {
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "none",
"justifyMode": "center", "justifyMode": "auto",
"reduceOptions": { "reduceOptions": {
"calcs": [ "calcs": [
"lastNotNull" "lastNotNull"
@ -1390,7 +1403,9 @@ data:
"fields": "", "fields": "",
"values": false "values": false
}, },
"textMode": "value" "textMode": "name_and_value",
"orientation": "vertical",
"wideLayout": true
} }
}, },
{ {