From ac79bc9b67823eab6d6e9a027a65261096cfcc19 Mon Sep 17 00:00:00 2001
From: Piotr Parczewski <piotr@stackhpc.com>
Date: Wed, 26 Mar 2025 15:34:21 +0100
Subject: Upgrade Prometheus to v3

Needed-by: https://review.opendev.org/c/openstack/kolla-ansible/+/945611

Change-Id: I4113976db743d3c5c4ff62f2876e224888f05a36
---
 docker/prometheus/prometheus-server/Dockerfile.j2  | 24 ++++++++++++++++++++++
 .../prometheus/prometheus-v2-server/Dockerfile.j2  | 24 ----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 docker/prometheus/prometheus-server/Dockerfile.j2
 delete mode 100644 docker/prometheus/prometheus-v2-server/Dockerfile.j2

(limited to 'docker')

diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2
new file mode 100644
index 000000000..bcbc3021b
--- /dev/null
+++ b/docker/prometheus/prometheus-server/Dockerfile.j2
@@ -0,0 +1,24 @@
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block prometheus_server_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% 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 %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block prometheus_server_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER prometheus
diff --git a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 b/docker/prometheus/prometheus-v2-server/Dockerfile.j2
deleted file mode 100644
index e9f47f5c1..000000000
--- a/docker/prometheus/prometheus-v2-server/Dockerfile.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block prometheus_v2_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block prometheus_v2_server_install %}
-ADD prometheus-v2-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 %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block prometheus_v2_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER prometheus
-- 
cgit v1.2.3