sync with 3.7

deadtrickster · Dec 21, 2017 · 7da1051 · 7da1051
1 parent ee8b3c3
commit 7da1051
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,14 @@
-FROM rabbitmq:3.6.14-management
+FROM rabbitmq:3.7-management
 MAINTAINER  Ilya Khaprov <[email protected]>
 
 # prometheus exporter plugin
 ADD ["plugins/accept-*", \
      "plugins/prometheus-*", \
-     "plugins/prometheus_httpd-*", \
+     "plugins/prometheus_httpd-*",\
+     "plugins/prometheus_cowboy-*", \
      "plugins/prometheus_process_collector-*", \
      "plugins/prometheus_rabbitmq_exporter-*", \
      "/usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/"]
 RUN chmod a+r /usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/prometheus*.ez /usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/accept*.ez \
-    && rabbitmq-plugins enable --offline prometheus accept prometheus_rabbitmq_exporter prometheus_process_collector prometheus_httpd \
+    && rabbitmq-plugins enable --offline prometheus accept prometheus_rabbitmq_exporter prometheus_process_collector prometheus_httpd prometheus_cowboy \
     && chmod -R 777 /etc/rabbitmq
diff --git a/Dockerfile.pure b/Dockerfile.pure
@@ -1,12 +1,13 @@
-FROM rabbitmq:3.6.14-management
+FROM rabbitmq:3.7-management
 MAINTAINER  Ilya Khaprov <[email protected]>
 
 # prometheus exporter plugin
 ADD ["plugins/accept-*", \
      "plugins/prometheus-*", \
      "plugins/prometheus_httpd-*", \
+     "plugins/prometheus_cowboy-*", \
      "plugins/prometheus_rabbitmq_exporter-*", \
      "/usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/"]
 RUN chmod a+r /usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/prometheus*.ez /usr/lib/rabbitmq/lib/rabbitmq_server-${RABBITMQ_VERSION}/plugins/accept*.ez \
-    && rabbitmq-plugins enable --offline accept prometheus prometheus_rabbitmq_exporter prometheus_httpd \
+    && rabbitmq-plugins enable --offline accept prometheus prometheus_rabbitmq_exporter prometheus_httpd prometheus_cowboy \
     && chmod -R 777 /etc/rabbitmq
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ PROJECT_DESCRIPTION = Prometheus.io exporter as a RabbitMQ Managment Plugin plug
 
 DEPS = rabbitmq_management prometheus prometheus_httpd accept \
 	prometheus_process_collector prometheus_cowboy
-dep_prometheus = hex 3.4.4
-dep_prometheus_process_collector = hex 1.3.0
+dep_prometheus = hex 3.4.5
+dep_prometheus_process_collector = hex 1.3.1
 dep_prometheus_httpd = hex 2.1.8
 dep_accept = hex 0.3.3
 dep_prometheus_cowboy = hex 0.1.4