jsonnet: kube-prometheus adapt to changes to veth interfaces names

With OVN, the container veth network interface names that used to start
with `veth` has now changed to `<rand-hex>{15}@if<number>`(see Related
Links below).

This patch adapts to the new change introduced in ovn and ignores the network
interfaces that match `[a-z0-9]{15}@if\d+` in addition to those starting
with `veth`

Related Links:
  - https://github.com/openshift/ovn-kubernetes/blob/master/go-controller/vendor/github.com/containernetworking/plugins/pkg/ip/link_linux.go#L107
  - https://github.com/openshift/ovn-kubernetes/blob/master/go-controller/pkg/cni/helper_linux.go#L148

Signed-off-by: Sunil Thaha <sthaha@redhat.com>
This commit is contained in:
Sunil Thaha
2021-06-24 16:52:29 +10:00
parent f9fd5bd499
commit 0280f4ddf9
2 changed files with 7 additions and 4 deletions

View File

@@ -30,8 +30,8 @@ spec:
- --no-collector.wifi
- --no-collector.hwmon
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
- --collector.netclass.ignored-devices=^(veth.*)$
- --collector.netdev.device-exclude=^(veth.*)$
- --collector.netclass.ignored-devices=^(veth.*|[a-z0-9]+@if\d+)$
- --collector.netdev.device-exclude=^(veth.*|[a-z0-9]+@if\d+)$
image: quay.io/prometheus/node-exporter:v1.1.2
name: node-exporter
resources: