Skip to content

Commit b5090e2

Browse files
committed
chore(module): add network label with network name
- Remove replace to always set network label with "default" value - Add kubevirt patch to set network name from annotation. - Sum all networks on "Network bandwidth usage" graph Signed-off-by: Ivan Mikheykin <[email protected]>
1 parent 8cc5a1d commit b5090e2

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

build/components/versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ firmware:
33
libvirt: v10.9.0
44
edk2: stable202411
55
core:
6-
3p-kubevirt: v1.3.1-v12n.12
6+
3p-kubevirt: v1.3.1-v12n.13
77
3p-containerized-data-importer: v1.60.3-v12n.10
88
distribution: 2.8.3
99
package:

monitoring/grafana-dashboards/main/virtual-machine.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@
12841284
"uid": "${ds_prometheus}"
12851285
},
12861286
"editorMode": "code",
1287-
"expr": "sum(rate(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\", network=\"$network\"}[$__rate_interval])*8)",
1287+
"expr": "sum(rate(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])*8)",
12881288
"instant": false,
12891289
"legendFormat": "RX",
12901290
"range": true,
@@ -1296,7 +1296,7 @@
12961296
"uid": "${ds_prometheus}"
12971297
},
12981298
"editorMode": "code",
1299-
"expr": "sum(rate(d8_virtualization_virtualmachine_network_transmit_bytes_total{namespace=\"$namespace\", name=\"$name\", network=\"$network\"}[$__rate_interval])*8)",
1299+
"expr": "sum(rate(d8_virtualization_virtualmachine_network_transmit_bytes_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])*8)",
13001300
"hide": false,
13011301
"instant": false,
13021302
"legendFormat": "TX",
@@ -4471,16 +4471,16 @@
44714471
{
44724472
"current": {
44734473
"selected": false,
4474-
"text": "default",
4475-
"value": "default"
4474+
"text": "All",
4475+
"value": "$__all"
44764476
},
44774477
"datasource": {
44784478
"type": "prometheus",
44794479
"uid": "${ds_prometheus}"
44804480
},
44814481
"definition": "label_values(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\"},network)",
44824482
"hide": 2,
4483-
"includeAll": false,
4483+
"includeAll": true,
44844484
"multi": false,
44854485
"name": "network",
44864486
"options": [],

templates/kubevirt/service-monitor.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ spec:
7878
- __name__
7979
- drive
8080
targetLabel: type
81-
# network ----------------------------------------------------------------------------------
82-
# add network=default for all kubevirt_vmi_network_ metrics
83-
- action: replace
84-
regex: kubevirt_vmi_network_(.*)
85-
replacement: default
86-
sourceLabels:
87-
- __name__
88-
targetLabel: network
8981
# cpu --------------------------------------------------------------------------------------
9082
# for kubevirt_vmi_vcpu_ add new label core with value from id label
9183
- action: replace

0 commit comments

Comments
 (0)