Merge "Clean up collectd dockerfile"

1 files changed, 9 insertions, 23 deletions

diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index 14d09b98d..08df6a4c9 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -15,10 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
   {% 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',
@@ -33,37 +35,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-mysql',
       'collectd-netlink',
       'collectd-openldap',
+      'collectd-ovs-events',
+      'collectd-ovs-stats',
       'collectd-ping',
+      'collectd-procevent',
       'collectd-python',
       'collectd-sensors',
       'collectd-sensubility',
       'collectd-smart',
       'collectd-snmp',
+      'collectd-snmp-agent',
+      'collectd-sysevent',
       'collectd-utils',
       'collectd-virt',
       'collectd-write_http',
       'collectd-write_kafka',
-      'collectd-write_prometheus'
+      'collectd-write_prometheus',
   ] %}
 
   {% if distro_python_version.startswith('3') %}
-  {# TODO(aschultz): there are some missing packages here #}
   {% set collectd_packages = collectd_packages + [
-      'collectd-ovs_events',
-      'collectd-ovs_stats',
-      'collectd-snmp_agent',
       'python3-sqlalchemy-collectd'
   ] %}
   {% else %}
   {% set collectd_packages = collectd_packages + [
-      'collectd-amqp1',
-      'collectd-connectivity',
-      'collectd-ovs-events',
-      'collectd-ovs-stats',
-      'collectd-procevent',
-      'collectd-snmp-agent',
-      'collectd-sysevent',
-      'python-collectd-gnocchi',
       'python2-collectd-rabbitmq-monitoring',
       'python2-sqlalchemy-collectd'
   ] %}
@@ -76,21 +71,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
   {% endif %}
 
   {% if base_arch =='x86_64' %}
-    {% if distro_python_version.startswith('3') %}
-      {# NOTE(aschultz): there are some missing packages here #}
       {% set collectd_packages = collectd_packages + [
         'collectd-hugepages',
-      ] %}
-    {% else %}
-      {% set collectd_packages = collectd_packages + [
-        'collectd-hugepages',
-        'collectd-pmu',
-        'collectd-rdt',
         'collectd-turbostat'
       ] %}
-    {% endif %}
-
   {% endif %}
+
 {% endif %}
 
 {{ macros.install_packages(collectd_packages | customizable("packages")) }}