Compare commits
4 Commits
2.3.1+v2.1
...
2.4.1+v2.1
Author | SHA1 | Date | |
---|---|---|---|
1e02f358ed | |||
6cdcc25384 | |||
d2b7b671f5 | |||
c9d80df34d |
@ -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
|
||||
|
||||
#####################################################################
|
||||
|
2
abra.sh
2
abra.sh
@ -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
9
compose.metrics.yml
Normal file
@ -0,0 +1,9 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
environment:
|
||||
- METRICS_ENABLED
|
||||
ports:
|
||||
- target: 8082
|
||||
published: 8082
|
||||
mode: host
|
@ -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:
|
||||
|
@ -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:
|
||||
|
Reference in New Issue
Block a user