Skip to content

Commit f5099ae

Browse files
authored
fix(module): fix dashboards for HA mode (#1801)
* fix(module): fix dashboards Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
1 parent 7ee4938 commit f5099ae

File tree

2 files changed

+49
-83
lines changed

2 files changed

+49
-83
lines changed

monitoring/grafana-dashboards/main/propagated-vm.json

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
},
159159
"editorMode": "code",
160160
"exemplar": false,
161-
"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)",
161+
"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)",
162162
"instant": true,
163163
"legendFormat": "{{name}}",
164164
"range": false,
@@ -734,7 +734,7 @@
734734
},
735735
"editorMode": "code",
736736
"exemplar": false,
737-
"expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
737+
"expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_agent_ready{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
738738
"instant": true,
739739
"legendFormat": "__auto",
740740
"range": false,
@@ -817,7 +817,7 @@
817817
},
818818
"editorMode": "code",
819819
"exemplar": false,
820-
"expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
820+
"expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
821821
"instant": true,
822822
"legendFormat": "__auto",
823823
"range": false,
@@ -952,7 +952,7 @@
952952
},
953953
"editorMode": "code",
954954
"exemplar": false,
955-
"expr": "sum (\nd8_virtualization_virtualmachinesnapshot_info{namespace=~\"$namespace\",virtualmachine=~\"$name\"}\n) or vector(0)\n",
955+
"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)",
956956
"hide": false,
957957
"instant": true,
958958
"legendFormat": "VM snapshots",
@@ -1657,7 +1657,7 @@
16571657
"uid": "${ds_prometheus}"
16581658
},
16591659
"editorMode": "code",
1660-
"expr": "avg by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
1660+
"expr": "max by (name) (\n count by (name,pod) (\n d8_virtualization_virtualmachine_configuration_applied{namespace=\"$namespace\", name=\"$name\"}\n )\n)\n",
16611661
"instant": false,
16621662
"legendFormat": "__auto",
16631663
"range": true,
@@ -1794,7 +1794,7 @@
17941794
"uid": "${ds_prometheus}"
17951795
},
17961796
"editorMode": "code",
1797-
"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)",
1797+
"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)",
17981798
"instant": false,
17991799
"legendFormat": "{{name}}",
18001800
"range": true,
@@ -1863,7 +1863,7 @@
18631863
}
18641864
]
18651865
},
1866-
"unit": "Bps"
1866+
"unit": "binbps"
18671867
},
18681868
"overrides": []
18691869
},
@@ -1893,7 +1893,7 @@
18931893
"uid": "${ds_prometheus}"
18941894
},
18951895
"editorMode": "code",
1896-
"expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_processed_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node)",
1896+
"expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_processed_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node) * 8",
18971897
"instant": false,
18981898
"legendFormat": "Processed memory rate",
18991899
"range": true,
@@ -1905,7 +1905,7 @@
19051905
"uid": "${ds_prometheus}"
19061906
},
19071907
"editorMode": "code",
1908-
"expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_remaining_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node)",
1908+
"expr": "sum(rate(d8_virtualization_virtualmachine_migration_data_remaining_bytes{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])) without (instance,job,node) * 8",
19091909
"hide": false,
19101910
"instant": false,
19111911
"legendFormat": "Remaining memory rate",
@@ -1918,7 +1918,7 @@
19181918
"uid": "${ds_prometheus}"
19191919
},
19201920
"editorMode": "code",
1921-
"expr": "sum(d8_virtualization_virtualmachine_migration_dirty_memory_rate_bytes{namespace=\"$namespace\", name=\"$name\"}) without (instance,job,node)",
1921+
"expr": "sum(d8_virtualization_virtualmachine_migration_dirty_memory_rate_bytes{namespace=\"$namespace\", name=\"$name\"}) without (instance,job,node) * 8",
19221922
"hide": false,
19231923
"instant": false,
19241924
"legendFormat": "Dirty memory rate",
@@ -1997,8 +1997,7 @@
19971997
"mode": "absolute",
19981998
"steps": [
19991999
{
2000-
"color": "green",
2001-
"value": null
2000+
"color": "green"
20022001
}
20032002
]
20042003
},
@@ -2201,8 +2200,7 @@
22012200
"mode": "absolute",
22022201
"steps": [
22032202
{
2204-
"color": "green",
2205-
"value": null
2203+
"color": "green"
22062204
}
22072205
]
22082206
},
@@ -2379,8 +2377,7 @@
23792377
"mode": "absolute",
23802378
"steps": [
23812379
{
2382-
"color": "green",
2383-
"value": null
2380+
"color": "green"
23842381
}
23852382
]
23862383
},
@@ -2665,7 +2662,7 @@
26652662
"h": 8,
26662663
"w": 12,
26672664
"x": 0,
2668-
"y": 38
2665+
"y": 24
26692666
},
26702667
"id": 75,
26712668
"options": {
@@ -2843,7 +2840,7 @@
28432840
"h": 8,
28442841
"w": 12,
28452842
"x": 12,
2846-
"y": 38
2843+
"y": 24
28472844
},
28482845
"id": 42,
28492846
"options": {
@@ -2956,7 +2953,7 @@
29562953
"h": 8,
29572954
"w": 12,
29582955
"x": 0,
2959-
"y": 46
2956+
"y": 32
29602957
},
29612958
"id": 31,
29622959
"options": {
@@ -3072,7 +3069,7 @@
30723069
"h": 8,
30733070
"w": 12,
30743071
"x": 12,
3075-
"y": 46
3072+
"y": 32
30763073
},
30773074
"id": 32,
30783075
"options": {
@@ -3232,7 +3229,7 @@
32323229
"h": 12,
32333230
"w": 24,
32343231
"x": 0,
3235-
"y": 55
3232+
"y": 25
32363233
},
32373234
"id": 83,
32383235
"options": {
@@ -3373,7 +3370,7 @@
33733370
"h": 14,
33743371
"w": 12,
33753372
"x": 0,
3376-
"y": 67
3373+
"y": 37
33773374
},
33783375
"id": 44,
33793376
"maxPerRow": 2,
@@ -3511,7 +3508,7 @@
35113508
"h": 8,
35123509
"w": 12,
35133510
"x": 0,
3514-
"y": 82
3511+
"y": 26
35153512
},
35163513
"id": 7,
35173514
"options": {
@@ -3613,7 +3610,7 @@
36133610
"h": 8,
36143611
"w": 12,
36153612
"x": 12,
3616-
"y": 82
3613+
"y": 26
36173614
},
36183615
"id": 8,
36193616
"options": {
@@ -3715,7 +3712,7 @@
37153712
"h": 8,
37163713
"w": 12,
37173714
"x": 0,
3718-
"y": 90
3715+
"y": 34
37193716
},
37203717
"id": 12,
37213718
"options": {
@@ -3817,7 +3814,7 @@
38173814
"h": 8,
38183815
"w": 12,
38193816
"x": 12,
3820-
"y": 90
3817+
"y": 34
38213818
},
38223819
"id": 11,
38233820
"options": {
@@ -3919,7 +3916,7 @@
39193916
"h": 8,
39203917
"w": 12,
39213918
"x": 0,
3922-
"y": 98
3919+
"y": 42
39233920
},
39243921
"id": 10,
39253922
"options": {
@@ -4021,7 +4018,7 @@
40214018
"h": 8,
40224019
"w": 12,
40234020
"x": 12,
4024-
"y": 98
4021+
"y": 42
40254022
},
40264023
"id": 9,
40274024
"options": {
@@ -4169,7 +4166,7 @@
41694166
"h": 8,
41704167
"w": 12,
41714168
"x": 0,
4172-
"y": 51
4169+
"y": 27
41734170
},
41744171
"id": 13,
41754172
"options": {
@@ -4316,7 +4313,7 @@
43164313
"h": 8,
43174314
"w": 12,
43184315
"x": 12,
4319-
"y": 51
4316+
"y": 27
43204317
},
43214318
"id": 14,
43224319
"options": {
@@ -4463,7 +4460,7 @@
44634460
"h": 8,
44644461
"w": 12,
44654462
"x": 0,
4466-
"y": 59
4463+
"y": 35
44674464
},
44684465
"id": 18,
44694466
"options": {
@@ -4610,7 +4607,7 @@
46104607
"h": 8,
46114608
"w": 12,
46124609
"x": 12,
4613-
"y": 59
4610+
"y": 35
46144611
},
46154612
"id": 17,
46164613
"options": {
@@ -4725,8 +4722,8 @@
47254722
{
47264723
"current": {
47274724
"selected": false,
4728-
"text": "node",
4729-
"value": "node"
4725+
"text": "vm",
4726+
"value": "vm"
47304727
},
47314728
"datasource": {
47324729
"type": "prometheus",
@@ -4815,6 +4812,6 @@
48154812
"timezone": "browser",
48164813
"title": "Namespace / Virtual Machine",
48174814
"uid": "bdw6dw2izvpxcb",
4818-
"version": 2,
4815+
"version": 1,
48194816
"weekStart": ""
48204817
}

0 commit comments

Comments
 (0)