Skip to content
Snippets Groups Projects
Unverified Commit 6783b6df authored by Philip Gough's avatar Philip Gough Committed by GitHub
Browse files

Revert "Adjust dropped metrics from cAdvisor"

parent 9d5c3cec
Branches
No related tags found
No related merge requests found
...@@ -43,7 +43,9 @@ ...@@ -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 @@ ...@@ -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',
]) + ');.+',
},
], ],
}, },
], ],
......
...@@ -328,7 +328,9 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; ...@@ -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'; ...@@ -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',
]) + ');.+',
},
], ],
}, },
{ {
......
...@@ -60,16 +60,11 @@ spec: ...@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment