Skip to content

Commit 60cb624

Browse files
Merge pull request #20178 from DirectXMan12/deploy/workingset-prom
Don't strip working set in Prometheus
2 parents 5ec3432 + 1d0329e commit 60cb624

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

TODO.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- proxier is now running under the sdn cluster role?

examples/prometheus/prometheus.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ objects:
581581
metric_relabel_configs:
582582
- source_labels: [__name__]
583583
action: drop
584-
regex: 'container_(cpu_user_seconds_total|cpu_cfs_periods_total|memory_usage_bytes|memory_swap|memory_working_set_bytes|memory_cache|last_seen|fs_(read_seconds_total|write_seconds_total|sector_(.*)|io_(.*)|reads_merged_total|writes_merged_total)|tasks_state|memory_failcnt|memory_failures_total|spec_memory_swap_limit_bytes|fs_(.*)_bytes_total|spec_(.*))'
584+
regex: 'container_(cpu_user_seconds_total|cpu_cfs_periods_total|memory_usage_bytes|memory_swap|memory_cache|last_seen|fs_(read_seconds_total|write_seconds_total|sector_(.*)|io_(.*)|reads_merged_total|writes_merged_total)|tasks_state|memory_failcnt|memory_failures_total|spec_memory_swap_limit_bytes|fs_(.*)_bytes_total|spec_(.*))'
585585
586586
relabel_configs:
587587
- action: labelmap

pkg/oc/clusterup/manifests/bindata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/testdata/bindata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)