KAZ/KazV2
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade grafana

Browse Source 
suppr les tags latest et mise en place du pinning
This commit is contained in:
fab
2026-09-05 09:40:35 +02:00
parent 32acfccd45
commit 18ad003a69
4 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dockers/cadvisor/docker-compose.yml
+1 -4
View File
@@ -1,7 +1,7 @@
services: services:
cadvisor: cadvisor:
image: gcr.io/cadvisor/cadvisor:v0.52.0 image: ghcr.io/google/cadvisor:v0.60.5
container_name: cadvisor container_name: cadvisor
command: command:
- "--store_container_labels=false" - "--store_container_labels=false"
@@ -16,14 +16,11 @@ services:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.cadvisor-secure.entrypoints=websecure" - "traefik.http.routers.cadvisor-secure.entrypoints=websecure"
- "traefik.http.routers.cadvisor-secure.rule=Host(`cadvisor-${site}.${domain}`)" - "traefik.http.routers.cadvisor-secure.rule=Host(`cadvisor-${site}.${domain}`)"
#- "traefik.http.routers.grafana-secure.tls=true"
- "traefik.http.routers.cadvisor-secure.service=cadvisor" - "traefik.http.routers.cadvisor-secure.service=cadvisor"
- "traefik.http.routers.cadvisor-secure.middlewares=test-adminipallowlist@file" - "traefik.http.routers.cadvisor-secure.middlewares=test-adminipallowlist@file"
- "traefik.http.services.cadvisor.loadbalancer.server.port=8080" - "traefik.http.services.cadvisor.loadbalancer.server.port=8080"
- "traefik.docker.network=traefikNet" - "traefik.docker.network=traefikNet"
# ports:
# - 8098:8080
volumes: volumes:
- /:/rootfs:ro - /:/rootfs:ro
- /var/run:/var/run:ro - /var/run:/var/run:ro
dockers/grafana/docker-compose.yml
+2 -15
View File
@@ -1,7 +1,7 @@
services: services:
prometheus: prometheus:
image: prom/prometheus:v3.3.0 image: prom/prometheus:v3.14.0
restart: unless-stopped restart: unless-stopped
container_name: ${prometheusServName} container_name: ${prometheusServName}
volumes: volumes:
@@ -10,27 +10,15 @@ services:
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
command: command:
# - "--web.route-prefix=/"
# - "--web.external-url=https://prometheus.${domain}"
- "--config.file=/etc/prometheus/prometheus.yml" - "--config.file=/etc/prometheus/prometheus.yml"
- "--storage.tsdb.path=/prometheus" - "--storage.tsdb.path=/prometheus"
- "--web.console.libraries=/usr/share/prometheus/console_libraries" - "--web.console.libraries=/usr/share/prometheus/console_libraries"
- "--web.console.templates=/usr/share/prometheus/consoles" - "--web.console.templates=/usr/share/prometheus/consoles"
networks: networks:
- traefikNet - traefikNet
# labels:
# - "traefik.enable=true"
# - "traefik.http.routers.prometheus-secure.entrypoints=websecure"
# - "traefik.http.middlewares.prometheus-stripprefix.stripprefix.prefixes=/prometheus"
# - "traefik.http.routers.prometheus-secure.rule=Host(`prometheus.${domain}`)"
# # - "traefik.http.routers.prometheus-secure.tls=true"
# - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminiallowlist@file,traefik-auth"
# - "traefik.http.routers.prometheus-secure.service=prometheus"
# - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
# - "traefik.docker.network=traefikNet"
grafana: grafana:
image: grafana/grafana:11.6.0 image: grafana/grafana:13.2.1
restart: unless-stopped restart: unless-stopped
container_name: ${grafanaServName} container_name: ${grafanaServName}
volumes: volumes:
@@ -49,7 +37,6 @@ services:
- "traefik.http.routers.grafana-secure.entrypoints=websecure" - "traefik.http.routers.grafana-secure.entrypoints=websecure"
- "traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/grafana" - "traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/grafana"
- "traefik.http.routers.grafana-secure.rule=Host(`grafana.${domain}`)" - "traefik.http.routers.grafana-secure.rule=Host(`grafana.${domain}`)"
#- "traefik.http.routers.grafana-secure.tls=true"
- "traefik.http.routers.grafana-secure.service=grafana" - "traefik.http.routers.grafana-secure.service=grafana"
- "traefik.http.routers.grafana-secure.middlewares=grafana-stripprefix,test-adminipallowlist@file,traefik-auth" - "traefik.http.routers.grafana-secure.middlewares=grafana-stripprefix,test-adminipallowlist@file,traefik-auth"
- "traefik.http.services.grafana.loadbalancer.server.port=3000" - "traefik.http.services.grafana.loadbalancer.server.port=3000"
dockers/portainer/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services: services:
portainer: portainer:
image: portainer/portainer-ce:latest image: portainer/portainer-ce:2.45.0
container_name: portainer container_name: portainer
ports: ports:
- 9000:9000 - 9000:9000
dockers/portainer_agent/docker-compose.yml
+1 -1
View File
@@ -1,6 +1,6 @@
services: services:
edge_agent: edge_agent:
image: portainer/agent:latest image: portainer/agent:2.45.0
environment: environment:
- EDGE=1 - EDGE=1
- CAP_HOST_MANAGEMENT=1 - CAP_HOST_MANAGEMENT=1