Skip to content

Commit ac79bc9

Browse files
cityofshipsmnasiadka
authored andcommitted
Upgrade Prometheus to v3
Needed-by: https://review.opendev.org/c/openstack/kolla-ansible/+/945611 Change-Id: I4113976db743d3c5c4ff62f2876e224888f05a36
1 parent e5e308f commit ac79bc9

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

docker/prometheus/prometheus-v2-server/Dockerfile.j2 renamed to docker/prometheus/prometheus-server/Dockerfile.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
33
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
44
{% endblock %}
55

6-
{% block prometheus_v2_server_header %}{% endblock %}
6+
{% block prometheus_server_header %}{% endblock %}
77

88
{% import "macros.j2" as macros with context %}
99

10-
{% block prometheus_v2_server_install %}
11-
ADD prometheus-v2-server-archive /prometheus-server-source
10+
{% block prometheus_server_install %}
11+
ADD prometheus-server-archive /prometheus-server-source
1212

1313
RUN ln -s /prometheus-server-source/* prometheus-server \
1414
&& mkdir -p /opt/prometheus \
@@ -18,7 +18,7 @@ RUN ln -s /prometheus-server-source/* prometheus-server \
1818

1919
{{ macros.kolla_patch_sources() }}
2020

21-
{% block prometheus_v2_server_footer %}{% endblock %}
21+
{% block prometheus_server_footer %}{% endblock %}
2222
{% block footer %}{% endblock %}
2323

2424
USER prometheus

kolla/common/sources.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,12 +394,12 @@
394394
'releases/download/v${version}/'
395395
'ovn-exporter'
396396
'_${version}_linux_${debian_arch}.tar.gz')},
397-
'prometheus-v2-server': {
398-
'version': '2.55.1',
397+
'prometheus-server': {
398+
'version': '3.2.1',
399399
'type': 'url',
400400
'sha256': {
401-
'amd64': '19700bdd42ec31ee162e4079ebda4cd0a44432df4daa637141bdbea4b1cd8927', # noqa: E501
402-
'arm64': 'af43368bc6379c3c8bd5ac0b82208060bba22267bf01ad3ab5df56ad5725bf88'}, # noqa: E501
401+
'amd64': 'a622e3007c9109a7f470e1433cbd29bf392596715cf7eea8b81b37fa9d26b7be', # noqa: E501
402+
'arm64': 'f2dec3178f1181c1b795b275750d056e71ead13f7fbfe08b76834c4ec20b748e'}, # noqa: E501
403403
'location': ('https://github.com/'
404404
'prometheus/prometheus/'
405405
'releases/download/v${version}/'
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
features:
3+
- |
4+
Updates Prometheus version to v3.2.1. Also, switches back to
5+
the ``prometheus-server`` generic image name by removing the ``v2`` part.
6+
upgrade:
7+
- |
8+
Prometheus will be upgraded from v2 to v3 - which introduces minor breaking
9+
changes. Make sure there's version 2.5.5 or later running before attempting
10+
an upgrade. Read the official migration guide for more details:
11+
https://prometheus.io/docs/prometheus/3.0/migration/.

0 commit comments

Comments
 (0)