openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "cadvisor: Set housekeeping interval to Prometheus scrape interval"

This commit is contained in:
Zuul 2024-01-06 08:53:43 +00:00 committed by Gerrit Code Review
parent b1fd2b40f7 97e5c0e9b1
commit 205fd639b8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/prometheus/defaults/main.yml
View File

@ -354,7 +354,7 @@ prometheus_server_command: >-
--storage.tsdb.path /var/lib/prometheus{% if prometheus_cmdline_extras %} {{ prometheus_cmdline_extras }}{% endif %}
prometheus_blackbox_exporter_cmdline_extras: ""
prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process"
prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process --housekeeping_interval={{ prometheus_scrape_interval }}"
prometheus_elasticsearch_exporter_cmdline_extras: ""
prometheus_haproxy_exporter_cmdline_extras: ""
prometheus_memcached_exporter_cmdline_extras: ""

7
releasenotes/notes/bug-2048223-bb66fa11c6b36c5e.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes an issue with high CPU usage of the cAdvisor container by setting the
per-container housekeeping interval to the same value as the Prometheus
scrape interval. `LP#2048223
<https://bugs.launchpad.net/kolla-ansible/+bug/2048223>`__