diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-28 15:55:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-28 15:55:33 +0000 |
| commit | 5aa981bd3e9c723dad57d658810a412593457e8b (patch) | |
| tree | 3346f17891aff34a69461c3f6161ba071c00f837 | |
| parent | df5da720546faa88c4da8b5f1c9a1db63a55fa01 (diff) | |
| parent | 411348335456c13b855f973316b34e47f62f7b5e (diff) | |
| download | kolla-5aa981bd3e9c723dad57d658810a412593457e8b.tar.gz kolla-5aa981bd3e9c723dad57d658810a412593457e8b.zip | |
Merge "Add support rabbitmq promethues plugin"
| -rw-r--r-- | docker/macros.j2 | 9 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index aa9c097cb..111572140 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -99,3 +99,12 @@ RUN apt-get update \ {%- endif %} {%- endif %} {%- endmacro %} + +{% macro install_rabbitmq_plugins(plugins, version) -%} + ENV PLUGINS_DIR /usr/lib/rabbitmq/plugins +{% if plugins is defined and plugins|length > 0 -%} + {% for item in plugins %} + RUN curl -L -o ${PLUGINS_DIR}/{{ item }} https://github.com/deadtrickster/prometheus_rabbitmq_exporter/releases/download/{{ version }}/{{ item }} + {% endfor %} +{%- endif %} +{%- endmacro %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 55692f68b..06748bd6e 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -51,11 +51,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block rabbitmq_install_plugins %} RUN rm -rf /var/lib/rabbitmq/* \ + && mkdir -p /usr/lib/rabbitmq/plugins \ && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ rabbitmq_management {% endblock %} +{% block rabbitmq_plugins_install %} + + {% set rabbitmq_plugins = [ + 'accept-0.3.3.ez', + 'prometheus-3.5.1.ez', + 'prometheus_cowboy-0.1.4.ez', + 'prometheus_httpd-2.1.8.ez', + 'prometheus_rabbitmq_exporter-3.7.2.4.ez' + ] %} + +{{ macros.install_rabbitmq_plugins(rabbitmq_plugins | customizable("plugins"), version="v3.7.2.4") }} +{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY rabbitmq_get_gospel_node.py /usr/local/bin/rabbitmq_get_gospel_node RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gospel_node |