2 files changed, 89 insertions, 0 deletions
diff --git a/kolla/docker/collectd/Dockerfile.j2 b/kolla/docker/collectd/Dockerfile.j2
new file mode 100644
index 000000000..32ded377e
--- /dev/null
+++ b/kolla/docker/collectd/Dockerfile.j2
@@ -0,0 +1,81 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block collectd_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='collectd') }}
+
+{% set collectd_packages = [
+    'collectd'
+] %}
+
+{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['opstools']) }}
+
+  {% set collectd_packages = collectd_packages + [
+      'collectd-amqp',
+      '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-ipmi',
+      'collectd-logparser',
+      'collectd-mcelog',
+      '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',
+  ] %}
+
+  {% if base_arch =='x86_64' %}
+      {% set collectd_packages = collectd_packages + [
+        'collectd-hugepages',
+        'collectd-pcie-errors',
+        'collectd-pmu',
+        'collectd-rdt',
+        'collectd-turbostat'
+      ] %}
+  {% endif %}
+
+{% endif %}
+
+{{ macros.install_packages(collectd_packages | customizable("packages")) }}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 644 /usr/local/bin/kolla_extend_start \
+    && chown -R collectd /var/lib/collectd \
+    && chown -R collectd /var/run/
+
+{{ macros.kolla_patch_sources() }}
+
+{% block collectd_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER collectd
diff --git a/kolla/docker/collectd/extend_start.sh b/kolla/docker/collectd/extend_start.sh
new file mode 100644
index 000000000..80ef63db3
--- /dev/null
+++ b/kolla/docker/collectd/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/collectd" ]]; then
+    mkdir -p /var/log/kolla/collectd
+fi
+if [[ $(stat -c %a /var/log/kolla/collectd) != "755" ]]; then
+    chmod 755 /var/log/kolla/collectd
+fi