From c081560e803fa4917ddf60e6c4a8d4f24376ff83 Mon Sep 17 00:00:00 2001 From: Marketen Date: Fri, 19 Dec 2025 16:43:31 +0000 Subject: [PATCH 1/2] bump prometheus/node_exporter to v1.10.2, google/cadvisor to v0.55.0, prometheus/prometheus to v3.8.1, grafana/grafana to v12.3.1, grafana/loki to v3.6.3 --- dappnode_package.json | 12 +++++------ docker-compose.yml | 50 +++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 08989f2..2962a2e 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,33 +1,33 @@ { "name": "dms.dnp.dappnode.eth", - "version": "2.0.0", + "version": "2.0.3", "description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus.", "shortDescription": "DAppNode Monitoring Service", "type": "service", "upstream": [ { "repo": "prometheus/node_exporter", - "version": "v1.9.0", + "version": "v1.10.2", "arg": "UPSTREAM_VERSION_NODE_EXPORTER" }, { "repo": "google/cadvisor", - "version": "v0.47.1", + "version": "v0.55.0", "arg": "UPSTREAM_VERSION_CADVISOR" }, { "repo": "prometheus/prometheus", - "version": "2.52.0", + "version": "v3.8.1", "arg": "UPSTREAM_VERSION_PROMETHEUS" }, { "repo": "grafana/grafana", - "version": "11.1.0", + "version": "v12.3.1", "arg": "UPSTREAM_VERSION_GRAFANA" }, { "repo": "grafana/loki", - "version": "3.1.1", + "version": "v3.6.3", "arg": "UPSTREAM_VERSION_LOKI" } ], diff --git a/docker-compose.yml b/docker-compose.yml index ace798c..e770c59 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,17 @@ services: build: context: grafana args: - UPSTREAM_VERSION_GRAFANA: 11.1.0 - image: "grafana.dms.dnp.dappnode.eth:1.0.1" + UPSTREAM_VERSION_GRAFANA: v12.3.1 + image: grafana.dms.dnp.dappnode.eth:1.0.1 restart: always volumes: - - "grafana_data:/var/lib/grafana" + - grafana_data:/var/lib/grafana healthcheck: - test: ["CMD", "curl", "-f", "http://localhost/api/health"] + test: + - CMD + - curl + - "-f" + - http://localhost/api/health interval: 20s timeout: 10s retries: 5 @@ -18,21 +22,21 @@ services: build: context: prometheus args: - UPSTREAM_VERSION_PROMETHEUS: v2.52.0 - image: "prometheus.dms.dnp.dappnode.eth:1.0.1" + UPSTREAM_VERSION_PROMETHEUS: v3.8.1 + image: prometheus.dms.dnp.dappnode.eth:1.0.1 restart: always volumes: - - "prometheus_data:/prometheus" - - "prometheus_file_sd:/prometheus_file_sd" + - prometheus_data:/prometheus + - prometheus_file_sd:/prometheus_file_sd environment: DATA_RETENTION_DAYS: 15 manager: build: ./manager - image: "manager.dms.dnp.dappnode.eth:1.0.1" + image: manager.dms.dnp.dappnode.eth:1.0.1 restart: always volumes: - - "manager_data:/data" - - "prometheus_file_sd:/prometheus_file_sd" + - manager_data:/data + - prometheus_file_sd:/prometheus_file_sd depends_on: grafana: condition: service_healthy @@ -40,41 +44,41 @@ services: build: context: node_exporter args: - UPSTREAM_VERSION_NODE_EXPORTER: v1.9.0 + UPSTREAM_VERSION_NODE_EXPORTER: v1.10.2 restart: always volumes: - - "/:/host:ro,rslave" + - /:/host:ro,rslave command: - "--path.rootfs=/host" - image: "node-exporter.dms.dnp.dappnode.eth:1.0.3" + image: node-exporter.dms.dnp.dappnode.eth:1.0.3 cadvisor: build: context: cadvisor args: - UPSTREAM_VERSION_CADVISOR: v0.47.1 + UPSTREAM_VERSION_CADVISOR: v0.55.0 restart: always volumes: - - "/:/rootfs:ro" - - "/var/run:/var/run:rw" - - "/sys:/sys:ro" - - "/var/lib/docker/:/var/lib/docker:ro" - image: "cadvisor.dms.dnp.dappnode.eth:1.0.3" + - /:/rootfs:ro + - /var/run:/var/run:rw + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro + image: cadvisor.dms.dnp.dappnode.eth:1.0.3 stakers-metrics: build: context: stakers-metrics dockerfile: Dockerfile restart: always - image: "stakers-metrics.dms.dnp.dappnode.eth:1.0.3" + image: stakers-metrics.dms.dnp.dappnode.eth:1.0.3 environment: - DEBUG_MODE=false loki: build: context: loki args: - UPSTREAM_VERSION_LOKI: 3.1.1 + UPSTREAM_VERSION_LOKI: v3.6.3 command: "-config.file=/etc/loki/local-config.yaml" restart: always - image: "loki.dms.dnp.dappnode.eth:1.0.1" + image: loki.dms.dnp.dappnode.eth:1.0.1 volumes: grafana_data: {} prometheus_data: {} From 4f42d2060717489e0a60c6529be7bd7343c78276 Mon Sep 17 00:00:00 2001 From: Marketen Date: Fri, 19 Dec 2025 18:07:23 +0100 Subject: [PATCH 2/2] fix versioning & upstream repos --- cadvisor/Dockerfile | 3 +-- dappnode_package.json | 6 +++--- docker-compose.yml | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cadvisor/Dockerfile b/cadvisor/Dockerfile index 57db41a..869d7e4 100644 --- a/cadvisor/Dockerfile +++ b/cadvisor/Dockerfile @@ -1,3 +1,2 @@ ARG UPSTREAM_VERSION_CADVISOR - -FROM gcr.io/cadvisor/cadvisor:${UPSTREAM_VERSION_CADVISOR} +FROM ghcr.io/google/cadvisor:${UPSTREAM_VERSION_CADVISOR} diff --git a/dappnode_package.json b/dappnode_package.json index 2962a2e..e0b0ad3 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -12,7 +12,7 @@ }, { "repo": "google/cadvisor", - "version": "v0.55.0", + "version": "0.55.0", "arg": "UPSTREAM_VERSION_CADVISOR" }, { @@ -22,12 +22,12 @@ }, { "repo": "grafana/grafana", - "version": "v12.3.1", + "version": "12.3.1", "arg": "UPSTREAM_VERSION_GRAFANA" }, { "repo": "grafana/loki", - "version": "v3.6.3", + "version": "3.6.3", "arg": "UPSTREAM_VERSION_LOKI" } ], diff --git a/docker-compose.yml b/docker-compose.yml index e770c59..0aabf3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: grafana args: - UPSTREAM_VERSION_GRAFANA: v12.3.1 + UPSTREAM_VERSION_GRAFANA: 12.3.1 image: grafana.dms.dnp.dappnode.eth:1.0.1 restart: always volumes: @@ -55,7 +55,7 @@ services: build: context: cadvisor args: - UPSTREAM_VERSION_CADVISOR: v0.55.0 + UPSTREAM_VERSION_CADVISOR: 0.55.0 restart: always volumes: - /:/rootfs:ro @@ -75,7 +75,7 @@ services: build: context: loki args: - UPSTREAM_VERSION_LOKI: v3.6.3 + UPSTREAM_VERSION_LOKI: 3.6.3 command: "-config.file=/etc/loki/local-config.yaml" restart: always image: loki.dms.dnp.dappnode.eth:1.0.1