minor fixes

This commit is contained in:
tom.chivert 2024-03-19 17:38:32 +01:00
parent 33c19ea94b
commit 35d29a4015
2 changed files with 5 additions and 3 deletions

View File

@ -23833,7 +23833,7 @@
}, },
"timezone": "browser", "timezone": "browser",
"title": "Node Exporter", "title": "Node Exporter",
"uid": "yPhvsDP7k", "uid": "rYdddlPWk",
"version": 1, "version": 1,
"weekStart": "" "weekStart": ""
} }

View File

@ -58,7 +58,10 @@ services:
- grafana - grafana
{% if grafana_traefik_enable is defined %} {% if grafana_traefik_enable is defined %}
- traefik - traefik
{% endif %}
labels: labels:
com.centurylinklabs.watchtower.enable: {{ grafana_watchtower_enable | default('true') }}
{% if grafana_traefik_enable is defined %}
traefik.enable: true traefik.enable: true
traefik.docker.network: traefik traefik.docker.network: traefik
traefik.http.routers.grafana.rule: Host(`{{ grafana_domain|default(omit) }}`) traefik.http.routers.grafana.rule: Host(`{{ grafana_domain|default(omit) }}`)
@ -66,12 +69,11 @@ services:
traefik.http.routers.grafana.tls.certresolver: letsencrypt traefik.http.routers.grafana.tls.certresolver: letsencrypt
traefik.http.routers.grafana.entrypoints: "{{ grafana_traefik_entrypoint }}" traefik.http.routers.grafana.entrypoints: "{{ grafana_traefik_entrypoint }}"
traefik.http.services.grafana.loadbalancer.server.port: 3000 traefik.http.services.grafana.loadbalancer.server.port: 3000
{% else %}
{% if grafana_traefik_ipwhitelist is defined %} {% if grafana_traefik_ipwhitelist is defined %}
traefik.http.middlewares.grafana-clientips.ipwhitelist.sourcerange: {{ grafana_traefik_ipwhitelist }} traefik.http.middlewares.grafana-clientips.ipwhitelist.sourcerange: {{ grafana_traefik_ipwhitelist }}
traefik.http.routers.grafana.middlewares: "grafana-clientips@docker" traefik.http.routers.grafana.middlewares: "grafana-clientips@docker"
{% endif %} {% endif %}
com.centurylinklabs.watchtower.enable: {{ grafana_watchtower_enable | default('true') }} {% else %}
ports: ports:
- "{{ grafana_port | default(3000) }}:3000" - "{{ grafana_port | default(3000) }}:3000"
{% endif %} {% endif %}