diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index cf55c02a6c87fa66909d6a87f803e1f128ea4f5f..0d959c5344c20418b3fad4e437b58c84bb2f7f97 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -101,11 +101,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; '--path.rootfs=/host/root', '--no-collector.wifi', '--no-collector.hwmon', - // The following settings have been taken from - // https://github.com/prometheus/node_exporter/blob/0662673/collector/filesystem_linux.go#L30-L31 - // Once node exporter is being released with those settings, this can be removed. - '--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)', - '--collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$', + '--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)', ]) + container.withVolumeMounts([procVolumeMount, sysVolumeMount, rootVolumeMount]) + container.mixin.resources.withRequests($._config.resources['node-exporter'].requests) + diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 1ed3478ed635e7860a2a38935653f54ec75c16c7..ce2af06e1a12b78031cc841c6af327d2c7b9e202 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -24,8 +24,7 @@ spec: - --path.rootfs=/host/root - --no-collector.wifi - --no-collector.hwmon - - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/) - - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$ + - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/) image: quay.io/prometheus/node-exporter:v0.18.1 name: node-exporter resources: