From 9d4f01191b42e5e22b66f50d2f8231dae7747087 Mon Sep 17 00:00:00 2001
From: Ed Robinson <edward-robinson@cookpad.com>
Date: Wed, 13 May 2020 15:14:50 +0100
Subject: [PATCH] Update node exporter in line with documentation (#107)

* node-exporter: stop generating config with helm

* node-exporter: update config in line with prom docs

* https://github.com/prometheus/node_exporter/tree/v0.18.1#using-docker

Fixes #106
---
 hack/generate_addons.sh                       |  1 -
 .../addons/helm/prometheus-node-exporter.yaml |  7 -----
 .../addons/prometheus-node-exporter.yaml      | 30 ++++++-------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 modules/cluster/addons/helm/prometheus-node-exporter.yaml

diff --git a/hack/generate_addons.sh b/hack/generate_addons.sh
index 9defac22..32da36d2 100755
--- a/hack/generate_addons.sh
+++ b/hack/generate_addons.sh
@@ -16,4 +16,3 @@ helm_template() {
 helm_template eks aws-node-termination-handler 0.7.3
 helm_template stable cluster-autoscaler 7.2.0
 helm_template stable metrics-server 2.10.1
-helm_template stable prometheus-node-exporter 1.9.1
diff --git a/modules/cluster/addons/helm/prometheus-node-exporter.yaml b/modules/cluster/addons/helm/prometheus-node-exporter.yaml
deleted file mode 100644
index fd913db7..00000000
--- a/modules/cluster/addons/helm/prometheus-node-exporter.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-image:
-  repository: prom/node-exporter
-resources:
-  limits:
-    memory: "64Mi"
-  requests:
-    cpu: "32m"
diff --git a/modules/cluster/addons/prometheus-node-exporter.yaml b/modules/cluster/addons/prometheus-node-exporter.yaml
index 08c09b62..1770d743 100644
--- a/modules/cluster/addons/prometheus-node-exporter.yaml
+++ b/modules/cluster/addons/prometheus-node-exporter.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:     
     app: prometheus-node-exporter
     release: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
 spec:
   privileged: false
   # Required to prevent escalations to root.
@@ -60,7 +59,6 @@ metadata:
   namespace: kube-system
   labels:
     app: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
     release: "prometheus-node-exporter"
 imagePullSecrets:
   []
@@ -73,7 +71,6 @@ metadata:
   labels:     
     app: prometheus-node-exporter
     release: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
 rules:
 - apiGroups: ['extensions']
   resources: ['podsecuritypolicies']
@@ -89,7 +86,6 @@ metadata:
   labels:     
     app: prometheus-node-exporter
     release: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -110,7 +106,6 @@ metadata:
   labels:     
     app: prometheus-node-exporter
     release: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
 spec:
   type: ClusterIP
   ports:
@@ -131,7 +126,6 @@ metadata:
   labels:     
     app: prometheus-node-exporter
     release: prometheus-node-exporter
-    chart: prometheus-node-exporter-1.9.1
 spec:
   selector:
     matchLabels:
@@ -146,7 +140,6 @@ spec:
       labels:         
         app: prometheus-node-exporter
         release: prometheus-node-exporter
-        chart: prometheus-node-exporter-1.9.1
     spec:
       serviceAccountName: prometheus-node-exporter
       securityContext:
@@ -157,8 +150,8 @@ spec:
           image: "prom/node-exporter:v0.18.1"
           imagePullPolicy: IfNotPresent
           args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
+            - --collector.filesystem.ignored-mount-points=^/(dev|var/lib/docker|proc|sys|var/lib/kubelet)($|/)
+            - --path.rootfs=/host
             - --web.listen-address=$(HOST_IP):9100
           env:
           - name: HOST_IP
@@ -170,32 +163,27 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 9100
+              port: metrics
           readinessProbe:
             httpGet:
               path: /
-              port: 9100
+              port: metrics
           resources:
             limits:
               memory: 64Mi
             requests:
               cpu: 32m
           volumeMounts:
-            - name: proc
-              mountPath: /host/proc
+            - name: host
+              mountPath: /host
               readOnly:  true
-            - name: sys
-              mountPath: /host/sys
-              readOnly: true
+              mountPropagation: HostToContainer
       hostNetwork: true
       hostPID: true
       tolerations:
         - effect: NoSchedule
           operator: Exists
       volumes:
-        - name: proc
+        - name: host
           hostPath:
-            path: /proc
-        - name: sys
-          hostPath:
-            path: /sys
+            path: /