From 640dbb03fab6ed3d54e73e438d546adc14e747b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Sun, 20 Jun 2021 13:58:32 +0000 Subject: [PATCH] Revert "Reduce container metrics cardinality" This reverts commit c6259158e3eff4aff9770b7044b0179a7de533aa. Reason for revert: cAdvisor fails with: invalid value "percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process" for flag -disable_metrics: unsupported metric "referenced_memory" specified in disable_metrics Change-Id: I1a0eea5c20f95f38c707401b56b7d2454484377d --- ansible/roles/prometheus/defaults/main.yml | 2 -- .../templates/prometheus-cadvisor.json.j2 | 2 +- etc/kolla/globals.yml | 4 ---- ...cadvisor-cardinality-1213854b9fe0c828.yaml | 19 ------------------- 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 releasenotes/notes/reduce-cadvisor-cardinality-1213854b9fe0c828.yaml diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index a27646a85e..b1c1174609 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -257,5 +257,3 @@ prometheus_openstack_exporter_disabled_dns: "{{ '--disable-service.dns' if not e prometheus_openstack_exporter_disabled_object: "{{ '--disable-service.object-store' if not enable_swift | bool else '' }}" prometheus_openstack_exporter_disabled_lb: "{{ '--disable-service.load-balancer --disable-metric=neutron-loadbalancers --disable-metric=neutron-loadbalancers_not_active' if not enable_octavia | bool else '' }}" 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_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" diff --git a/ansible/roles/prometheus/templates/prometheus-cadvisor.json.j2 b/ansible/roles/prometheus/templates/prometheus-cadvisor.json.j2 index 47240535d7..58070b943a 100644 --- a/ansible/roles/prometheus/templates/prometheus-cadvisor.json.j2 +++ b/ansible/roles/prometheus/templates/prometheus-cadvisor.json.j2 @@ -1,5 +1,5 @@ { - "command": "/opt/cadvisor --port={{ prometheus_cadvisor_port }} --log_dir=/var/log/kolla/prometheus {{ prometheus_cadvisor_cmdline_extras }}", + "command": "/opt/cadvisor --port={{ prometheus_cadvisor_port }} --log_dir=/var/log/kolla/prometheus", "config_files": [], "permissions": [ { diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 4194c6f490..00abf88819 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -696,10 +696,6 @@ # List of extra parameters passed to prometheus. You can add as many to the list. #prometheus_cmdline_extras: -# List of extra parameters passed to cAdvisor. By default system cgroups -# and container labels are not exposed to reduce time series cardinality. -#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" - # Example of setting endpoints for prometheus ceph mgr exporter. # You should add all ceph mgr's in your external ceph deployment. #prometheus_ceph_mgr_exporter_endpoints: diff --git a/releasenotes/notes/reduce-cadvisor-cardinality-1213854b9fe0c828.yaml b/releasenotes/notes/reduce-cadvisor-cardinality-1213854b9fe0c828.yaml deleted file mode 100644 index a76a33a741..0000000000 --- a/releasenotes/notes/reduce-cadvisor-cardinality-1213854b9fe0c828.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -features: - - | - Adds support for passing extra runtime options to cAdvisor via - ``prometheus_cadvisor_cmdline_extras`` new variable. By default - system cgroups' metrics are disabled, plus container labels - don't get exposed to Prometheus. Expensive metrics that usually - should not be exported are also enforced to be disabled - consult - ``_ - for a list. These defaults create savings in resources usage by both - cAdvisor and Prometheus. -upgrade: - - | - cAdvisor has now reduced number of Prometheus metrics and labels - exported by default. This means that corresponding timeseries will - no longer be created. If existing setup relies on these, eg. for - visualisation or alerting, they could be explicitly enabled prior to - upgrading with the ``prometheus_cadvisor_cmdline_extras`` new variable. - Reference for the possible options: ``_.