From: Emma Foley <efoley@redhat.com>
Date: Wed, 18 Nov 2020 16:42:39 +0000 (+0000)
Subject: [container][experimental] Update experimental container
X-Git-Tag: opnfv-10.0.0~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=53f164dab619c11dc463510c2c9b58d485b91db6;p=barometer.git

[container][experimental] Update experimental container

* Use CentOS 8 instead of CentOS7
* Remove collectd-openstack-plugins
* Update the list of PRs that are applied
  logparser and capabilities were merged
* Move the experimental configs to collectd_sample_configs{,-latest}

Change-Id: Ic1133ee7172e092ad4713c94886f306bc4d8e6ec
Signed-off-by: Emma Foley <efoley@redhat.com>
---

diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile
index 49016d9b..798868ff 100644
--- a/docker/barometer-collectd-experimental/Dockerfile
+++ b/docker/barometer-collectd-experimental/Dockerfile
@@ -13,17 +13,16 @@
 # limitations under the License.
 #
 
-FROM centos:7
-RUN yum update -y && \
-        yum install -y which sudo git && \
-        yum clean all && \
+FROM centos:8
+RUN dnf update -y && \
+        dnf install -y which sudo git && \
+        dnf clean all && \
         git config --global http.sslVerify false
 
 ENV DOCKER y
 ENV COLLECTD_FLAVOR experimental
 ENV WITH_DPDK y
 ENV repos_dir /src
-ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins
 
 WORKDIR ${repos_dir}
 RUN mkdir -p ${repos_dir}/barometer
@@ -38,14 +37,10 @@ COPY docker/barometer-collectd-experimental/experimental-configs/* \
 
 WORKDIR ${repos_dir}/barometer/systems
 RUN sh ./build_base_machine.sh && \
+        dnf clean all && rm -rf /var/cache/dnf && \
         useradd -ms /bin/bash collectd_exec && \
         echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-WORKDIR ${openstack_plugins}
-RUN make && \
-        pip install --upgrade pip && \
-        pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt
-
 COPY docker/barometer-collectd-experimental/run_collectd.sh /run_collectd.sh
 RUN chmod +x /run_collectd.sh
 
diff --git a/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf b/src/collectd/collectd_sample_configs-latest/capabilities.conf
similarity index 100%
rename from docker/barometer-collectd-experimental/experimental-configs/capabilities.conf
rename to src/collectd/collectd_sample_configs-latest/capabilities.conf
diff --git a/docker/barometer-collectd-experimental/experimental-configs/logparser.conf b/src/collectd/collectd_sample_configs-latest/logparser.conf
similarity index 100%
rename from docker/barometer-collectd-experimental/experimental-configs/logparser.conf
rename to src/collectd/collectd_sample_configs-latest/logparser.conf
diff --git a/src/collectd/collectd_sample_configs/capabilities.conf b/src/collectd/collectd_sample_configs/capabilities.conf
new file mode 100644
index 00000000..a422b702
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/capabilities.conf
@@ -0,0 +1,20 @@
+# 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.
+# 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 capabilities
+
+<Plugin capabilities>
+  Port "9564"
+</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>