From 3346ce9bb0bc9cdebb051ce957d15f4f76150cac Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 27 Dec 2023 13:32:44 -0500 Subject: [PATCH] Add missing shutdown state from combinations --- daemon-common/common.py | 4 + .../grafana-pvc-cluster-dashboard.json | 124 ++++++++---------- 2 files changed, 57 insertions(+), 71 deletions(-) diff --git a/daemon-common/common.py b/daemon-common/common.py index 31e2d6a8..f948a0f9 100644 --- a/daemon-common/common.py +++ b/daemon-common/common.py @@ -53,6 +53,10 @@ node_state_combinations = [ "init,flush", "init,flushed", "init,unflush", + "shutdown,ready", + "shutdown,flush", + "shutdown,flushed", + "shutdown,unflush", "stop,ready", "stop,flush", "stop,flushed", diff --git a/monitoring/prometheus/grafana-pvc-cluster-dashboard.json b/monitoring/prometheus/grafana-pvc-cluster-dashboard.json index 94306cb1..f4c9e002 100644 --- a/monitoring/prometheus/grafana-pvc-cluster-dashboard.json +++ b/monitoring/prometheus/grafana-pvc-cluster-dashboard.json @@ -1633,6 +1633,21 @@ } ] }, + { + "matcher": { + "id": "byName", + "options": "Shutdown" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "dark-yellow", + "mode": "fixed" + } + } + ] + }, { "matcher": { "id": "byName", @@ -1773,12 +1788,13 @@ }, "indexByName": { "Time": 0, - "dead": 5, - "fenced": 6, + "dead": 6, + "fenced": 7, "init": 3, "pvc_nodes": 1, "run": 2, - "stop": 4 + "shutdown": 4, + "stop": 5 }, "renameByName": { "Time": "", @@ -3152,8 +3168,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3263,8 +3278,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3340,8 +3354,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3451,8 +3464,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3528,8 +3540,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3639,8 +3650,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3716,8 +3726,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3827,8 +3836,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -3917,8 +3925,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4027,8 +4034,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4158,8 +4164,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -4247,8 +4252,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4357,8 +4361,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4490,8 +4493,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -4592,8 +4594,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4702,8 +4703,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -4833,8 +4833,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -4923,8 +4922,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5034,8 +5032,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5165,8 +5162,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -5255,8 +5251,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5366,8 +5361,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5498,8 +5492,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -5601,8 +5594,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5713,8 +5705,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -5827,8 +5818,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -5931,8 +5921,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -6210,8 +6199,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -6337,8 +6325,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -6454,8 +6441,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -6564,8 +6550,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "yellow", @@ -6677,8 +6662,7 @@ "mode": "absolute", "steps": [ { - "color": "transparent", - "value": null + "color": "transparent" } ] }, @@ -6781,8 +6765,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -6908,8 +6891,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red",