openstack/kolla-ansible
Code Issues Proposed changes

Merge "Follow up fixes for Monasca docs and formatting"

Browse Source
This commit is contained in:
Zuul 2021-03-24 19:03:42 +00:00 committed by Gerrit Code Review
commit 8e9da5fa2d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/tasks/config.yml
View File

@ -106,7 +106,7 @@
log_direct_to_elasticsearch: >- log_direct_to_elasticsearch: >-
{{ ( enable_elasticsearch | bool or {{ ( enable_elasticsearch | bool or
( elasticsearch_address != kolla_internal_vip_address )) and ( 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') }}" fluentd_version: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_version | default('0.12') }}"
# Inputs # Inputs
fluentd_input_files: "{{ default_input_files | customise_fluentd(customised_input_files) }}" fluentd_input_files: "{{ default_input_files | customise_fluentd(customised_input_files) }}"

16
doc/source/reference/logging-and-monitoring/monasca-guide.rst
View File

@ -356,18 +356,20 @@ Cleanup
~~~~~~~ ~~~~~~~
From time-to-time it may be necessary to manually invoke the Monasca 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 command. Normally this will be triggered automatically during an upgrade for
release notes. It may also be necessary to run the cleanup command when services which are removed or disabled by default. However, volume cleanup
disabling certain parts of the Monasca pipeline. A full list of scenarios in will always need to be addressed manually. It may also be necessary to run the
which you must run the cleanup command is given below: 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 - 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 - Upgrading from Victoria to Wallaby to remove the Monasca Log Metrics
service, unless the option to disable it by default has been overridden in 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 - 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 - If you have disabled the alerting pipeline via the
`monasca_enable_alerting_pipeline` flag after you have deployed the alerting `monasca_enable_alerting_pipeline` flag after you have deployed the alerting
services. services.