Merge "cadvisor: Set housekeeping interval to Prometheus scrape interval" into stable/2023.1

Author: Zuul

ansible/roles/prometheus/defaults/main.yml

@@ -318,7 +318,7 @@ prometheus_openstack_exporter_disabled_lb: "{{ '--disable-service.load-balancer
 prometheus_openstack_exporter_disabled_items: "{{ [prometheus_openstack_exporter_disabled_volume, prometheus_openstack_exporter_disabled_dns, prometheus_openstack_exporter_disabled_object, prometheus_openstack_exporter_disabled_lb | trim] | join(' ') | trim }}"
 
 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: ""

releasenotes/notes/bug-2048223-bb66fa11c6b36c5e.yaml

@@ -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>`__