From 44f3c610103b0c4cff51fc42018279d66c22dad2 Mon Sep 17 00:00:00 2001 From: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> Date: Wed, 15 Jan 2020 12:03:04 +0200 Subject: [PATCH 1/3] remove some unused collectors Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> --- .../node-exporter/node-exporter.libsonnet | 14 +++++++++++++- manifests/node-exporter-daemonset.yaml | 13 +++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index d7e9fb3b..6a6d50fe 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -89,7 +89,19 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; '--path.procfs=/host/proc', '--path.sysfs=/host/sys', '--path.rootfs=/host/root', - + '--no-collector.wifi', + '--no-collector.hwmon', + '--no-collector.netstat', + '--no-collector.sockstat', + '--no-collector.entropy', + '--no-collector.filefd', + '--no-collector.time', + '--no-collector.conntrack', + '--no-collector.bcache', + '--no-collector.stat', + '--no-collector.xfs', + '--no-collector.pressure', + '--no-collector.arp', // 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. diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 9f585fa7..43781c5d 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -20,6 +20,19 @@ spec: - --path.procfs=/host/proc - --path.sysfs=/host/sys - --path.rootfs=/host/root + - --no-collector.wifi + - --no-collector.hwmon + - --no-collector.netstat + - --no-collector.sockstat + - --no-collector.entropy + - --no-collector.filefd + - --no-collector.time + - --no-collector.conntrack + - --no-collector.bcache + - --no-collector.stat + - --no-collector.xfs + - --no-collector.pressure + - --no-collector.arp - --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)$ image: quay.io/prometheus/node-exporter:v0.18.1 From 48d95f0b9fc9f0ed57dbd622b1a3c3173769f69c Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Thu, 23 Jan 2020 13:00:13 +0100 Subject: [PATCH 2/3] *: Throw away unused high cardinality apiserver duration buckets --- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 5 +++++ manifests/prometheus-serviceMonitorApiserver.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 0cd727dd..bd76f608 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -420,6 +420,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; regex: 'apiserver_admission_step_admission_latencies_seconds_.*', action: 'drop', }, + { + sourceLabels: ['__name__', 'le'], + regex: 'apiserver_request_duration_seconds_bucket;(0.15|0.25|0.3|0.35|0.4|0.45|0.6|0.7|0.8|0.9|1.25|1.5|1.75|2.5|3|3.5|4.5|6|7|8|9|15|25|30|50)', + action: 'drop', + }, ], }, ], diff --git a/manifests/prometheus-serviceMonitorApiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml index 8f481da4..500c0d3e 100644 --- a/manifests/prometheus-serviceMonitorApiserver.yaml +++ b/manifests/prometheus-serviceMonitorApiserver.yaml @@ -54,6 +54,11 @@ spec: regex: apiserver_admission_step_admission_latencies_seconds_.* sourceLabels: - __name__ + - action: drop + regex: apiserver_request_duration_seconds_bucket;(0.15|0.25|0.3|0.35|0.4|0.45|0.6|0.7|0.8|0.9|1.25|1.5|1.75|2.5|3|3.5|4.5|6|7|8|9|15|25|30|50) + sourceLabels: + - __name__ + - le port: https scheme: https tlsConfig: From 8984606f5de4708fc6fbde502b75190583e12620 Mon Sep 17 00:00:00 2001 From: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> Date: Thu, 23 Jan 2020 15:17:56 +0200 Subject: [PATCH 3/3] re-added most collectors Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> --- .../node-exporter/node-exporter.libsonnet | 11 ----------- manifests/node-exporter-daemonset.yaml | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 6a6d50fe..1f108e04 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -91,17 +91,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; '--path.rootfs=/host/root', '--no-collector.wifi', '--no-collector.hwmon', - '--no-collector.netstat', - '--no-collector.sockstat', - '--no-collector.entropy', - '--no-collector.filefd', - '--no-collector.time', - '--no-collector.conntrack', - '--no-collector.bcache', - '--no-collector.stat', - '--no-collector.xfs', - '--no-collector.pressure', - '--no-collector.arp', // 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. diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 43781c5d..7a65619a 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -22,17 +22,6 @@ spec: - --path.rootfs=/host/root - --no-collector.wifi - --no-collector.hwmon - - --no-collector.netstat - - --no-collector.sockstat - - --no-collector.entropy - - --no-collector.filefd - - --no-collector.time - - --no-collector.conntrack - - --no-collector.bcache - - --no-collector.stat - - --no-collector.xfs - - --no-collector.pressure - - --no-collector.arp - --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)$ image: quay.io/prometheus/node-exporter:v0.18.1