From bccfbca60504eddd0b41c6842d5e4c5e3d263a1f Mon Sep 17 00:00:00 2001
From: Emma Foley <efoley@redhat.com>
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 <efoley@redhat.com>"
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 ++++++++++++++++++++++
 3 files changed, 77 insertions(+), 78 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

(limited to 'docker/ansible')

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
-
-<Plugin logparser>
-  <Logfile "/var/log/syslog">
-    FirstFullRead false
-    <Message "pcie_errors">
-      DefaultType "pcie_error"
-      DefaultSeverity "warning"
-      <Match "aer error">
-        Regex "AER:.*error received"
-        SubmatchIdx -1
-      </Match>
-      <Match "incident time">
-        Regex "(... .. ..:..:..) .* pcieport.*AER"
-        SubmatchIdx 1
-        IsMandatory false
-      </Match>
-      <Match "root port">
-        Regex "pcieport (.*): AER:"
-        SubmatchIdx 1
-        IsMandatory true
-      </Match>
-      <Match "device">
-        PluginInstance true
-        Regex " ([0-9a-fA-F:\\.]*): PCIe Bus Error"
-        SubmatchIdx 1
-        IsMandatory false
-      </Match>
-      <Match "severity_mandatory">
-        Regex "severity="
-        SubMatchIdx -1
-      </Match>
-      <Match "nonfatal">
-        Regex "severity=.*\\([nN]on-[fF]atal"
-        TypeInstance "non_fatal"
-        IsMandatory false
-      </Match>
-      <Match "fatal">
-        Regex "severity=.*\\([fF]atal"
-        Severity "failure"
-        TypeInstance "fatal"
-        IsMandatory false
-      </Match>
-      <Match "corrected">
-        Regex "severity=Corrected"
-        TypeInstance "correctable"
-        IsMandatory false
-      </Match>
-      <Match "error type">
-        Regex "type=(.*),"
-        SubmatchIdx 1
-        IsMandatory false
-      </Match>
-     <Match "id">
-        Regex ", id=(.*)"
-        SubmatchIdx 1
-      </Match>
-    </Message>
-  </Logfile>
-</Plugin>
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
+
+<Plugin logparser>
+  <Logfile "/var/log/syslog">
+    FirstFullRead false
+    <Message "pcie_errors">
+      DefaultType "pcie_error"
+      DefaultSeverity "warning"
+      <Match "aer error">
+        Regex "AER:.*error received"
+        SubmatchIdx -1
+      </Match>
+      <Match "incident time">
+        Regex "(... .. ..:..:..) .* pcieport.*AER"
+        SubmatchIdx 1
+        IsMandatory false
+      </Match>
+      <Match "root port">
+        Regex "pcieport (.*): AER:"
+        SubmatchIdx 1
+        IsMandatory true
+      </Match>
+      <Match "device">
+        PluginInstance true
+        Regex " ([0-9a-fA-F:\\.]*): PCIe Bus Error"
+        SubmatchIdx 1
+        IsMandatory false
+      </Match>
+      <Match "severity_mandatory">
+        Regex "severity="
+        SubMatchIdx -1
+      </Match>
+      <Match "nonfatal">
+        Regex "severity=.*\\([nN]on-[fF]atal"
+        TypeInstance "non_fatal"
+        IsMandatory false
+      </Match>
+      <Match "fatal">
+        Regex "severity=.*\\([fF]atal"
+        Severity "failure"
+        TypeInstance "fatal"
+        IsMandatory false
+      </Match>
+      <Match "corrected">
+        Regex "severity=Corrected"
+        TypeInstance "correctable"
+        IsMandatory false
+      </Match>
+      <Match "error type">
+        Regex "type=(.*),"
+        SubmatchIdx 1
+        IsMandatory false
+      </Match>
+     <Match "id">
+        Regex ", id=(.*)"
+        SubmatchIdx 1
+      </Match>
+    </Message>
+  </Logfile>
+</Plugin>
-- 
cgit 1.2.3-korg