From 0f4a696f53708d73fa9710cd1efec20218435f20 Mon Sep 17 00:00:00 2001
From: Steven Fitzpatrick <steven.fitzpatrick@att.com>
Date: Tue, 2 Jun 2020 00:50:27 -0500
Subject: [PATCH] Node Exporter: Allow Ignored Mountpoints

This change adds the ability to configure the

--collector.filesystem.ignored-mount-points

parameter, which is useful in events where a subdirectory
cannot be statfs'd by a non-root user.

Change-Id: Ie2be8c496aa676e9a3fee5434e0c194615f9cdab
See: https://github.com/prometheus/node_exporter/issues/703
---
 .../templates/bin/_node-exporter.sh.tpl                  | 9 ++++++++-
 prometheus-node-exporter/values.yaml                     | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/prometheus-node-exporter/templates/bin/_node-exporter.sh.tpl b/prometheus-node-exporter/templates/bin/_node-exporter.sh.tpl
index e07580b6..2827d5a4 100644
--- a/prometheus-node-exporter/templates/bin/_node-exporter.sh.tpl
+++ b/prometheus-node-exporter/templates/bin/_node-exporter.sh.tpl
@@ -16,9 +16,16 @@ limitations under the License.
 set -ex
 
 exec /bin/node_exporter \
+  {{- if .Values.conf.collectors.enable }}
   {{ tuple "--collector." .Values.conf.collectors.enable | include "helm-toolkit.utils.joinListWithPrefix" }} \
+  {{- end }}
+  {{- if  .Values.conf.collectors.disable }}
   {{ tuple "--no-collector." .Values.conf.collectors.disable | include "helm-toolkit.utils.joinListWithPrefix" }} \
-  {{ if .Values.conf.collectors.textfile.directory }} \
+  {{- end }}
+  {{- if .Values.conf.collectors.textfile.directory }}
   --collector.textfile.directory={{.Values.conf.collectors.textfile.directory }} \
   {{- end }}
+  {{- if .Values.conf.collectors.filesystem.ignored_mount_points }}
+  --collector.filesystem.ignored-mount-points={{ .Values.conf.collectors.filesystem.ignored_mount_points }} \
+  {{- end }}
   --collector.ntp.server={{ .Values.conf.ntp_server_ip }}
diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml
index c68df35f..dfeeb0f9 100644
--- a/prometheus-node-exporter/values.yaml
+++ b/prometheus-node-exporter/values.yaml
@@ -158,4 +158,6 @@ conf:
     disable:
     textfile:
       directory: /var/log/node-exporter-vfstats
+    filesystem:
+      ignored_mount_points:
 ...