From d585aa75afb2bfd705f960aa539db1269d3a6671 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Mon, 10 Sep 2018 11:32:39 +0200
Subject: [collectd] Add many plugins to collectd dockerfile

The plugin collectd-ceilometer-plugin has been replaced by
collectd-openstack-plugin, which is not packaged yet.

Change-Id: I851f6e6a6d8311351549f1d97ba2257f7a9c7feb
---
 docker/collectd/Dockerfile.j2 | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index 1bf182d59..6c6189130 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -15,28 +15,48 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
   {% set collectd_packages = collectd_packages + [
       'collectd-amqp1',
       'collectd-apache',
+      'collectd-bind',
       'collectd-ceph',
+      'collectd-chrony',
       'collectd-connectivity',
+      'collectd-curl',
+      'collectd-curl_json',
+      'collectd-curl_xml',
+      'collectd-dbi',
       'collectd-disk',
+      'collectd-dns',
+      'collectd-generic-jmx',
       'collectd-ipmi',
+      'collectd-log_logstash',
+      'collectd-mcelog',
+      'collectd-memcachec',
       'collectd-mysql',
       'collectd-netlink',
+      'collectd-openldap',
       'collectd-ovs-events',
       'collectd-ovs-stats',
       'collectd-ping',
       'collectd-procevent',
       'collectd-python',
+      'collectd-sensors',
       'collectd-smart',
+      'collectd-snmp',
       'collectd-snmp-agent',
       'collectd-sysevent',
       'collectd-utils',
       'collectd-virt',
+      'collectd-write_http',
       'collectd-write_kafka',
       'collectd-write_prometheus',
-      'python-collectd-gnocchi',
-      'python2-collectd-ceilometer-plugin'
+      'python-collectd-gnocchi'
   ] %}
 
+  {% if base_arch in ['x86_64', 'ppc64le'] %}
+      {% set collectd_packages = collectd_packages + [
+        'collectd-iptables'
+        ] %}
+  {% endif %}
+
   {% if base_arch =='x86_64' %}
       {% set collectd_packages = collectd_packages + [
         'collectd-hugepages',
-- 
cgit v1.2.3