Skip to content

Caracal: Backport Prometheus v3 support #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stackhpc/2024.1
Choose a base branch
from
Open

Caracal: Backport Prometheus v3 support #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...etheus/prometheus-v2-server/Dockerfile.j2 → ...rometheus/prometheus-server/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% block prometheus_v2_server_header %}{% endblock %}
{% block prometheus_server_header %}{% endblock %}

{% block prometheus_v2_server_install %}
ADD prometheus-v2-server-archive /prometheus-server-source
{% block prometheus_server_install %}
ADD prometheus-server-archive /prometheus-server-source

RUN ln -s /prometheus-server-source/* prometheus-server \
&& mkdir -p /opt/prometheus \
&& cp -r /prometheus-server/* /opt/prometheus/ \
&& mkdir -p /etc/prometheus /data
{% endblock %}

{% block prometheus_v2_server_footer %}{% endblock %}
{% block prometheus_server_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER prometheus
8 changes: 4 additions & 4 deletions kolla/common/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,12 @@
'releases/download/v${version}/'
'ovn-exporter'
'_${version}_linux_${debian_arch}.tar.gz')},
'prometheus-v2-server': {
'version': '2.55.1',
'prometheus-server': {
'version': '3.2.1',
'type': 'url',
'sha256': {
'amd64': '19700bdd42ec31ee162e4079ebda4cd0a44432df4daa637141bdbea4b1cd8927', # noqa: E501
'arm64': 'af43368bc6379c3c8bd5ac0b82208060bba22267bf01ad3ab5df56ad5725bf88'}, # noqa: E501
'amd64': 'a622e3007c9109a7f470e1433cbd29bf392596715cf7eea8b81b37fa9d26b7be', # noqa: E501
'arm64': 'f2dec3178f1181c1b795b275750d056e71ead13f7fbfe08b76834c4ec20b748e'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/prometheus/'
'releases/download/v${version}/'
Expand Down
11 changes: 11 additions & 0 deletions releasenotes/notes/upgrade-prometheus-to-v3-d305280498e0fcaf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
features:
- |
Updates Prometheus version to v3.2.1. Also, switches back to
'prometheus-server' generic image name by removing 'v2' part.
upgrade:
- |
Prometheus will be upgraded from v2 to v3 - which introduces minor breaking
changes. Make sure there's version 2.5.5 or later running before attempting
an upgrade. Read the official migration guide for more details:
https://prometheus.io/docs/prometheus/3.0/migration/.
Loading