From 92f252af4b14a35f81e5e9b010ea18fdc19b7317 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Tue, 2 Mar 2021 13:49:52 +0000 Subject: [PATCH] Follow up fixes for Monasca docs and formatting Change-Id: Ief84e093829677c97c8df9a08aefca43b1e51aac --- ansible/roles/common/tasks/config.yml | 2 +- .../logging-and-monitoring/monasca-guide.rst | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index c429ad0d00..fb699f819c 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -106,7 +106,7 @@ log_direct_to_elasticsearch: >- {{ ( enable_elasticsearch | bool or ( elasticsearch_address != kolla_internal_vip_address )) and - ( not enable_monasca | bool or not monasca_ingest_control_plane_logs | bool ) }} + ( not enable_monasca | bool or not monasca_ingest_control_plane_logs | bool ) }} fluentd_version: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_version | default('0.12') }}" # Inputs fluentd_input_files: "{{ default_input_files | customise_fluentd(customised_input_files) }}" diff --git a/doc/source/reference/logging-and-monitoring/monasca-guide.rst b/doc/source/reference/logging-and-monitoring/monasca-guide.rst index ecf8d035e9..1f5436ed64 100644 --- a/doc/source/reference/logging-and-monitoring/monasca-guide.rst +++ b/doc/source/reference/logging-and-monitoring/monasca-guide.rst @@ -356,18 +356,20 @@ Cleanup ~~~~~~~ From time-to-time it may be necessary to manually invoke the Monasca cleanup -command. If this is required during an upgrade it will be mentioned in the -release notes. It may also be necessary to run the cleanup command when -disabling certain parts of the Monasca pipeline. A full list of scenarios in -which you must run the cleanup command is given below: +command. Normally this will be triggered automatically during an upgrade for +services which are removed or disabled by default. However, volume cleanup +will always need to be addressed manually. It may also be necessary to run the +cleanup command when disabling certain parts of the Monasca pipeline. A full +list of scenarios in which you must run the cleanup command is given below. +Those marked as automatic will be triggered as part of an upgrade. - Upgrading from Victoria to Wallaby to remove the unused Monasca Log - Transformer service + Transformer service (automatic). - Upgrading from Victoria to Wallaby to remove the Monasca Log Metrics service, unless the option to disable it by default has been overridden in - Wallaby. + Wallaby (automatic). - Upgrading from Wallaby to Xena to remove the Monasca Log Metrics service - if the option to disable it by default was overridden in Wallaby. + if the option to disable it by default was overridden in Wallaby (automatic). - If you have disabled the alerting pipeline via the `monasca_enable_alerting_pipeline` flag after you have deployed the alerting services.