aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-04 13:59:11 +0000
committerGerrit Code Review <review@openstack.org>2019-03-04 13:59:11 +0000
commit22282a856839ee01e96653f58687122379c7fd31 (patch)
treeac059ded150717e4b48da720b43f44468869e3fa /docker
parent8fcd7ea9123840be5fdf382fefe9811086b724b7 (diff)
parent5e89fbd3b7c159d249ab806830f466f5522f8e87 (diff)
downloadkolla-22282a856839ee01e96653f58687122379c7fd31.tar.gz
kolla-22282a856839ee01e96653f58687122379c7fd31.zip
Merge "Bump up Prometheus and components versions"
Diffstat (limited to 'docker')
-rw-r--r--docker/prometheus/prometheus-alertmanager/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-cadvisor/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-memcached-exporter/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-node-exporter/Dockerfile.j22
-rw-r--r--docker/prometheus/prometheus-server/Dockerfile.j22
8 files changed, 8 insertions, 8 deletions
diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
index 626b77837..ed5cff2ae 100644
--- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
+++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_alertmanager_header %}{% endblock %}
{% block prometheus_alertmanager_repository_version %}
-ENV prometheus_alertmanager_version=0.14.0
+ENV prometheus_alertmanager_version=0.16.1
{% endblock %}
{% block prometheus_alertmanager_install %}
diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
index 8ca586759..56552a318 100644
--- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_blackbox_exporter_header %}{% endblock %}
{% block prometheus_blackbox_exporter_repository_version %}
-ENV blackbox_exporter_version=0.12.0
+ENV blackbox_exporter_version=0.13.0
{% endblock %}
{% block prometheus_blackbox_exporter_install %}
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
index 427961f46..05c13f46e 100644
--- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
+++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% block prometheus_cadvisor_repository_version %}
-ENV prometheus_cadvisor_version=0.27.4
+ENV prometheus_cadvisor_version=0.32.0
{% endblock %}
{% if base_arch in ['x86_64'] %}
diff --git a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2
index 5dbdd8fc9..82a4cff87 100644
--- a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block haproxy_exporter_header %}{% endblock %}
{% block haproxy_exporter_repository_version %}
-ENV haproxy_exporter_version=0.7.1
+ENV haproxy_exporter_version=0.10.0
{% endblock %}
{% block haproxy_exporter_install %}
diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
index d3cc78d84..3a7f885cc 100644
--- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_memcached_exporter_header %}{% endblock %}
{% block prometheus_memcached_exporter_repository_version %}
-ENV memcached_exporter_version=0.4.1
+ENV memcached_exporter_version=0.5.0
{% endblock %}
{% block prometheus_memcached_exporter_install %}
diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
index d9bc7e775..10d1c6d69 100644
--- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block mysqld_exporter_header %}{% endblock %}
{% block mysqld_exporter_repository_version %}
-ENV mysqld_exporter_version=0.10.0
+ENV mysqld_exporter_version=0.11.0
{% endblock %}
{% block mysqld_exporter_install %}
diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
index 59f6b3223..22ad08125 100644
--- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block node_exporter_header %}{% endblock %}
{% block node_exporter_repository_version %}
-ENV node_exporter_version=0.14.0
+ENV node_exporter_version=0.17.0
{% endblock %}
{% block node_exporter_install %}
diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2
index cf9d2bfef..b99aadbec 100644
--- a/docker/prometheus/prometheus-server/Dockerfile.j2
+++ b/docker/prometheus/prometheus-server/Dockerfile.j2
@@ -4,7 +4,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_server_header %}{% endblock %}
{% block prometheus_server_repository_version %}
-ENV prometheus_version=1.7.1
+ENV prometheus_version=1.8.2
{% endblock %}
{% block prometheus_server_install %}