Bump prometheus services to latest version

blackbox_exporter ->  0.22.0
prometheus_cadvisor ->  0.45.0
elasticsearch_exporter -> 1.5.0
haproxy_exporter -> 0.13.0
prometheus_libvirt_exporter -> 2.3.2
memcached_exporter_version -> 0.10.0
prometheus_msteams -> 1.5.1
prometheus_mtail -> v3.0.0-rc50
mysqld_exporter -> 0.14.0
node_exporter -> 1.3.1
prometheus  -> 2.38.0

Change-Id: I3452e8904992bfb977dcae4084a0d98aab82e221
This commit is contained in:
wuchunyang 2022-08-24 16:22:58 +08:00 committed by wu.chunyang
parent 37bab095b6
commit 26b027f0b3
12 changed files with 46 additions and 44 deletions

View File

@ -8,8 +8,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% block prometheus_blackbox_exporter_repository_version %} {% block prometheus_blackbox_exporter_repository_version %}
ARG blackbox_exporter_version=0.16.0 ARG blackbox_exporter_version=0.22.0
ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}

View File

@ -8,12 +8,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% block prometheus_cadvisor_repository_version %} {% block prometheus_cadvisor_repository_version %}
ARG prometheus_cadvisor_version=0.38.7 ARG prometheus_cadvisor_version=0.45.0
ARG prometheus_cadvisor_sha256sum=fdb86c256df682cfec2abd57a4405c919ed26f1e27ebfabf487f6c516bc7f6c7 {% if debian_arch == 'arm64' %}
ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor ARG prometheus_cadvisor_sha256sum=bd6dad982c5950d6071ec2e1f9d474102ef3a00451395c58da9398297d35b174
{% else %}
ARG prometheus_cadvisor_sha256sum=9a2a0b69f58d932855c0af23b847cb9de8f8c32264f66f9fb5dcc8f359f34ccd
{% endif %}
ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor-v${prometheus_cadvisor_version}-linux-{{debian_arch}}
{% endblock %} {% endblock %}
{% if base_arch in ['x86_64'] %}
{% block prometheus_cadvisor_install %} {% block prometheus_cadvisor_install %}
RUN curl -o /tmp/cadvisor ${prometheus_cadvisor_url} \ RUN curl -o /tmp/cadvisor ${prometheus_cadvisor_url} \
@ -22,21 +25,6 @@ RUN curl -o /tmp/cadvisor ${prometheus_cadvisor_url} \
&& chmod 0755 /opt/cadvisor && chmod 0755 /opt/cadvisor
{% endblock %} {% endblock %}
{% else %}
{% if base_distro in ['debian'] %}
{% set cadvisor_packages = [
'libjs-bootstrap',
'libjs-jquery',
'cadvisor'
] %}
{{ macros.install_packages(cadvisor_packages | customizable("packages")) }}
RUN ln -s /usr/bin/cadvisor /opt/cadvisor
{% endif %}
{% endif %}
{% block prometheus_cadvisor_footer %}{% endblock %} {% block prometheus_cadvisor_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_elasticsearch_exporter_header %}{% endblock %} {% block prometheus_elasticsearch_exporter_header %}{% endblock %}
{% block prometheus_elasticsearch_exporter_repository_version %} {% block prometheus_elasticsearch_exporter_repository_version %}
ARG elasticsearch_exporter_version=1.2.1 ARG elasticsearch_exporter_version=1.5.0
ARG elasticsearch_exporter_url=https://github.com/prometheus-community/elasticsearch_exporter/releases/download/v${elasticsearch_exporter_version}/elasticsearch_exporter-${elasticsearch_exporter_version}.linux-{{debian_arch}}.tar.gz ARG elasticsearch_exporter_url=https://github.com/prometheus-community/elasticsearch_exporter/releases/download/v${elasticsearch_exporter_version}/elasticsearch_exporter-${elasticsearch_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}

View File

@ -6,8 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block haproxy_exporter_header %}{% endblock %} {% block haproxy_exporter_header %}{% endblock %}
{% block haproxy_exporter_repository_version %} {% block haproxy_exporter_repository_version %}
ARG haproxy_exporter_version=0.10.0 ARG haproxy_exporter_version=0.13.0
ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}
{% block haproxy_exporter_install %} {% block haproxy_exporter_install %}

View File

