Compare commits

...

5 Commits

Author SHA1 Message Date
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
aaa34c1ea8 chore: publish 2.3.1+v2.10.2 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-24 11:36:27 +02:00
6dee438492 fix: increase config version
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-24 11:33:31 +02:00
ff668b2266 chore: publish 2.3.0+v2.10.2 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-24 11:31:20 +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 ## Enable prometheus metrics collection
## used used by the coop-cloud monitoring stack ## used used by the coop-cloud monitoring stack
#COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
#METRICS_ENABLED=1 #METRICS_ENABLED=1
##################################################################### #####################################################################

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v16 export TRAEFIK_YML_VERSION=v17
export FILE_PROVIDER_YML_VERSION=v7 export FILE_PROVIDER_YML_VERSION=v8
export ENTRYPOINT_VERSION=v2 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

@ -47,7 +47,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.service=api@internal" - "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file" - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=2.2.0+v2.10.2" - "coop-cloud.${STACK_NAME}.version=2.3.1+v2.10.2"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks: networks:

View File

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