diff --git a/build/components/versions.yml b/build/components/versions.yml index 75efeebec4..69df6394f3 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -3,7 +3,7 @@ firmware: libvirt: v10.9.0 edk2: stable202411 core: - 3p-kubevirt: v1.3.1-v12n.12 + 3p-kubevirt: v1.3.1-v12n.13 3p-containerized-data-importer: v1.60.3-v12n.10 distribution: 2.8.3 package: diff --git a/monitoring/grafana-dashboards/main/virtual-machine.json b/monitoring/grafana-dashboards/main/virtual-machine.json index 45f84bb56d..2b9f90ea0a 100644 --- a/monitoring/grafana-dashboards/main/virtual-machine.json +++ b/monitoring/grafana-dashboards/main/virtual-machine.json @@ -1284,7 +1284,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "sum(rate(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\", network=\"$network\"}[$__rate_interval])*8)", + "expr": "sum(rate(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])*8)", "instant": false, "legendFormat": "RX", "range": true, @@ -1296,7 +1296,7 @@ "uid": "${ds_prometheus}" }, "editorMode": "code", - "expr": "sum(rate(d8_virtualization_virtualmachine_network_transmit_bytes_total{namespace=\"$namespace\", name=\"$name\", network=\"$network\"}[$__rate_interval])*8)", + "expr": "sum(rate(d8_virtualization_virtualmachine_network_transmit_bytes_total{namespace=\"$namespace\", name=\"$name\"}[$__rate_interval])*8)", "hide": false, "instant": false, "legendFormat": "TX", @@ -4471,8 +4471,8 @@ { "current": { "selected": false, - "text": "default", - "value": "default" + "text": "All", + "value": "$__all" }, "datasource": { "type": "prometheus", @@ -4480,7 +4480,7 @@ }, "definition": "label_values(d8_virtualization_virtualmachine_network_receive_bytes_total{namespace=\"$namespace\", name=\"$name\"},network)", "hide": 2, - "includeAll": false, + "includeAll": true, "multi": false, "name": "network", "options": [], diff --git a/templates/kubevirt/service-monitor.yaml b/templates/kubevirt/service-monitor.yaml index cd9d015e4f..285edfd585 100644 --- a/templates/kubevirt/service-monitor.yaml +++ b/templates/kubevirt/service-monitor.yaml @@ -78,14 +78,6 @@ spec: - __name__ - drive targetLabel: type - # network ---------------------------------------------------------------------------------- - # add network=default for all kubevirt_vmi_network_ metrics - - action: replace - regex: kubevirt_vmi_network_(.*) - replacement: default - sourceLabels: - - __name__ - targetLabel: network # cpu -------------------------------------------------------------------------------------- # for kubevirt_vmi_vcpu_ add new label core with value from id label - action: replace