Skip to content

Commit 5f201c4

Browse files
authored
Merge pull request #85 from dappnode/dappnodebot/bump-upstream/prometheus/[email protected],google/[email protected],prometheus/[email protected],grafana/[email protected],grafana/[email protected]
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
2 parents 862c0c1 + 4f42d20 commit 5f201c4

File tree

3 files changed

+34
-31
lines changed

3 files changed

+34
-31
lines changed

cadvisor/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
ARG UPSTREAM_VERSION_CADVISOR
2-
3-
FROM gcr.io/cadvisor/cadvisor:${UPSTREAM_VERSION_CADVISOR}
2+
FROM ghcr.io/google/cadvisor:${UPSTREAM_VERSION_CADVISOR}

dappnode_package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"name": "dms.dnp.dappnode.eth",
3-
"version": "2.0.0",
3+
"version": "2.0.3",
44
"description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus.",
55
"shortDescription": "DAppNode Monitoring Service",
66
"type": "service",
77
"upstream": [
88
{
99
"repo": "prometheus/node_exporter",
10-
"version": "v1.9.0",
10+
"version": "v1.10.2",
1111
"arg": "UPSTREAM_VERSION_NODE_EXPORTER"
1212
},
1313
{
1414
"repo": "google/cadvisor",
15-
"version": "v0.47.1",
15+
"version": "0.55.0",
1616
"arg": "UPSTREAM_VERSION_CADVISOR"
1717
},
1818
{
1919
"repo": "prometheus/prometheus",
20-
"version": "2.52.0",
20+
"version": "v3.8.1",
2121
"arg": "UPSTREAM_VERSION_PROMETHEUS"
2222
},
2323
{
2424
"repo": "grafana/grafana",
25-
"version": "11.1.0",
25+
"version": "12.3.1",
2626
"arg": "UPSTREAM_VERSION_GRAFANA"
2727
},
2828
{
2929
"repo": "grafana/loki",
30-
"version": "3.1.1",
30+
"version": "3.6.3",
3131
"arg": "UPSTREAM_VERSION_LOKI"
3232
}
3333
],

docker-compose.yml

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,81 @@ services:
44
build:
55
context: grafana
66
args:
7-
UPSTREAM_VERSION_GRAFANA: 11.1.0
8-
image: "grafana.dms.dnp.dappnode.eth:1.0.1"
7+
UPSTREAM_VERSION_GRAFANA: 12.3.1
8+
image: grafana.dms.dnp.dappnode.eth:1.0.1
99
restart: always
1010
volumes:
11-
- "grafana_data:/var/lib/grafana"
11+
- grafana_data:/var/lib/grafana
1212
healthcheck:
13-
test: ["CMD", "curl", "-f", "http://localhost/api/health"]
13+
test:
14+
- CMD
15+
- curl
16+
- "-f"
17+
- http://localhost/api/health
1418
interval: 20s
1519
timeout: 10s
1620
retries: 5
1721
prometheus:
1822
build:
1923
context: prometheus
2024
args:
21-
UPSTREAM_VERSION_PROMETHEUS: v2.52.0
22-
image: "prometheus.dms.dnp.dappnode.eth:1.0.1"
25+
UPSTREAM_VERSION_PROMETHEUS: v3.8.1
26+
image: prometheus.dms.dnp.dappnode.eth:1.0.1
2327
restart: always
2428
volumes:
25-
- "prometheus_data:/prometheus"
26-
- "prometheus_file_sd:/prometheus_file_sd"
29+
- prometheus_data:/prometheus
30+
- prometheus_file_sd:/prometheus_file_sd
2731
environment:
2832
DATA_RETENTION_DAYS: 15
2933
manager:
3034
build: ./manager
31-
image: "manager.dms.dnp.dappnode.eth:1.0.1"
35+
image: manager.dms.dnp.dappnode.eth:1.0.1
3236
restart: always
3337
volumes:
34-
- "manager_data:/data"
35-
- "prometheus_file_sd:/prometheus_file_sd"
38+
- manager_data:/data
39+
- prometheus_file_sd:/prometheus_file_sd
3640
depends_on:
3741
grafana:
3842
condition: service_healthy
3943
node-exporter:
4044
build:
4145
context: node_exporter
4246
args:
43-
UPSTREAM_VERSION_NODE_EXPORTER: v1.9.0
47+
UPSTREAM_VERSION_NODE_EXPORTER: v1.10.2
4448
restart: always
4549
volumes:
46-
- "/:/host:ro,rslave"
50+
- /:/host:ro,rslave
4751
command:
4852
- "--path.rootfs=/host"
49-
image: "node-exporter.dms.dnp.dappnode.eth:1.0.3"
53+
image: node-exporter.dms.dnp.dappnode.eth:1.0.3
5054
cadvisor:
5155
build:
5256
context: cadvisor
5357
args:
54-
UPSTREAM_VERSION_CADVISOR: v0.47.1
58+
UPSTREAM_VERSION_CADVISOR: 0.55.0
5559
restart: always
5660
volumes:
57-
- "/:/rootfs:ro"
58-
- "/var/run:/var/run:rw"
59-
- "/sys:/sys:ro"
60-
- "/var/lib/docker/:/var/lib/docker:ro"
61-
image: "cadvisor.dms.dnp.dappnode.eth:1.0.3"
61+
- /:/rootfs:ro
62+
- /var/run:/var/run:rw
63+
- /sys:/sys:ro
64+
- /var/lib/docker/:/var/lib/docker:ro
65+
image: cadvisor.dms.dnp.dappnode.eth:1.0.3
6266
stakers-metrics:
6367
build:
6468
context: stakers-metrics
6569
dockerfile: Dockerfile
6670
restart: always
67-
image: "stakers-metrics.dms.dnp.dappnode.eth:1.0.3"
71+
image: stakers-metrics.dms.dnp.dappnode.eth:1.0.3
6872
environment:
6973
- DEBUG_MODE=false
7074
loki:
7175
build:
7276
context: loki
7377
args:
74-
UPSTREAM_VERSION_LOKI: 3.1.1
78+
UPSTREAM_VERSION_LOKI: 3.6.3
7579
command: "-config.file=/etc/loki/local-config.yaml"
7680
restart: always
77-
image: "loki.dms.dnp.dappnode.eth:1.0.1"
81+
image: loki.dms.dnp.dappnode.eth:1.0.1
7882
volumes:
7983
grafana_data: {}
8084
prometheus_data: {}

0 commit comments

Comments
 (0)