diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-19 09:33:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-19 09:33:01 +0000 |
| commit | 09b1147665c73ebd6b3c27befb19652c75428ec2 (patch) | |
| tree | 752137cbe90f7ef6b28203944c23ede859c04b34 /docker | |
| parent | f5749e0ef883ce214ef17d706e0af9ba0efd2975 (diff) | |
| parent | d585aa75afb2bfd705f960aa539db1269d3a6671 (diff) | |
| download | kolla-09b1147665c73ebd6b3c27befb19652c75428ec2.tar.gz kolla-09b1147665c73ebd6b3c27befb19652c75428ec2.zip | |
Merge "[collectd] Add many plugins to collectd dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 24 |
1 files changed, 22 insertions, 2 deletions
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', |