7 files changed, 99 insertions, 39 deletions
diff --git a/src/collectd/collectd_sample_configs/dpdkstat.conf b/src/collectd/collectd_sample_configs/capabilities.conf
index 919e6e6e..a422b702 100644
--- a/src/collectd/collectd_sample_configs/dpdkstat.conf
+++ b/src/collectd/collectd_sample_configs/capabilities.conf
@@ -1,4 +1,4 @@
-# Copyright 2017 OPNFV
+# Copyright 2019 OPNFV and Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,14 +11,10 @@
 # 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 dpdkstat
 
-<Plugin dpdkstat>
-#       Coremask "0xf"
-#       ProcessType "secondary"
-#       FilePrefix "rte"
-       EnabledPortMask 0xffff
-#       PortName "interface1"
-#       PortName "interface2"
+LoadPlugin capabilities
+
+<Plugin capabilities>
+  Port "9564"
 </Plugin>
 
diff --git a/src/collectd/collectd_sample_configs/dpdkevents.conf b/src/collectd/collectd_sample_configs/dpdk_telemetry.conf
index fdb6f3db..3bc0dd15 100644
--- a/src/collectd/collectd_sample_configs/dpdkevents.conf
+++ b/src/collectd/collectd_sample_configs/dpdk_telemetry.conf
@@ -1,4 +1,4 @@
-# Copyright 2017 OPNFV
+#Copyright 2020 OPNFV and Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,25 +11,12 @@
 # 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 dpdkevents>
+
+<LoadPlugin dpdk_telemetry>
   Interval 1
 </LoadPlugin>
 
-<Plugin "dpdkevents">
-  <EAL>
-#    Coremask "0x1"
-#    MemoryChannels "4"
-#    FilePrefix "rte"
-  </EAL>
-  <Event "link_status">
-    SendEventsOnUpdate false
-    EnabledPortMask 0xffff
-    SendNotification true
-  </Event>
-  <Event "keep_alive">
-    SendEventsOnUpdate false
-    LCoreMask "0xf"
-    KeepAliveShmName "/dpdk_keepalive_shm_name"
-    SendNotification true
-  </Event>
+<Plugin dpdk_telemetry>
+       ClientSocketPath "/var/run/.client"
+       DpdkSocketPath "/var/run/dpdk/rte/telemetry"
 </Plugin>
diff --git a/src/collectd/collectd_sample_configs/intel_pmu.conf b/src/collectd/collectd_sample_configs/intel_pmu.conf
index db83e4bb..c4beee0c 100644
--- a/src/collectd/collectd_sample_configs/intel_pmu.conf
+++ b/src/collectd/collectd_sample_configs/intel_pmu.conf
@@ -1,4 +1,4 @@
-# Copyright 2017 OPNFV
+# Copyright 2017-21 Anuket and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,12 +11,16 @@
 # 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 intel_pmu
+
+<LoadPlugin intel_pmu>
+  Interval 1
+</LoadPlugin>
 
 <Plugin intel_pmu>
   ReportHardwareCacheEvents true
   ReportKernelPMUEvents true
   ReportSoftwareEvents true
-#  EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
+#  EventList "$HOME/.cache/pmu-events/GenuineIntel-6-2D-core.json"
 #  HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+  Cores ""
 </Plugin>
diff --git a/src/collectd/collectd_sample_configs/logparser.conf b/src/collectd/collectd_sample_configs/logparser.conf
new file mode 100644
index 00000000..1f1a725b
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/logparser.conf
@@ -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>
diff --git a/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh
index 0517717f..d3e83d82 100755
--- a/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh
+++ b/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
-# Copyright 2017 OPNFV
+# Copyright 2017-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
+# 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.
+#
 sudo python /usr/local/src/ovs_pmd_stats.py --socket-pid-file /var/run/openvswitch/ovs-vswitchd.pid
diff --git a/src/collectd/collectd_sample_configs/snmp_agent.conf b/src/collectd/collectd_sample_configs/snmp_agent.conf
index a4511a94..7452ccae 100644
--- a/src/collectd/collectd_sample_configs/snmp_agent.conf
+++ b/src/collectd/collectd_sample_configs/snmp_agent.conf
@@ -17,7 +17,6 @@ LoadPlugin snmp_agent
   <Table "pmuTable">
     IndexOID "INTEL-PMU-MIB::pmuGroupIndex"
     <Data "pmuGroupDescr">
-      Instance true
       Plugin "intel_pmu"
       OIDs "INTEL-PMU-MIB::pmuGroupDescr"
     </Data>
@@ -279,7 +278,6 @@ LoadPlugin snmp_agent
     IndexOID "INTEL-RDT-MIB::rdtGroupIndex"
     SizeOID "INTEL-RDT-MIB::rdtGroupNumber"
     <Data "rdtGroupDescr">
-      Instance true
       Plugin "intel_rdt"
       OIDs "INTEL-RDT-MIB::rdtGroupDescr"
     </Data>
@@ -311,7 +309,6 @@ LoadPlugin snmp_agent
   <Table "mcelogTable">
     IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex"
     <Data "memoryGroupDescr">
-      Instance true
       Plugin "mcelog"
       OIDs "INTEL-MCELOG-MIB::memoryGroupDescr"
     </Data>
@@ -343,7 +340,6 @@ LoadPlugin snmp_agent
 # Hugepages
   <Table "hugepagesTable">
     <Data "hugepagesNode">
-      Instance true
       Plugin "hugepages"
       OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode"
     </Data>
diff --git a/src/collectd/collectd_sample_configs/write_notification.sh b/src/collectd/collectd_sample_configs/write_notification.sh
index ed6ed9e2..47ae9a83 100755
--- a/src/collectd/collectd_sample_configs/write_notification.sh
+++ b/src/collectd/collectd_sample_configs/write_notification.sh
@@ -1,17 +1,18 @@
 #!/bin/bash
-# Copyright 2017 OPNFV
+# Copyright 2017-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
+# 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.
+#
 rm -f /tmp/notifications
 while read x y
 do