Merge "[ansible][logparser] Enable logparser by default in one-click install"

4 files changed, 14 insertions, 8 deletions

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/logparser.conf.j2
index 1f1a725b..1f1a725b 100644
--- a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2
+++ b/docker/ansible/roles/config_files/templates/logparser.conf.j2
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 636db5cf..ef3624cb 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``.