Skip to content

Commit 7222c9b

Browse files
committed
Upgrade Prometheus to v3
Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/945611 Change-Id: I4113976db743d3c5c4ff62f2876e224888f05a36
1 parent 9fa5022 commit 7222c9b

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

Diff for: docker/prometheus/prometheus-v2-server/Dockerfile.j2 renamed to docker/prometheus/prometheus-server/Dockerfile.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ 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

8-
{% block prometheus_v2_server_install %}
9-
ADD prometheus-v2-server-archive /prometheus-server-source
8+
{% block prometheus_server_install %}
9+
ADD prometheus-server-archive /prometheus-server-source
1010

1111
RUN ln -s /prometheus-server-source/* prometheus-server \
1212
&& mkdir -p /opt/prometheus \
1313
&& cp -r /prometheus-server/* /opt/prometheus/ \
1414
&& mkdir -p /etc/prometheus /data
1515
{% endblock %}
1616

17-
{% block prometheus_v2_server_footer %}{% endblock %}
17+
{% block prometheus_server_footer %}{% endblock %}
1818
{% block footer %}{% endblock %}
1919

2020
USER prometheus

Diff for: kolla/common/sources.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,12 @@
408408
'releases/download/v${version}/'
409409
'ovn-exporter'
410410
'_${version}_linux_${debian_arch}.tar.gz')},
411-
'prometheus-v2-server': {
412-
'version': '2.55.1',
411+
'prometheus-server': {
412+
'version': '3.2.1',
413413
'type': 'url',
414414
'sha256': {
415-
'amd64': '19700bdd42ec31ee162e4079ebda4cd0a44432df4daa637141bdbea4b1cd8927', # noqa: E501
416-
'arm64': 'af43368bc6379c3c8bd5ac0b82208060bba22267bf01ad3ab5df56ad5725bf88'}, # noqa: E501
415+
'amd64': 'a622e3007c9109a7f470e1433cbd29bf392596715cf7eea8b81b37fa9d26b7be', # noqa: E501
416+
'arm64': 'f2dec3178f1181c1b795b275750d056e71ead13f7fbfe08b76834c4ec20b748e'}, # noqa: E501
417417
'location': ('https://github.com/'
418418
'prometheus/prometheus/'
419419
'releases/download/v${version}/'
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+
'prometheus-server' generic image name by removing '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)