From 53f164dab619c11dc463510c2c9b58d485b91db6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 18 Nov 2020 16:42:39 +0000 Subject: [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 --- docker/barometer-collectd-experimental/Dockerfile | 15 ++--- .../experimental-configs/capabilities.conf | 20 ------ .../experimental-configs/logparser.conf | 75 ---------------------- .../capabilities.conf | 20 ++++++ .../collectd_sample_configs-latest/logparser.conf | 75 ++++++++++++++++++++++ .../collectd_sample_configs/capabilities.conf | 20 ++++++ .../collectd_sample_configs/logparser.conf | 75 ++++++++++++++++++++++ 7 files changed, 195 insertions(+), 105 deletions(-) delete mode 100644 docker/barometer-collectd-experimental/experimental-configs/capabilities.conf delete mode 100644 docker/barometer-collectd-experimental/experimental-configs/logparser.conf create mode 100644 src/collectd/collectd_sample_configs-latest/capabilities.conf create mode 100644 src/collectd/collectd_sample_configs-latest/logparser.conf create mode 100644 src/collectd/collectd_sample_configs/capabilities.conf create mode 100644 src/collectd/collectd_sample_configs/logparser.conf 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/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf deleted file mode 100644 index a422b702..00000000 --- a/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf +++ /dev/null @@ -1,20 +0,0 @@ -# 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 - - - Port "9564" - - diff --git a/docker/barometer-collectd-experimental/experimental-configs/logparser.conf b/docker/barometer-collectd-experimental/experimental-configs/logparser.conf deleted file mode 100644 index 1f1a725b..00000000 --- a/docker/barometer-collectd-experimental/experimental-configs/logparser.conf +++ /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/src/collectd/collectd_sample_configs-latest/capabilities.conf b/src/collectd/collectd_sample_configs-latest/capabilities.conf new file mode 100644 index 00000000..a422b702 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/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 + + + Port "9564" + + diff --git a/src/collectd/collectd_sample_configs-latest/logparser.conf b/src/collectd/collectd_sample_configs-latest/logparser.conf new file mode 100644 index 00000000..1f1a725b --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/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 + + + + 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/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 + + + Port "9564" + + 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 + + + + 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 + + + + -- cgit 1.2.3-korg