diff --git a/pica-etherpad/CHANGELOG.md b/pica-etherpad/CHANGELOG.md index 18f2bf5c40daf2501c8d22d24cfcd674c077b04c..6cb2ca82e0ca082e96f8f7d4daff701f11f60f1c 100644 --- a/pica-etherpad/CHANGELOG.md +++ b/pica-etherpad/CHANGELOG.md @@ -1,3 +1,7 @@ +## 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. diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile index 8c2c946bc070959bba55110581c79a710e7273e0..560f63f4d3514b68c3fe26dee7e4035e0a33176f 100644 --- a/pica-etherpad/Dockerfile +++ b/pica-etherpad/Dockerfile @@ -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) diff --git a/pica-etherpad/standard/docker-compose.yml b/pica-etherpad/standard/docker-compose.yml index 0ff2f2a6c6a03616313df37103e59993b3b2c69d..fb8d80e29e8be0bef9fab46f2d987e8e9674fe82 100644 --- a/pica-etherpad/standard/docker-compose.yml +++ b/pica-etherpad/standard/docker-compose.yml @@ -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: diff --git a/pica-etherpad/standard/settings.json b/pica-etherpad/standard/settings.json index 98a2d8666a684abdf8454ef02c7e7132a9b1317e..04bd08f9a6a599f692ee62d21dcb9e717a0aa8a8 100644 --- a/pica-etherpad/standard/settings.json +++ b/pica-etherpad/standard/settings.json @@ -131,5 +131,9 @@ "ep_comments_page": { "displayCommentAsIcon": true, "highlightSelectedText": false + }, + "ep_prometheus_exporter": { + "instanceName": "pad.picasoft.net", + "updateInterval": 30 } } diff --git a/pica-etherpad/week/docker-compose.yml b/pica-etherpad/week/docker-compose.yml index 7e5365151cf9d2c5f4bf4f8cec57365cc752a205..3b77ca368cf3c520b4a32bcf38c40d1b470243c7 100644 --- a/pica-etherpad/week/docker-compose.yml +++ b/pica-etherpad/week/docker-compose.yml @@ -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" diff --git a/pica-etherpad/week/settings.json b/pica-etherpad/week/settings.json index 81b3a1c0b00753ce9df3025bf8a94508d3498604..4353628bc3796c4152e57f932617bf8824c3da49 100644 --- a/pica-etherpad/week/settings.json +++ b/pica-etherpad/week/settings.json @@ -131,5 +131,9 @@ "ep_comments_page": { "displayCommentAsIcon": true, "highlightSelectedText": false + }, + "ep_prometheus_exporter": { + "instanceName": "week.pad.picasoft.net", + "updateInterval": 30 } } diff --git a/pica-metrologie/pica-metrics-bot/config.json b/pica-metrologie/pica-metrics-bot/config.json index 17c607cf4a371317279c825b463c520370f1f87d..0147366392f04d95e09184b307d91dc246507424 100644 --- a/pica-metrologie/pica-metrics-bot/config.json +++ b/pica-metrologie/pica-metrics-bot/config.json @@ -4,16 +4,6 @@ "database": "picasoft" }, "modules": { - "etherpad": [ - { - "url": "https://pad.picasoft.net", - "name": "pad.picasoft.net" - }, - { - "url": "https://week.pad.picasoft.net", - "name": "week.pad.picasoft.net" - } - ], "mattermost": [ { "url": "https://team.picasoft.net", diff --git a/pica-metrologie/secrets/exporters-auth.secrets.example b/pica-metrologie/secrets/exporters-auth.secrets.example index 5668e41f0a435563018baf83429293629d81a327..bad7aee98d2dd4ab51273b6a30a2e52a12aa587d 100644 --- a/pica-metrologie/secrets/exporters-auth.secrets.example +++ b/pica-metrologie/secrets/exporters-auth.secrets.example @@ -1,2 +1,6 @@ CODIMD_METRICS_USER=codimd CODIMD_METRICS_PASSWORD=superpassword +ETHERPAD_METRICS_USER=etherpad +ETHERPAD_METRICS_PASSWORD=superpassword +ETHERPAD_WEEK_METRICS_USER=etherpad-week +ETHERPAD_WEEK_METRICS_PASSWORD=superpassword diff --git a/pica-metrologie/vmagent-prom.yml b/pica-metrologie/vmagent-prom.yml index 9a7b268b75e70d5098dcbc24fa6e80e286ece5ce..3fb4cd539578da8ba8b190f350aed9e8fc3e1b5c 100644 --- a/pica-metrologie/vmagent-prom.yml +++ b/pica-metrologie/vmagent-prom.yml @@ -53,6 +53,23 @@ scrape_configs: regex: ".*" target_label: instance replacement: "md.picasoft.net" + # Scrape Etherpad metrics + - job_name: etherpad + scheme: "https" + basic_auth: + username: "%{ETHERPAD_METRICS_USER}" + password: "%{ETHERPAD_METRICS_PASSWORD}" + static_configs: + - targets: + - "pad.picasoft.net" + - job_name: etherpad-week + scheme: "https" + basic_auth: + username: "%{ETHERPAD_WEEK_METRICS_USER}" + password: "%{ETHERPAD_WEEK_METRICS_PASSWORD}" + static_configs: + - targets: + - "week.pad.picasoft.net" # Scrape Picasoft servers node-exporter - job_name: "pica01" static_configs: