From b7b46c75498c826a1d720451ca3ec6e4d634fde9 Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 14:46:56 +0200 Subject: [PATCH 1/7] Upgrade syntax for compose v2 --- Makefile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 73a9d2e..98d03c5 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,33 @@ all: - PKG=all docker-compose run --rm build - PKG=prometheus docker-compose run --rm nfpm-rpm - PKG=prometheus docker-compose run --rm nfpm-deb - PKG=alertmanager docker-compose run --rm nfpm-rpm - PKG=alertmanager docker-compose run --rm nfpm-deb - PKG=postgres_exporter docker-compose run --rm nfpm-rpm - PKG=postgres_exporter docker-compose run --rm nfpm-deb - PKG=node_exporter docker-compose run --rm nfpm-rpm - PKG=node_exporter docker-compose run --rm nfpm-deb + PKG=all docker compose run --rm build + PKG=prometheus docker compose run --rm nfpm-rpm + PKG=prometheus docker compose run --rm nfpm-deb + PKG=alertmanager docker compose run --rm nfpm-rpm + PKG=alertmanager docker compose run --rm nfpm-deb + PKG=postgres_exporter docker compose run --rm nfpm-rpm + PKG=postgres_exporter docker compose run --rm nfpm-deb + PKG=node_exporter docker compose run --rm nfpm-rpm + PKG=node_exporter docker compose run --rm nfpm-deb prometheus-pkgs: - PKG=prometheus docker-compose run --rm build - PKG=prometheus docker-compose run --rm nfpm-rpm - PKG=prometheus docker-compose run --rm nfpm-deb + PKG=prometheus docker compose run --rm build + PKG=prometheus docker compose run --rm nfpm-rpm + PKG=prometheus docker compose run --rm nfpm-deb prometheus-alertmanager: - PKG=alertmanager docker-compose run --rm build - PKG=alertmanager docker-compose run --rm nfpm-rpm - PKG=alertmanager docker-compose run --rm nfpm-deb + PKG=alertmanager docker compose run --rm build + PKG=alertmanager docker compose run --rm nfpm-rpm + PKG=alertmanager docker compose run --rm nfpm-deb postgres_exporter: - PKG=postgres_exporter docker-compose run --rm build - PKG=postgres_exporter docker-compose run --rm nfpm-rpm - PKG=postgres_exporter docker-compose run --rm nfpm-deb + PKG=postgres_exporter docker compose run --rm build + PKG=postgres_exporter docker compose run --rm nfpm-rpm + PKG=postgres_exporter docker compose run --rm nfpm-deb node_exporter: - PKG=node_exporter docker-compose run --rm build - PKG=node_exporter docker-compose run --rm nfpm-rpm - PKG=node_exporter docker-compose run --rm nfpm-deb + PKG=node_exporter docker compose run --rm build + PKG=node_exporter docker compose run --rm nfpm-rpm + PKG=node_exporter docker compose run --rm nfpm-deb clean: rm -rf _build/ From 2af64bfc03411d6df57116d6509d96d61f5a31f3 Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 14:50:34 +0200 Subject: [PATCH 2/7] Upgrade prometheus to 3.13.1 --- build.sh | 2 +- nfpm/prometheus.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index e4c67b7..fd7d0c9 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ build_prometheus() { # Prometheus version - VERSION="3.2.1" + VERSION="3.13.1" wget https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz -O _build/prometheus-${VERSION}.tar.gz -c mkdir -p _build/prometheus diff --git a/nfpm/prometheus.yaml b/nfpm/prometheus.yaml index 3710434..ab88e92 100644 --- a/nfpm/prometheus.yaml +++ b/nfpm/prometheus.yaml @@ -5,7 +5,7 @@ name: "prometheus" arch: "amd64" platform: "linux" -version: "v3.2.1" +version: "v3.13.1" section: "database" priority: "optional" replaces: From 3e555ad081c40e14dd4cbaf7918932c352b4b2e4 Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 14:52:08 +0200 Subject: [PATCH 3/7] Upgrade alertmanager to 0.33.1 --- build.sh | 2 +- nfpm/alertmanager.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index fd7d0c9..5e0f415 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,7 @@ build_prometheus() { build_alertmanager() { # alertmanager version - VERSION="0.28.1" + VERSION="0.33.1" wget https://github.com/prometheus/alertmanager/releases/download/v${VERSION}/alertmanager-${VERSION}.linux-amd64.tar.gz -O _build/alertmanager-${VERSION}.tar.gz -c mkdir -p _build/alertmanager diff --git a/nfpm/alertmanager.yaml b/nfpm/alertmanager.yaml index a97a286..e608b37 100644 --- a/nfpm/alertmanager.yaml +++ b/nfpm/alertmanager.yaml @@ -5,7 +5,7 @@ name: "prometheus-alertmanager" arch: "amd64" platform: "linux" -version: "0.28.1" +version: "0.33.1" section: "database" priority: "optional" replaces: From 6da36ecf56784c08c06df6fbc36dba5134a5488c Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 14:54:14 +0200 Subject: [PATCH 4/7] Upgrade postgres-exporter to 0.20.1 --- build.sh | 2 +- nfpm/postgres_exporter.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5e0f415..223fae3 100755 --- a/build.sh +++ b/build.sh @@ -30,7 +30,7 @@ build_alertmanager() { build_postgres_exporter() { # postgres_exporter version - VERSION="0.17.1" + VERSION="0.20.1" wget https://github.com/prometheus-community/postgres_exporter/releases/download/v${VERSION}/postgres_exporter-${VERSION}.linux-amd64.tar.gz -O _build/postgres_exporter-${VERSION}.tar.gz -c mkdir -p _build/postgres_exporter diff --git a/nfpm/postgres_exporter.yaml b/nfpm/postgres_exporter.yaml index 0e1ca5e..d707f54 100644 --- a/nfpm/postgres_exporter.yaml +++ b/nfpm/postgres_exporter.yaml @@ -5,7 +5,7 @@ name: "prometheus-postgres-exporter" arch: "amd64" platform: "linux" -version: "v0.17.1" +version: "v0.20.1" section: "database" priority: "optional" replaces: From 807e0537c64f7614fdc79e2c56891fe1773f3221 Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 14:56:51 +0200 Subject: [PATCH 5/7] Upgrade node-exporter to 1.12.1 --- build.sh | 2 +- nfpm/node_exporter.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 223fae3..5b01657 100755 --- a/build.sh +++ b/build.sh @@ -44,7 +44,7 @@ build_postgres_exporter() { build_node_exporter() { # node_exporter version - VERSION="1.9.0" + VERSION="1.12.1" wget https://github.com/prometheus/node_exporter/releases/download/v${VERSION}/node_exporter-${VERSION}.linux-amd64.tar.gz -O _build/node_exporter-${VERSION}.tar.gz -c mkdir -p _build/node_exporter diff --git a/nfpm/node_exporter.yaml b/nfpm/node_exporter.yaml index 8b7b9c9..dccc636 100644 --- a/nfpm/node_exporter.yaml +++ b/nfpm/node_exporter.yaml @@ -5,7 +5,7 @@ name: "prometheus-node-exporter" arch: "amd64" platform: "linux" -version: "1.9.0" +version: "1.12.1" section: "database" priority: "optional" replaces: From 15df9b3c2b425505d978a8cacfaf4e12b74356d7 Mon Sep 17 00:00:00 2001 From: arno Date: Wed, 22 Jul 2026 17:00:40 +0200 Subject: [PATCH 6/7] Run RPM tests on rockylinux:9 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8a126e4..5bced4a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest needs: build-packages-workflow container: - image: rockylinux:8 + image: rockylinux:9 options: --cpus 1 steps: - name: Download Prometheus Artifacts From ac6ca54d43f88356a6e3d81e5ef8109ce54cb8b9 Mon Sep 17 00:00:00 2001 From: arno Date: Thu, 23 Jul 2026 09:29:14 +0200 Subject: [PATCH 7/7] tests: wait 5 seconds for prometheus to start before checking it --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5bced4a..e854ece 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,6 +31,9 @@ jobs: --web.console.libraries=/var/lib/prometheus/console_libraries \ --web.enable-lifecycle &>/dev/null & + - name: Wait for prometheus + run: sleep 5 + - name: Check Prometheus run: curl http://localhost:9090/-/healthy @@ -69,6 +72,9 @@ jobs: --web.console.libraries=/var/lib/prometheus/console_libraries \ --web.enable-lifecycle &>/dev/null & + - name: Wait for prometheus + run: sleep 5 + - name: Check Prometheus run: curl http://localhost:9090/-/healthy