Commit 4b78c8d6 authored by PICHOU Kyâne's avatar PICHOU Kyâne
Browse files

Use prometheus exporter for etherpad

parent 2ea5e420
## Version 1.8.6-1
Cette version de l'image Docker n'introduit aucun changement dans la version de Etherpad, mais retire le module `ep_pads_stats` pour le remplacer par `ep_prometheus_exporter`
## Version 1.8.6
Ajout d'un script de suppression externe pour la suppression des pads, pour éviter une surcharge de l'instance lors de la boucle de suppression interne.
......
......@@ -53,7 +53,7 @@ ARG ETHERPAD_PLUGINS="\
ep_adminpads2 ep_align ep_author_hover ep_back_button ep_chatdate \
ep_comments_page ep_delete_after_delay ep_delete_empty_pads ep_font_color \
ep_font_family ep_headings2 ep_message_all ep_pad_activity_nofication_in_title \
ep_pads_stats ep_prompt_for_name ep_set_title_on_pad \
ep_prometheus_exporter ep_prompt_for_name ep_set_title_on_pad \
ep_subscript_and_superscript"
# Try to stick to the LDAP UID for etherpad (OU=services)
......
......@@ -28,7 +28,7 @@ services:
restart: unless-stopped
app:
image: registry.picasoft.net/pica-etherpad:1.8.6
image: registry.picasoft.net/pica-etherpad:1.8.6-1
build: ..
container_name: etherpad_app
env_file: ./secrets/etherpad-app.secrets
......@@ -39,6 +39,12 @@ services:
labels:
traefik.http.routers.etherpad-app.entrypoints: websecure
traefik.http.routers.etherpad-app.rule: Host(`pad.picasoft.net`)
traefik.http.routers.etherpad-app.service: etherpad-app
traefik.http.routers.etherpad-metrics.entrypoints: websecure
traefik.http.routers.etherpad-metrics.rule: "Host(`pad.picasoft.net`) && PathPrefix(`/metrics`)"
traefik.http.routers.etherpad-metrics.service: etherpad-app
traefik.http.routers.etherpad-metrics.middlewares: "etherpad-metrics-auth@docker"
traefik.http.middlewares.etherpad-metrics-auth.basicauth.users: "etherpad:$$apr1$$gXZstZEX$$lmu5PH3wYtDTbqXoOj/Ce0"
traefik.http.services.etherpad-app.loadbalancer.server.port: 8080
traefik.enable: true
environment:
......
......@@ -131,5 +131,9 @@
"ep_comments_page": {
"displayCommentAsIcon": true,
"highlightSelectedText": false
},
"ep_prometheus_exporter": {
"instanceName": "pad.picasoft.net",
"updateInterval": 30
}
}
......@@ -28,7 +28,7 @@ services:
restart: unless-stopped
app:
image: registry.picasoft.net/pica-etherpad:1.8.6
image: registry.picasoft.net/pica-etherpad:1.8.6-1
build: ..
container_name: etherpad_week_app
env_file: ./secrets/etherpad-week-app.secrets
......@@ -37,9 +37,15 @@ services:
- api-key:/mountedAPIkey
command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
labels:
traefik.http.routers.etherpad-app.entrypoints: websecure
traefik.http.routers.etherpad-app.rule: Host(`week.pad.picasoft.net`)
traefik.http.services.etherpad-app.loadbalancer.server.port: 8080
traefik.http.routers.etherpad-week-app.entrypoints: websecure
traefik.http.routers.etherpad-week-app.rule: Host(`week.pad.picasoft.net`)
traefik.http.routers.etherpad-week-app.service: etherpad-week-app
traefik.http.routers.etherpad-week-metrics.entrypoints: websecure
traefik.http.routers.etherpad-week-metrics.rule: "Host(`week.pad.picasoft.net`) && PathPrefix(`/metrics`)"
traefik.http.routers.etherpad-week-metrics.service: etherpad-week-app
traefik.http.routers.etherpad-week-metrics.middlewares: "etherpad-week-metrics-auth@docker"
traefik.http.middlewares.etherpad-week-metrics-auth.basicauth.users: "etherpad-week:$$apr1$$9q3oTEfR$$mu2vt3ju6y1.uB2SBE7rh0"
traefik.http.services.etherpad-week-app.loadbalancer.server.port: 8080
traefik.enable: true
environment:
DB_HOST: "etherpad_week_db"
......
......@@ -131,5 +131,9 @@
"ep_comments_page": {
"displayCommentAsIcon": true,
"highlightSelectedText": false
},
"ep_prometheus_exporter": {
"instanceName": "week.pad.picasoft.net",
"updateInterval": 30
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment