Skip to content

Commit 65baa28

Browse files
committed
fix(module): fix virtualization overview dashboard duplicate series issue
Signed-off-by: Pavel Tishkov <pavel.tishkov@flant.com>
1 parent 3646dbe commit 65baa28

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

monitoring/grafana-dashboards/virtualization/cluster-overview.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
},
236236
"editorMode": "code",
237237
"exemplar": false,
238-
"expr": "avg (\n sum by (pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
238+
"expr": "avg (\n sum by (pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
239239
"format": "time_series",
240240
"instant": true,
241241
"legendFormat": "__auto",
@@ -303,7 +303,7 @@
303303
},
304304
"editorMode": "code",
305305
"exemplar": false,
306-
"expr": "avg (\n sum by(pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name)\n (\n 1 + (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
306+
"expr": "avg (\n sum by(pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 + max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
307307
"format": "time_series",
308308
"instant": true,
309309
"legendFormat": "__auto",
@@ -654,7 +654,7 @@
654654
"uid": "${ds_prometheus}"
655655
},
656656
"editorMode": "code",
657-
"expr": "avg by (namespace) (\n sum by (namespace,pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
657+
"expr": "avg by (namespace) (\n sum by (namespace,pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
658658
"format": "table",
659659
"hide": false,
660660
"instant": true,
@@ -670,7 +670,7 @@
670670
},
671671
"editorMode": "code",
672672
"exemplar": false,
673-
"expr": "avg by(namespace) (\n sum by(namespace, pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name)\n (\n 1 + (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
673+
"expr": "avg by(namespace) (\n sum by(namespace, pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 + max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name) group_left()\n (\n 1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
674674
"format": "table",
675675
"hide": false,
676676
"instant": true,
@@ -1623,7 +1623,7 @@
16231623
"uid": "${ds_prometheus}"
16241624
},
16251625
"editorMode": "code",
1626-
"expr": "avg by (namespace) (\n sum by (namespace,pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
1626+
"expr": "avg by (namespace) (\n sum by (namespace, pod) (\n (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"})\n *\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_core_fraction{namespace=~\"$namespace\"})\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n ) / 100\n )\n)",
16271627
"hide": false,
16281628
"instant": false,
16291629
"legendFormat": "{{namespace}}",
@@ -1636,7 +1636,7 @@
16361636
"uid": "${ds_prometheus}"
16371637
},
16381638
"editorMode": "code",
1639-
"expr": "avg (\n sum by (pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not use CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) ",
1639+
"expr": "avg (\n sum by (pod) (\n (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"})\n *\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_core_fraction{namespace=~\"$namespace\"})\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n ) / 100\n )\n)",
16401640
"hide": false,
16411641
"instant": false,
16421642
"legendFormat": "Total",
@@ -1746,7 +1746,7 @@
17461746
"uid": "${ds_prometheus}"
17471747
},
17481748
"editorMode": "code",
1749-
"expr": "(\n sum by (namespace) (\n rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])\n ) \n / 1000\n)\n/\n(avg by (namespace) (\n sum by (namespace,pod) (\n (\n (\n d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"} \n * \n d8_virtualization_virtualmachine_cpu_core_fraction\n )\n # Stopped VM do not eats CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats CPU\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n ) / 100\n )\n) / 100)",
1749+
"expr": "(\n sum by (namespace) (\n rate(d8_virtualization_virtualmachine_cpu_usage_seconds_total{namespace=~\"$namespace\"}[$__rate_interval])\n ) / 1000\n)\n/\n(\n avg by (namespace) (\n sum by (namespace, pod) (\n (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_cores{namespace=~\"$namespace\"})\n *\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_cpu_core_fraction{namespace=~\"$namespace\"})\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n ) / 100\n )\n ) / 100\n)",
17501750
"hide": false,
17511751
"instant": false,
17521752
"legendFormat": "{{namespace}}",
@@ -2020,7 +2020,7 @@
20202020
"uid": "${ds_prometheus}"
20212021
},
20222022
"editorMode": "code",
2023-
"expr": "avg by(namespace) (\n sum by(namespace, pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name)\n (\n 1 + (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
2023+
"expr": "avg by(namespace) (\n sum by(namespace, pod) (\n (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"})\n +\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes{namespace=~\"$namespace\"})\n )\n *\n (1 + max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n )\n)",
20242024
"hide": false,
20252025
"instant": false,
20262026
"legendFormat": "__auto",
@@ -2033,7 +2033,7 @@
20332033
"uid": "${ds_prometheus}"
20342034
},
20352035
"editorMode": "code",
2036-
"expr": "avg (\n sum by(pod) (\n (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"}\n +\n d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes\n )\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name)\n (\n 1 + (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n)\n",
2036+
"expr": "avg (\n sum by(pod) (\n (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"})\n +\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_configuration_memory_runtime_overhead_bytes{namespace=~\"$namespace\"})\n )\n *\n (1 + max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n )\n)",
20372037
"hide": false,
20382038
"instant": false,
20392039
"legendFormat": "Total",
@@ -2139,7 +2139,7 @@
21392139
"uid": "${ds_prometheus}"
21402140
},
21412141
"editorMode": "code",
2142-
"expr": "sum by (namespace) (\n d8_virtualization_virtualmachine_os_memory_total_bytes{namespace=~\"$namespace\"} \n - \n d8_virtualization_virtualmachine_os_memory_free_bytes\n)\n/\n(\n avg by (namespace) (\n sum by (pod, namespace) (\n d8_virtualization_virtualmachine_configuration_memory_size_bytes\n # VM during migration eats x2 RAM\n *\n on(namespace, pod, name)\n (\n 1 + (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"})\n )\n # Stopped VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"})\n )\n # Pending VM do not eats RAM\n *\n on(namespace, pod, name)\n (\n 1 - (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"})\n )\n )\n ) / 100\n)",
2142+
"expr": "sum by (namespace) (\n d8_virtualization_virtualmachine_os_memory_total_bytes{namespace=~\"$namespace\"}\n -\n d8_virtualization_virtualmachine_os_memory_free_bytes{namespace=~\"$namespace\"}\n)\n/\n(\n avg by (namespace) (\n sum by (pod, namespace) (\n max by(namespace, pod, name) (d8_virtualization_virtualmachine_configuration_memory_size_bytes{namespace=~\"$namespace\"})\n *\n (1 + max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Migrating\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Stopped\"}))\n *\n (1 - max by(namespace, pod, name) (d8_virtualization_virtualmachine_status_phase{phase=\"Pending\"}))\n )\n ) / 100\n)",
21432143
"hide": false,
21442144
"instant": false,
21452145
"legendFormat": "{{namespace}}",

0 commit comments

Comments
 (0)