From 4245ded81bb4eb62dc707caebf0f7d2e157bdfdc Mon Sep 17 00:00:00 2001 From: paulfantom Date: Sat, 6 Feb 2021 19:58:45 +0100 Subject: [PATCH 1/2] jsonnet: bump node-exporter to 1.1.0 and remove deprecated flag --- jsonnet/kube-prometheus/components/node-exporter.libsonnet | 3 +-- jsonnet/kube-prometheus/main.libsonnet | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/components/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet index 73704a8c..10b89dc9 100644 --- a/jsonnet/kube-prometheus/components/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet @@ -173,8 +173,7 @@ function(params) { '--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-blacklist=^(veth.*)$', - // '--collector.netdev.device-exclude=^(veth.*)$', // TODO(paulfantom): change with next version of node_exporter (post 1.0.1) + '--collector.netdev.device-exclude=^(veth.*)$', ], volumeMounts: [ { name: 'sys', mountPath: '/host/sys', mountPropagation: 'HostToContainer', readOnly: true }, diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index c8930ebc..bd2a60b3 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -23,7 +23,7 @@ local prometheus = import './components/prometheus.libsonnet'; blackboxExporter: '0.18.0', grafana: '7.3.7', kubeStateMetrics: '1.9.7', - nodeExporter: '1.0.1', + nodeExporter: '1.1.0', prometheus: '2.24.0', prometheusAdapter: '0.8.3', prometheusOperator: '0.45.0', From fc1a03053de09284e9377416a7d4f3d46b7b37bb Mon Sep 17 00:00:00 2001 From: paulfantom Date: Sat, 6 Feb 2021 19:58:55 +0100 Subject: [PATCH 2/2] manifests: regenerate --- manifests/node-exporter-clusterRole.yaml | 2 +- manifests/node-exporter-clusterRoleBinding.yaml | 2 +- manifests/node-exporter-daemonset.yaml | 8 ++++---- manifests/node-exporter-prometheusRule.yaml | 2 +- manifests/node-exporter-service.yaml | 2 +- manifests/node-exporter-serviceAccount.yaml | 2 +- manifests/node-exporter-serviceMonitor.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/node-exporter-clusterRole.yaml b/manifests/node-exporter-clusterRole.yaml index 45383007..f974d3b5 100644 --- a/manifests/node-exporter-clusterRole.yaml +++ b/manifests/node-exporter-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter rules: - apiGroups: diff --git a/manifests/node-exporter-clusterRoleBinding.yaml b/manifests/node-exporter-clusterRoleBinding.yaml index 8887d631..1ed4f3c7 100644 --- a/manifests/node-exporter-clusterRoleBinding.yaml +++ b/manifests/node-exporter-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 8c556fca..d8ef09ab 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter namespace: monitoring spec: @@ -20,7 +20,7 @@ spec: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 spec: containers: - args: @@ -31,8 +31,8 @@ spec: - --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-blacklist=^(veth.*)$ - image: quay.io/prometheus/node-exporter:v1.0.1 + - --collector.netdev.device-exclude=^(veth.*)$ + image: quay.io/prometheus/node-exporter:v1.1.0 name: node-exporter resources: limits: diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml index eee95a1a..1967f788 100644 --- a/manifests/node-exporter-prometheusRule.yaml +++ b/manifests/node-exporter-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 prometheus: k8s role: alert-rules name: node-exporter-rules diff --git a/manifests/node-exporter-service.yaml b/manifests/node-exporter-service.yaml index e0cfb53a..528d6208 100644 --- a/manifests/node-exporter-service.yaml +++ b/manifests/node-exporter-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter namespace: monitoring spec: diff --git a/manifests/node-exporter-serviceAccount.yaml b/manifests/node-exporter-serviceAccount.yaml index 1be5af3c..6613b4ee 100644 --- a/manifests/node-exporter-serviceAccount.yaml +++ b/manifests/node-exporter-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter namespace: monitoring diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml index 7b0835c8..3fdcf4ef 100644 --- a/manifests/node-exporter-serviceMonitor.yaml +++ b/manifests/node-exporter-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: node-exporter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.0.1 + app.kubernetes.io/version: 1.1.0 name: node-exporter namespace: monitoring spec: