add dpdk_telemetry and logparser for C8, use centos-release-opstools …

…for C8 Adds collectd-dpdk_telemetry and collectd-logparser packages to collectd RHEL8-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 (cherry picked from commit 36f6e56)
openstack · Apr 8, 2020 · 8a6aa9e · 8a6aa9e
1 parent 818dc4d
commit 8a6aa9e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
@@ -211,26 +211,26 @@ 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-Cloud',
-        '/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-openstack-train',
         '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
@@ -53,6 +53,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
   {% if distro_python_version.startswith('3') %}
   {% set collectd_packages = collectd_packages + [
+      'collectd-dpdk_telemetry',
+      'collectd-logparser',
       'python3-sqlalchemy-collectd'
   ] %}
   {% else %}

diff --git a/releasenotes/notes/add_dpdk_telemetry_and_logparser-bcf9b13bcefc99c9.yaml 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`` RHEL8-based image. dpdk_telemetry plugin collects DPDK
+    ethernet device metrics via dpdk_telemetry library. Logparser is
+    plugin for filtering and parsing log messages.