From 8a6aa9e5959990a88e7eacd95cb3a833e5971f59 Mon Sep 17 00:00:00 2001 From: Piotr Rabiega Date: Mon, 6 Apr 2020 11:22:59 +0200 Subject: 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 36f6e56d6674c02818e44d5cb3c40660ba2b0644) --- docker/base/Dockerfile.j2 | 4 ++-- docker/collectd/Dockerfile.j2 | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index efe219627..f46d71d3e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -211,18 +211,19 @@ 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. @@ -230,7 +231,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% 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 index f4447ff2b..de84c669e 100644 --- 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 %} -- cgit v1.2.3