From 36f6e56d6674c02818e44d5cb3c40660ba2b0644 Mon Sep 17 00:00:00 2001
From: Piotr Rabiega <piotrx.rabiega@intel.com>
Date: Mon, 30 Mar 2020 12:06:51 +0200
Subject: [PATCH] add dpdk_telemetry and logparser, use centos-release-opstools
 for C8

Adds collectd-dpdk_telemetry and collectd-logparser packages
to collectd RHEL-based image. dpdk_telemetry plugin collects DPDK
ethernet device metrics via dpdk_telemetry library. Logparser is
plugin for filtering and parsing log messages.

Change-Id: I0c7c94e9fae9d11660f938b8d7d6be0f270c972f
---
 docker/base/Dockerfile.j2                                 | 4 ++--
 docker/collectd/Dockerfile.j2                             | 2 ++
 ...add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index baa1169da9..06e7b3693e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -213,24 +213,24 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 {% endblock %}
 
 {% set base_centos_yum_repo_keys = [
+    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
 ] %}
 # FIXME(mgoddard): Not available for CentOS 8 yet.
 {% if distro_package_manager == 'yum' %}
     {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
         '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
         '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
     ] %}
 {% endif %}
 
 {% set base_centos_yum_repo_packages = [
+    'centos-release-opstools',
     'epel-release',
 ] %}
 # FIXME(mgoddard): Not available for CentOS 8 yet.
 {% if distro_package_manager == 'yum' %}
     {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
         'centos-release-ceph-nautilus',
-        'centos-release-opstools',
         'centos-release-qemu-ev',
     ] %}
 # FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index f5ae054eac..f350815742 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -27,9 +27,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-dbi',
       'collectd-disk',
       'collectd-dns',
+      'collectd-dpdk_telemetry',
       'collectd-generic-jmx',
       'collectd-ipmi',
       'collectd-log_logstash',
+      'collectd-logparser',
       'collectd-mcelog',
       'collectd-memcachec',
       'collectd-mysql',
diff --git a/releasenotes/notes/add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml b/releasenotes/notes/add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml
new file mode 100644
index 0000000000..d970346f41
--- /dev/null
+++ b/releasenotes/notes/add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml
@@ -0,0 +1,8 @@
+---
+
+features:
+  - |
+    Adds ``collectd-dpdk_telemetry`` and ``collectd-logparser`` packages
+    to ``collectd`` RHEL-based image. dpdk_telemetry plugin collects DPDK
+    ethernet device metrics via dpdk_telemetry library. Logparser is
+    plugin for filtering and parsing log messages.