easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1494 from PhilipGough/revert-1406-dropped-cadvisor-metrics-6

Browse Source
This commit is contained in:
Paweł Krupa
2021-11-24 13:13:18 +01:00
committed by GitHub
parent 9d5c3cece3 6783b6df04
commit 7f94cfff2e
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
View File

@@ -43,7 +43,9 @@
action: 'drop', action: 'drop',
regex: '(' + std.join('|', regex: '(' + std.join('|',
[ [
'container_fs_.*', // add filesystem read/write data (nodes*disks*services*4)
'container_spec_.*', // everything related to cgroup specification and thus static data (nodes*services*5) 'container_spec_.*', // everything related to cgroup specification and thus static data (nodes*services*5)
'container_blkio_device_usage_total', // useful for containers, but not for system services (nodes*disks*services*operations*2)
'container_file_descriptors', // file descriptors limits and global numbers are exposed via (nodes*services) 'container_file_descriptors', // file descriptors limits and global numbers are exposed via (nodes*services)
'container_sockets', // used sockets in cgroup. Usually not important for system services (nodes*services) 'container_sockets', // used sockets in cgroup. Usually not important for system services (nodes*services)
'container_threads_max', // max number of threads in cgroup. Usually for system services it is not limited (nodes*services) 'container_threads_max', // max number of threads in cgroup. Usually for system services it is not limited (nodes*services)
@@ -52,14 +54,6 @@
'container_last_seen', // not needed as system services are always running (nodes*services) 'container_last_seen', // not needed as system services are always running (nodes*services)
]) + ');;', ]) + ');;',
}, },
{
sourceLabels: ['__name__', 'container'],
action: 'drop',
regex: '(' + std.join('|',
[
'container_blkio_device_usage_total',
]) + ');.+',
},
], ],
}, },
], ],

10
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -328,7 +328,9 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
action: 'drop', action: 'drop',
regex: '(' + std.join('|', regex: '(' + std.join('|',
[ [
'container_fs_.*', // add filesystem read/write data (nodes*disks*services*4)
'container_spec_.*', // everything related to cgroup specification and thus static data (nodes*services*5) 'container_spec_.*', // everything related to cgroup specification and thus static data (nodes*services*5)
'container_blkio_device_usage_total', // useful for containers, but not for system services (nodes*disks*services*operations*2)
'container_file_descriptors', // file descriptors limits and global numbers are exposed via (nodes*services) 'container_file_descriptors', // file descriptors limits and global numbers are exposed via (nodes*services)
'container_sockets', // used sockets in cgroup. Usually not important for system services (nodes*services) 'container_sockets', // used sockets in cgroup. Usually not important for system services (nodes*services)
'container_threads_max', // max number of threads in cgroup. Usually for system services it is not limited (nodes*services) 'container_threads_max', // max number of threads in cgroup. Usually for system services it is not limited (nodes*services)
@@ -337,14 +339,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
'container_last_seen', // not needed as system services are always running (nodes*services) 'container_last_seen', // not needed as system services are always running (nodes*services)
]) + ');;', ]) + ');;',
}, },
{
sourceLabels: ['__name__', 'container'],
action: 'drop',
regex: '(' + std.join('|',
[
'container_blkio_device_usage_total',
]) + ');.+',
},
], ],
}, },
{ {

7
manifests/prometheus-serviceMonitorKubelet.yaml
View File

@@ -60,16 +60,11 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
regex: (container_spec_.*|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);; regex: (container_fs_.*|container_spec_.*|container_blkio_device_usage_total|container_file_descriptors|container_sockets|container_threads_max|container_threads|container_start_time_seconds|container_last_seen);;
sourceLabels: sourceLabels:
- __name__ - __name__
- pod - pod
- namespace - namespace
- action: drop
regex: (container_blkio_device_usage_total);.+
sourceLabels:
- __name__
- container
path: /metrics/cadvisor path: /metrics/cadvisor
port: https-metrics port: https-metrics
relabelings: relabelings: