Merge "reno: follow up"

This commit is contained in:
Zuul 2021-09-03 08:34:31 +00:00 committed by Gerrit Code Review
commit b16e676be7
2 changed files with 2 additions and 2 deletions

@ -13,7 +13,7 @@ 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
no longer be created. If existing setup relies on these, e.g. 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: `<https://github.com/google/cadvisor/blob/master/docs/runtime_options.md#metrics>`_.

@ -2,6 +2,6 @@
upgrade:
- |
Removes support for Prometheus v1 deployment. Any previously deployed
Prometheus v1 instances will create a conflict during an upgrade thus
Prometheus v1 instances will create a conflict during an upgrade. They
should be either manually stopped/removed or Prometheus v2 deployment
should be disabled by setting ``enable_prometheus`` to ``no``.