Compare commits

...

4 Commits

Author SHA1 Message Date
1e02f358ed chore: publish 2.4.1+v2.10.3 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-10 09:51:42 +02:00
6cdcc25384 chore: publish 2.4.0+v2.10.1 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-25 13:40:08 +02:00
d2b7b671f5 feat: use host mode port networking
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2023-05-25 13:34:35 +02:00
c9d80df34d feat: enable public facing metrics 2023-05-25 13:34:34 +02:00
5 changed files with 18 additions and 3 deletions

View File

@ -63,6 +63,7 @@ COMPOSE_FILE="compose.yml"
## Enable prometheus metrics collection
## used used by the coop-cloud monitoring stack
#COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
#METRICS_ENABLED=1
#####################################################################

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v16
export TRAEFIK_YML_VERSION=v17
export FILE_PROVIDER_YML_VERSION=v8
export ENTRYPOINT_VERSION=v2

9
compose.metrics.yml Normal file
View File

@ -0,0 +1,9 @@
version: "3.8"
services:
app:
environment:
- METRICS_ENABLED
ports:
- target: 8082
published: 8082
mode: host

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "traefik:v2.10.1"
image: "traefik:v2.10.3"
# 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
@ -47,7 +47,7 @@ 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=2.3.1+v2.10.2"
- "coop-cloud.${STACK_NAME}.version=2.4.1+v2.10.3"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks:

View File

@ -67,6 +67,9 @@ entrypoints:
{{ if eq (env "METRICS_ENABLED") "1" }}
metrics:
address: ":8082"
http:
middlewares:
- basicauth@file
{{ end }}
{{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
matrix-federation:
@ -80,6 +83,8 @@ ping:
metrics:
prometheus:
entryPoint: metrics
addRoutersLabels: true
addServicesLabels: true
{{ end }}
certificatesResolvers: