From bccfbca60504eddd0b41c6842d5e4c5e3d263a1f Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 30 Aug 2021 15:06:51 +0100 Subject: [ansible][logparser] Enable logparser by default in one-click install Signed-off-by: "Emma Foley " Change-Id: I6dd8e166433feab16dd06c9767e58d6d96ca948d --- .../ansible/roles/config_files/tasks/logparser.yml | 5 +- .../templates/experimental/logparser.conf.j2 | 75 ---------------------- .../roles/config_files/templates/logparser.conf.j2 | 75 ++++++++++++++++++++++ .../update_logparser_config-0db3d2746e6ad582.yaml | 6 ++ docs/release/userguide/installguide.oneclick.rst | 11 ++-- 5 files changed, 89 insertions(+), 83 deletions(-) delete mode 100644 docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 create mode 100644 docker/ansible/roles/config_files/templates/logparser.conf.j2 create mode 100644 docs/release/release-notes/notes/update_logparser_config-0db3d2746e6ad582.yaml diff --git a/docker/ansible/roles/config_files/tasks/logparser.yml b/docker/ansible/roles/config_files/tasks/logparser.yml index 615d2e2b..72adcea2 100644 --- a/docker/ansible/roles/config_files/tasks/logparser.yml +++ b/docker/ansible/roles/config_files/tasks/logparser.yml @@ -1,4 +1,4 @@ -#Copyright 2019 OPNFV and Intel Corporation +# Copyright 2019-21 Anuket, Intel Corporation, and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,9 +15,8 @@ - name: enable logparser plugin template: - src: experimental/logparser.conf.j2 + src: logparser.conf.j2 dest: "{{ config_file_dir }}/logparser.conf" - when: flavor|default('stable')|string == 'experimental' tags: - logparser diff --git a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 b/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 deleted file mode 100644 index 1f1a725b..00000000 --- a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2019 Intel Corporation and OPNFV. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LoadPlugin logparser - - - - FirstFullRead false - - DefaultType "pcie_error" - DefaultSeverity "warning" - - Regex "AER:.*error received" - SubmatchIdx -1 - - - Regex "(... .. ..:..:..) .* pcieport.*AER" - SubmatchIdx 1 - IsMandatory false - - - Regex "pcieport (.*): AER:" - SubmatchIdx 1 - IsMandatory true - - - PluginInstance true - Regex " ([0-9a-fA-F:\\.]*): PCIe Bus Error" - SubmatchIdx 1 - IsMandatory false - - - Regex "severity=" - SubMatchIdx -1 - - - Regex "severity=.*\\([nN]on-[fF]atal" - TypeInstance "non_fatal" - IsMandatory false - - - Regex "severity=.*\\([fF]atal" - Severity "failure" - TypeInstance "fatal" - IsMandatory false - - - Regex "severity=Corrected" - TypeInstance "correctable" - IsMandatory false - - - Regex "type=(.*)," - SubmatchIdx 1 - IsMandatory false - - - Regex ", id=(.*)" - SubmatchIdx 1 - - - - diff --git a/docker/ansible/roles/config_files/templates/logparser.conf.j2 b/docker/ansible/roles/config_files/templates/logparser.conf.j2 new file mode 100644 index 00000000..1f1a725b --- /dev/null +++ b/docker/ansible/roles/config_files/templates/logparser.conf.j2 @@ -0,0 +1,75 @@ +# Copyright 2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +LoadPlugin logparser + + + + FirstFullRead false + + DefaultType "pcie_error" + DefaultSeverity "warning" + + Regex "AER:.*error received" + SubmatchIdx -1 + + + Regex "(... .. ..:..:..) .* pcieport.*AER" + SubmatchIdx 1 + IsMandatory false + + + Regex "pcieport (.*): AER:" + SubmatchIdx 1 + IsMandatory true + + + PluginInstance true + Regex " ([0-9a-fA-F:\\.]*): PCIe Bus Error" + SubmatchIdx 1 + IsMandatory false + + + Regex "severity=" + SubMatchIdx -1 + + + Regex "severity=.*\\([nN]on-[fF]atal" + TypeInstance "non_fatal" + IsMandatory false + + + Regex "severity=.*\\([fF]atal" + Severity "failure" + TypeInstance "fatal" + IsMandatory false + + + Regex "severity=Corrected" + TypeInstance "correctable" + IsMandatory false + + + Regex "type=(.*)," + SubmatchIdx 1 + IsMandatory false + + + Regex ", id=(.*)" + SubmatchIdx 1 + + + + diff --git a/docs/release/release-notes/notes/update_logparser_config-0db3d2746e6ad582.yaml b/docs/release/release-notes/notes/update_logparser_config-0db3d2746e6ad582.yaml new file mode 100644 index 00000000..e5be3eff --- /dev/null +++ b/docs/release/release-notes/notes/update_logparser_config-0db3d2746e6ad582.yaml @@ -0,0 +1,6 @@ +release_summary: > + Enable the Logparser plugin by default when using one-click install. +ansible: + - | + The logparser plugin is now rendered for all flavours. + The Logparser plugin has been part of collectd since 5.11, however, the ansible playbooks had it marked as experimental, and would not deploy it by default. diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst index a1fc0821..ce641b6e 100644 --- a/docs/release/userguide/installguide.oneclick.rst +++ b/docs/release/userguide/installguide.oneclick.rst @@ -319,8 +319,9 @@ the following plugins: ``ethstat``, ``ipc``, ``irq``, ``load``, ``memory``, ``numa``, ``processes``, ``swap``, ``turbostat``, ``uuid``, ``uptime``, ``exec``, ``hugepages``, ``intel_pmu``, ``ipmi``, ``write_kafka``, ``logfile``, - ``mcelog``, ``network``, ``intel_rdt``, ``rrdtool``, ``snmp_agent``, - ``syslog``, ``virt``, ``ovs_stats``, ``ovs_events``, ``dpdk_telemetry`` + ``logparser``, ``mcelog``, ``network``, ``intel_rdt``, ``rrdtool``, + ``snmp_agent``, ``syslog``, ``virt``, ``ovs_stats``, ``ovs_events``, + ``dpdk_telemetry``. .. note:: Some of the plugins are loaded depending on specific system requirements and can be omitted if @@ -373,7 +374,7 @@ List of available tags: ``contextswitch``, ``cpu``, ``cpufreq``, ``df``, ``disk,`` ``ethstat``, ``ipc``, ``irq``, ``load``, ``memory``, ``numa``, ``processes``, ``swap``, ``turbostat``, ``uptime``, ``exec``, ``hugepages``, ``ipmi``, ``kafka``, - ``logfile``, ``mcelog``, ``network``, ``pmu``, ``rdt``, ``rrdtool``, - ``snmp``, ``syslog``, ``unixsock``, ``virt``, ``ovs_stats``, ``ovs_events``, - ``uuid``, ``dpdk_telemetry``. + ``logfile``, ``logparser``, ``mcelog``, ``network``, ``pmu``, ``rdt``, + ``rrdtool``, ``snmp``, ``syslog``, ``unixsock``, ``virt``, ``ovs_stats``, + ``ovs_events``, ``uuid``, ``dpdk_telemetry``. -- cgit 1.2.3-korg