Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6ba592774 | ||
|
|
39e52668d2 | ||
|
|
ca4f4113d9 | ||
|
|
0059b9011f | ||
|
|
7c1c36e23a |
+6
-2
@@ -139,10 +139,14 @@ WRITE_TIMEOUT=0s
|
||||
#####################################################################
|
||||
|
||||
## Enable prometheus metrics collection
|
||||
## used used by the coop-cloud monitoring stack
|
||||
## BASIC_AUTH should also be enabled
|
||||
## Metrics are served unauthenticated on :8082, reachable only from
|
||||
## other services on the proxy network (e.g. monitoring-ng's Alloy,
|
||||
## which auto-discovers it via the prometheus.io/scrape label)
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
|
||||
#METRICS_ENABLED=1
|
||||
|
||||
## Setting METRICS_FQDN also adds a public metrics endpoint (behind
|
||||
## basic auth). BASIC_AUTH should be enabled for this.
|
||||
#METRICS_FQDN=metrics.traefik.example.com
|
||||
|
||||
#####################################################################
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export TRAEFIK_YML_VERSION=v34
|
||||
export FILE_PROVIDER_YML_VERSION=v12
|
||||
export TRAEFIK_YML_VERSION=v35
|
||||
export FILE_PROVIDER_YML_VERSION=v13
|
||||
export ENTRYPOINT_VERSION=v5
|
||||
export ANUBIS_YML_VERSION=v1
|
||||
|
||||
@@ -3,3 +3,9 @@ services:
|
||||
app:
|
||||
environment:
|
||||
- METRICS_ENABLED
|
||||
deploy:
|
||||
labels:
|
||||
# lets monitoring-ng's Alloy auto-discover and scrape metrics-internal
|
||||
# via the proxy network.
|
||||
- "prometheus.io/scrape=true"
|
||||
- "prometheus.io/port=8082"
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: "traefik:v3.7.10"
|
||||
image: "traefik:v3.7.12"
|
||||
# Note(decentral1se): *please do not* add any additional ports here.
|
||||
# Doing so could break new installs with port conflicts. Please use
|
||||
# the usual `compose.$app.yml` approach for any additional ports
|
||||
@@ -57,12 +57,12 @@ services:
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
||||
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
|
||||
- "coop-cloud.${STACK_NAME}.version=6.1.0+v3.7.10"
|
||||
- "coop-cloud.${STACK_NAME}.version=6.2.0+v3.7.12"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
|
||||
socket-proxy:
|
||||
image: lscr.io/linuxserver/socket-proxy:3.4.3
|
||||
image: lscr.io/linuxserver/socket-proxy:3.4.4
|
||||
deploy:
|
||||
endpoint_mode: dnsrr
|
||||
environment:
|
||||
|
||||
@@ -32,6 +32,7 @@ http:
|
||||
stsSeconds: "31536000"
|
||||
{{ if eq (env "METRICS_ENABLED") "1" }}
|
||||
routers:
|
||||
{{ if ne (env "METRICS_FQDN") "" }}
|
||||
traefik-metrics:
|
||||
rule: "Host(`{{ env "METRICS_FQDN" }}`)"
|
||||
entrypoints:
|
||||
@@ -41,6 +42,14 @@ http:
|
||||
middlewares:
|
||||
- basicauth@file
|
||||
service: prometheus@internal
|
||||
{{ end }}
|
||||
# reachable from other services on the proxy network only (this port
|
||||
# isn't published to the host), without auth
|
||||
traefik-metrics-internal:
|
||||
rule: "PathPrefix(`/`)"
|
||||
entrypoints:
|
||||
- metrics-internal
|
||||
service: prometheus@internal
|
||||
{{ end }}
|
||||
|
||||
tls:
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
1. compose.metrics.yml now adds prometheus.io/scrape labels so services like monitoring-ng can automatically discover and scrape Traefik's metrics.
|
||||
@@ -131,6 +131,10 @@ entrypoints:
|
||||
onion:
|
||||
address: ":9052"
|
||||
{{- end }}
|
||||
{{- if eq (env "METRICS_ENABLED") "1" }}
|
||||
metrics-internal:
|
||||
address: ":8082"
|
||||
{{- end }}
|
||||
|
||||
ping:
|
||||
entryPoint: web
|
||||
|
||||
Reference in New Issue
Block a user