From ad331e2bbf90ed0cf9d9ead6a73de2aeb39a7f9a Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Sun, 7 Dec 2025 12:12:37 +0300 Subject: [PATCH 1/4] fix(module): fix dashboards Signed-off-by: Pavel Tishkov --- .../main/propagated-vms.json | 123 +++++++----------- 1 file changed, 44 insertions(+), 79 deletions(-) diff --git a/monitoring/grafana-dashboards/main/propagated-vms.json b/monitoring/grafana-dashboards/main/propagated-vms.json index 3dc562b5c0..5f55c27496 100644 --- a/monitoring/grafana-dashboards/main/propagated-vms.json +++ b/monitoring/grafana-dashboards/main/propagated-vms.json @@ -128,7 +128,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", "hide": false, "instant": true, "legendFormat": "Total VM count", @@ -142,7 +142,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace,phase) (\n count by (namespace,phase,pod) (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}) * vector(0)\n\n", + "expr": "max by (namespace,phase) (\n count by (namespace,phase,pod) (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"}) * vector(0)\n\n", "instant": true, "legendFormat": "{{phase}}", "range": false, @@ -155,7 +155,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"}==1\n ) \n) or absent(d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"}==1) * vector(0)\n", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"}==1\n ) \n) or absent(d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"}==1) * vector(0)\n", "hide": false, "instant": true, "legendFormat": "Agent ready", @@ -287,7 +287,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualdisk_status_phase{namespace=~\"$namespace\"}==1\n )\n)", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualdisk_status_phase{namespace=~\"$namespace\"}==1\n )\n)", "hide": false, "instant": true, "legendFormat": "Total disk count", @@ -301,7 +301,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace,phase) (\n count by (namespace,pod,phase) (\n d8_virtualization_virtualdisk_status_phase{namespace=~\"$namespace\"}==1\n )\n)", + "expr": "max by (namespace,phase) (\n count by (namespace,pod,phase) (\n d8_virtualization_virtualdisk_status_phase{namespace=~\"$namespace\"}==1\n )\n)", "instant": true, "legendFormat": "{{phase}}", "range": false, @@ -593,7 +593,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualimage_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualimage_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualimage_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualimage_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", "hide": false, "instant": true, "legendFormat": "VirtualImages", @@ -607,7 +607,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualdisksnapshot_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualdisksnapshot_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualdisksnapshot_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualdisksnapshot_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", "hide": false, "instant": true, "legendFormat": "VirtualDiskSnapshots", @@ -621,7 +621,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachinesnapshot_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachinesnapshot_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachinesnapshot_status_phase{namespace=~\"$namespace\"}==1\n )\n) or absent(d8_virtualization_virtualmachinesnapshot_status_phase{namespace=~\"$namespace\"}==1) * vector(0)", "hide": false, "instant": true, "legendFormat": "VirtualMachineSnapshots", @@ -1398,7 +1398,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "avg by (namespace, name, phase) (d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"})==1", + "expr": "max by (namespace, name, phase) (d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"})==1", "format": "table", "hide": false, "instant": true, @@ -1413,7 +1413,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "avg by (namespace, name, phase) (d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"})", + "expr": "max by (namespace, name, phase) (d8_virtualization_virtualmachine_agent_ready{namespace=~\"$namespace\"})", "format": "table", "hide": false, "instant": true, @@ -1611,7 +1611,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace, name) (\n count by (namespace, name,pod) (\n label_replace(\n d8_virtualization_virtualdisk_status_in_use{namespace=~\"$namespace\"}, \n \"name\", \n \"$1\", \n \"virtualmachine\", \n \"(.+)\"\n )\n ) * on(namespace, name,pod) group_left() (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1\n )\n)", + "expr": "max by (namespace, name) (\n count by (namespace, name,pod) (\n label_replace(\n d8_virtualization_virtualdisk_status_in_use{namespace=~\"$namespace\"}, \n \"name\", \n \"$1\", \n \"virtualmachine\", \n \"(.+)\"\n )\n ) * on(namespace, name,pod) group_left() (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1\n )\n)", "format": "table", "hide": false, "instant": true, @@ -1628,7 +1628,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (namespace, name) (\n count by (namespace, name, pod) (\n label_replace(\n d8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\"}, \n \"name\", \n \"$1\", \n \"virtualmachine\", \n \"(.+)\"\n )\n ) * on(namespace, name,pod) group_left() (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1\n )\n)", + "expr": "max by (namespace, name) (\n count by (namespace, name, pod) (\n label_replace(\n d8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\"}, \n \"name\", \n \"$1\", \n \"virtualmachine\", \n \"(.+)\"\n )\n ) * on(namespace, name,pod) group_left() (\n d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1\n )\n)", "format": "table", "hide": false, "instant": true, @@ -1811,7 +1811,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "avg by (name,namespace) (\n sum by (name,namespace,pod) ((d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", + "expr": "max by (name,namespace) (\n sum by (name,namespace,pod) ((d8_virtualization_virtualmachine_status_phase{namespace=~\"$namespace\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", "instant": false, "legendFormat": "{{ name }}", "range": true, @@ -1993,32 +1993,6 @@ "value": 0 } ] - }, - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "OS Usage / vm-002 ", - "OS Usage / vm-001 ", - "Guaranteed cores" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] } ] }, @@ -2351,7 +2325,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2618,7 +2593,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2976,7 +2952,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3015,30 +2992,6 @@ } } ] - }, - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "Quota" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] } ] }, @@ -3148,7 +3101,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3313,7 +3267,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3472,7 +3427,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3574,7 +3530,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3676,7 +3633,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3778,7 +3736,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3880,7 +3839,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3982,7 +3942,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4099,7 +4060,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4251,7 +4213,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4390,7 +4353,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4529,7 +4493,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4772,6 +4737,6 @@ "timezone": "browser", "title": "Namespace / Virtual Machines", "uid": "aenrewb6nk0sgf", - "version": 6, + "version": 1, "weekStart": "" } From a977eee0191180e3ef4c1906e5f940f7b7e0597e Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Sun, 7 Dec 2025 12:36:36 +0300 Subject: [PATCH 2/4] fix(module): fix dashboards Signed-off-by: Pavel Tishkov --- .../main/propagated-vm.json | 98 +++++++++++-------- 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/monitoring/grafana-dashboards/main/propagated-vm.json b/monitoring/grafana-dashboards/main/propagated-vm.json index 572b6754b8..292e2a68f8 100644 --- a/monitoring/grafana-dashboards/main/propagated-vm.json +++ b/monitoring/grafana-dashboards/main/propagated-vm.json @@ -158,7 +158,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (name) (\n sum by (name,pod) (\n (d8_virtualization_virtualmachine_status_phase{namespace=\"$namespace\", name=\"$name\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", + "expr": "max by (name) (\n sum by (name,pod) (\n (d8_virtualization_virtualmachine_status_phase{namespace=\"$namespace\", name=\"$name\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", "instant": true, "legendFormat": "{{name}}", "range": false, @@ -734,7 +734,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", + "expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", "instant": true, "legendFormat": "__auto", "range": false, @@ -817,7 +817,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", + "expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", "instant": true, "legendFormat": "__auto", "range": false, @@ -952,7 +952,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum (\nd8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\",virtualmachine=~\"$name\"}\n) or vector(0)\n", + "expr": "max by (namespace) (\n count by (namespace,pod) (\n d8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\", virtualmachine=\"$name\"}==1\n )\n) or absent(d8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\", virtualmachine=\"$name\"}==1) * vector(0)", "hide": false, "instant": true, "legendFormat": "VM snapshots", @@ -1657,7 +1657,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", + "expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n", "instant": false, "legendFormat": "__auto", "range": true, @@ -1794,7 +1794,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "avg by (name) (\n sum by (name,pod) (\n (d8_virtualization_virtualmachine_status_phase{namespace=\"$namespace\", name=\"$name\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", + "expr": "max by (name) (\n sum by (name,pod) (\n (d8_virtualization_virtualmachine_status_phase{namespace=\"$namespace\", name=\"$name\"} == 1) * on(phase) group_left()\n (\n label_replace(vector(1), \"phase\", \"Degraded\", \"\", \"\") or\n label_replace(vector(2), \"phase\", \"Migrating\", \"\", \"\") or\n label_replace(vector(3), \"phase\", \"Pause\", \"\", \"\") or\n label_replace(vector(4), \"phase\", \"Pending\", \"\", \"\") or\n label_replace(vector(5), \"phase\", \"Running\", \"\", \"\") or\n label_replace(vector(6), \"phase\", \"Starting\", \"\", \"\") or\n label_replace(vector(7), \"phase\", \"Stopped\", \"\", \"\") or\n label_replace(vector(8), \"phase\", \"Stopping\", \"\", \"\") or\n label_replace(vector(9), \"phase\", \"Terminating\", \"\", \"\")\n ))\n)", "instant": false, "legendFormat": "{{name}}", "range": true, @@ -2592,7 +2592,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2665,7 +2666,7 @@ "h": 8, "w": 12, "x": 0, - "y": 38 + "y": 24 }, "id": 75, "options": { @@ -2792,7 +2793,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2843,7 +2845,7 @@ "h": 8, "w": 12, "x": 12, - "y": 38 + "y": 24 }, "id": 42, "options": { @@ -2945,7 +2947,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -2956,7 +2959,7 @@ "h": 8, "w": 12, "x": 0, - "y": 46 + "y": 32 }, "id": 31, "options": { @@ -3056,7 +3059,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3072,7 +3076,7 @@ "h": 8, "w": 12, "x": 12, - "y": 46 + "y": 32 }, "id": 32, "options": { @@ -3186,7 +3190,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3232,7 +3237,7 @@ "h": 12, "w": 24, "x": 0, - "y": 55 + "y": 25 }, "id": 83, "options": { @@ -3318,7 +3323,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3373,7 +3379,7 @@ "h": 14, "w": 12, "x": 0, - "y": 67 + "y": 37 }, "id": 44, "maxPerRow": 2, @@ -3495,7 +3501,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3511,7 +3518,7 @@ "h": 8, "w": 12, "x": 0, - "y": 82 + "y": 26 }, "id": 7, "options": { @@ -3597,7 +3604,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3613,7 +3621,7 @@ "h": 8, "w": 12, "x": 12, - "y": 82 + "y": 26 }, "id": 8, "options": { @@ -3699,7 +3707,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3715,7 +3724,7 @@ "h": 8, "w": 12, "x": 0, - "y": 90 + "y": 34 }, "id": 12, "options": { @@ -3801,7 +3810,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3817,7 +3827,7 @@ "h": 8, "w": 12, "x": 12, - "y": 90 + "y": 34 }, "id": 11, "options": { @@ -3903,7 +3913,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3919,7 +3930,7 @@ "h": 8, "w": 12, "x": 0, - "y": 98 + "y": 42 }, "id": 10, "options": { @@ -4005,7 +4016,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4021,7 +4033,7 @@ "h": 8, "w": 12, "x": 12, - "y": 98 + "y": 42 }, "id": 9, "options": { @@ -4121,7 +4133,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4169,7 +4182,7 @@ "h": 8, "w": 12, "x": 0, - "y": 51 + "y": 27 }, "id": 13, "options": { @@ -4268,7 +4281,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4316,7 +4330,7 @@ "h": 8, "w": 12, "x": 12, - "y": 51 + "y": 27 }, "id": 14, "options": { @@ -4415,7 +4429,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4463,7 +4478,7 @@ "h": 8, "w": 12, "x": 0, - "y": 59 + "y": 35 }, "id": 18, "options": { @@ -4562,7 +4577,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -4610,7 +4626,7 @@ "h": 8, "w": 12, "x": 12, - "y": 59 + "y": 35 }, "id": 17, "options": { @@ -4725,8 +4741,8 @@ { "current": { "selected": false, - "text": "node", - "value": "node" + "text": "vm", + "value": "vm" }, "datasource": { "type": "prometheus", @@ -4815,6 +4831,6 @@ "timezone": "browser", "title": "Namespace / Virtual Machine", "uid": "bdw6dw2izvpxcb", - "version": 2, + "version": 1, "weekStart": "" } From 44710fcf83c3a6de04a70dd27ae2c20a67578363 Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Sun, 7 Dec 2025 12:37:55 +0300 Subject: [PATCH 3/4] fix(module): remove node vars Signed-off-by: Pavel Tishkov --- .../main/propagated-vms.json | 82 ++++--------------- 1 file changed, 18 insertions(+), 64 deletions(-) diff --git a/monitoring/grafana-dashboards/main/propagated-vms.json b/monitoring/grafana-dashboards/main/propagated-vms.json index 5f55c27496..98a0afb830 100644 --- a/monitoring/grafana-dashboards/main/propagated-vms.json +++ b/monitoring/grafana-dashboards/main/propagated-vms.json @@ -1773,8 +1773,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -1889,8 +1888,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2172,8 +2170,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2325,8 +2322,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2593,8 +2589,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2952,8 +2947,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3101,8 +3095,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3267,8 +3260,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3427,8 +3419,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3530,8 +3521,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3633,8 +3623,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3736,8 +3725,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3839,8 +3827,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3942,8 +3929,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4060,8 +4046,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4213,8 +4198,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4353,8 +4337,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4493,8 +4476,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4698,34 +4680,6 @@ "skipUrlSync": false, "sort": 1, "type": "query" - }, - { - "current": { - "selected": false, - "text": "node", - "value": "node" - }, - "datasource": { - "type": "prometheus", - "uid": "${ds_prometheus}" - }, - "definition": "label_values(kubernetes_build_info,node)", - "hide": 2, - "includeAll": false, - "label": "Node", - "multi": false, - "name": "node", - "options": [], - "query": { - "qryType": 1, - "query": "label_values(kubernetes_build_info,node)", - "refId": "PrometheusVariableQueryEditor-VariableQuery" - }, - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, From c3b7ce957a86e42e18d4fcb755b365da1684e143 Mon Sep 17 00:00:00 2001 From: Pavel Tishkov Date: Mon, 8 Dec 2025 10:56:16 +0300 Subject: [PATCH 4/4] bytes -> bits per second Signed-off-by: Pavel Tishkov --- .../main/propagated-vm.json | 65 +++++++------------ 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/monitoring/grafana-dashboards/main/propagated-vm.json b/monitoring/grafana-dashboards/main/propagated-vm.json index 292e2a68f8..25ce4dc9f9 100644 --- a/monitoring/grafana-dashboards/main/propagated-vm.json +++ b/monitoring/grafana-dashboards/main/propagated-vm.json @@ -1863,7 +1863,7 @@ } ] }, - "unit": "Bps" + "unit": "binbps" }, "overrides": [] }, @@ -1893,7 +1893,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_processed_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node)", + "expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_processed_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node) * 8", "instant": false, "legendFormat": "Processed memory rate", "range": true, @@ -1905,7 +1905,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_remaining_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node)", + "expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_remaining_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node) * 8", "hide": false, "instant": false, "legendFormat": "Remaining memory rate", @@ -1918,7 +1918,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "sum(d8_virtualization_virtualmachine_migration_dirty_memory_rate_bytes{namespace=\"$namespace\", name=\"$name\"}) without (instance,job,node)", + "expr": "sum(d8_virtualization_virtualmachine_migration_dirty_memory_rate_bytes{namespace=\"$namespace\", name=\"$name\"}) without (instance,job,node) * 8", "hide": false, "instant": false, "legendFormat": "Dirty memory rate", @@ -1997,8 +1997,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2201,8 +2200,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2379,8 +2377,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2592,8 +2589,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2793,8 +2789,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2947,8 +2942,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -3059,8 +3053,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3190,8 +3183,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3323,8 +3315,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3501,8 +3492,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3604,8 +3594,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3707,8 +3696,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3810,8 +3798,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3913,8 +3900,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4016,8 +4002,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4133,8 +4118,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4281,8 +4265,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4429,8 +4412,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -4577,8 +4559,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red",