Skip to content

Commit bc97a6d

Browse files
fix(opentelemetry-collector): use valid regexp syntax in hostmetrics mount point excludes
The exclude_mount_points patterns used glob syntax (e.g. /dev/*) with match_type: regexp. While this worked accidentally due to substring matching in MatchString, the patterns are not valid regexps. Fix by anchoring with ^ and using .* instead of *, so patterns are both correct and explicit about intent. Fixes #2216.
1 parent a14ba61 commit bc97a6d

11 files changed

Lines changed: 3227 additions & 3227 deletions

File tree

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ data:
6363
exclude_mount_points:
6464
match_type: regexp
6565
mount_points:
66-
- /dev/*
67-
- /proc/*
68-
- /sys/*
69-
- /run/k3s/containerd/*
70-
- /var/lib/docker/*
71-
- /var/lib/kubelet/*
72-
- /snap/*
66+
- ^/dev/
67+
- ^/proc/
68+
- ^/sys/
69+
- ^/run/k3s/containerd/
70+
- ^/var/lib/docker/
71+
- ^/var/lib/kubelet/
72+
- ^/snap/
7373
load: null
7474
memory: null
7575
network: null

charts/opentelemetry-collector/templates/_config.tpl

Lines changed: 504 additions & 504 deletions
Large diffs are not rendered by default.

charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/opentelemetry-collector/configmap-agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ data:
164164
exclude_mount_points:
165165
match_type: regexp
166166
mount_points:
167-
- /dev/*
168-
- /proc/*
169-
- /sys/*
170-
- /run/k3s/containerd/*
171-
- /var/lib/docker/*
172-
- /var/lib/kubelet/*
173-
- /snap/*
167+
- ^/dev/
168+
- ^/proc/
169+
- ^/sys/
170+
- ^/run/k3s/containerd/
171+
- ^/var/lib/docker/
172+
- ^/var/lib/kubelet/
173+
- ^/snap/
174174
load: null
175175
memory: null
176176
network: null

charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap-agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ data:
169169
exclude_mount_points:
170170
match_type: regexp
171171
mount_points:
172-
- /dev/*
173-
- /proc/*
174-
- /sys/*
175-
- /run/k3s/containerd/*
176-
- /var/lib/docker/*
177-
- /var/lib/kubelet/*
178-
- /snap/*
172+
- ^/dev/
173+
- ^/proc/
174+
- ^/sys/
175+
- ^/run/k3s/containerd/
176+
- ^/var/lib/docker/
177+
- ^/var/lib/kubelet/
178+
- ^/snap/
179179
load: null
180180
memory: null
181181
network: null

charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap-agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ data:
160160
exclude_mount_points:
161161
match_type: regexp
162162
mount_points:
163-
- /dev/*
164-
- /proc/*
165-
- /sys/*
166-
- /run/k3s/containerd/*
167-
- /var/lib/docker/*
168-
- /var/lib/kubelet/*
169-
- /snap/*
163+
- ^/dev/
164+
- ^/proc/
165+
- ^/sys/
166+
- ^/run/k3s/containerd/
167+
- ^/var/lib/docker/
168+
- ^/var/lib/kubelet/
169+
- ^/snap/
170170
load: null
171171
memory: null
172172
network: null

charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap-agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ data:
160160
exclude_mount_points:
161161
match_type: regexp
162162
mount_points:
163-
- /dev/*
164-
- /proc/*
165-
- /sys/*
166-
- /run/k3s/containerd/*
167-
- /var/lib/docker/*
168-
- /var/lib/kubelet/*
169-
- /snap/*
163+
- ^/dev/
164+
- ^/proc/
165+
- ^/sys/
166+
- ^/run/k3s/containerd/
167+
- ^/var/lib/docker/
168+
- ^/var/lib/kubelet/
169+
- ^/snap/
170170
load: null
171171
memory: null
172172
network: null

0 commit comments

Comments
 (0)