@ -26,7 +26,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(prometheus_libvirt_exporter_packages | customizable("packages")) }} {{ macros.install_packages(prometheus_libvirt_exporter_packages | customizable("packages")) }}
{% block prometheus_libvirt_exporter_version %} {% block prometheus_libvirt_exporter_version %}
ARG prometheus_libvirt_exporter_version=2.3.0 ARG prometheus_libvirt_exporter_version=2.3.2
ARG prometheus_libvirt_exporter_path=github.com/AlexZzz/libvirt-exporter ARG prometheus_libvirt_exporter_path=github.com/AlexZzz/libvirt-exporter
{% endblock %} {% endblock %}

View File

@ -6,8 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_memcached_exporter_header %}{% endblock %} {% block prometheus_memcached_exporter_header %}{% endblock %}
{% block prometheus_memcached_exporter_repository_version %} {% block prometheus_memcached_exporter_repository_version %}
ARG memcached_exporter_version=0.6.0 ARG memcached_exporter_version=0.10.0
ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}
{% block prometheus_memcached_exporter_install %} {% block prometheus_memcached_exporter_install %}

View File

@ -6,8 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_msteams_header %}{% endblock %} {% block prometheus_msteams_header %}{% endblock %}
{% block prometheus_msteams_repository_version %} {% block prometheus_msteams_repository_version %}
ARG prometheus_msteams_version=1.5.0 ARG prometheus_msteams_version=1.5.1
ARG prometheus_msteams_sha256sum=74d1bedb12f6ec09fb65ddeb63328f691a9b2a56c92d7682ca152c867fc7c7a0 ARG prometheus_msteams_sha256sum=9a589b4417fc116c153c40d1220dca1f46e6bb8e24b4db0d52ee0c0151de2222
ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}} ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}}
{% endblock %} {% endblock %}

View File

@ -5,21 +5,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_mtail_header %}{% endblock %} {% block prometheus_mtail_header %}{% endblock %}
{% if base_arch not in ['x86_64'] %}
RUN echo 'There are no mtail binaries for {{ base_arch }}' \
&& /bin/false
{% endif %}
{% block prometheus_mtail_version %} {% block prometheus_mtail_version %}
ARG prometheus_mtail_version=v3.0.0-rc35
ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_amd64 ARG prometheus_mtail_version=3.0.0-rc50
{% if debian_arch == 'amd64' %}
ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_x86_64.tar.gz
{% else %}
ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_{{debian_arch}}.tar.gz
{% endif %}
{% endblock %} {% endblock %}
{% block prometheus_mtail_install %} {% block prometheus_mtail_install %}
RUN curl -o /opt/mtail ${prometheus_mtail_url} \ RUN curl -o /tmp/mtail.tar.gz ${prometheus_mtail_url} \
&& chmod +x /opt/mtail && tar xvf /tmp/mtail.tar.gz -C /opt/ \
&& rm -f /tmp/mtail.tar.gz
{% endblock %} {% endblock %}
{% block prometheus_mtail_footer %}{% endblock %} {% block prometheus_mtail_footer %}{% endblock %}

View File

@ -6,8 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block mysqld_exporter_header %}{% endblock %} {% block mysqld_exporter_header %}{% endblock %}
{% block mysqld_exporter_repository_version %} {% block mysqld_exporter_repository_version %}
ARG mysqld_exporter_version=0.12.1 ARG mysqld_exporter_version=0.14.0
ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}
{% block mysqld_exporter_install %} {% block mysqld_exporter_install %}

View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block node_exporter_header %}{% endblock %} {% block node_exporter_header %}{% endblock %}
{% block node_exporter_repository_version %} {% block node_exporter_repository_version %}
ARG node_exporter_version=0.18.1 ARG node_exporter_version=1.3.1
ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}

View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_v2_server_header %}{% endblock %} {% block prometheus_v2_server_header %}{% endblock %}
{% block prometheus_v2_server_repository_version %} {% block prometheus_v2_server_repository_version %}
ARG prometheus_version=2.26.1 ARG prometheus_version=2.38.0
ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
{% endblock %} {% endblock %}

View File

@ -0,0 +1,15 @@
---
upgrade:
- |
Bump prometheus services to latest version.
blackbox_exporter -> 0.22.0
prometheus_cadvisor -> 0.45.0
elasticsearch_exporter -> 1.5.0
haproxy_exporter -> 0.13.0
prometheus_libvirt_exporter -> 2.3.2
memcached_exporter_version -> 0.10.0
prometheus_msteams -> 1.5.1
prometheus_mtail -> v3.0.0-rc50
mysqld_exporter -> 0.14.0
node_exporter -> 1.3.1
prometheus -> 2.38.0