From 96c31990d0e5327e5a1851ab218aaf38cfc0049f Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 23 Feb 2023 20:25:47 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c854538..5da0b1e 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,7 @@ Configuration template:
 conf.probe.types=Etherpad
 conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
+conf.probe.httpaccesslog.filepath=
 # This parameter requires real ip proxy setting and log output setting.
 conf.probe.etherpad.logs=/var/log/etherpad/output.log
 # Database URL. Example of the most frequent cases:
@@ -168,6 +169,7 @@ Configuration template:
 conf.probe.types=Gitea
 conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
+conf.probe.httpaccesslog.filepath=
 conf.probe.gitea.data=/opt/gitea/data
 conf.probe.gitea.api.url=https://forge.libre-service.eu/
 conf.probe.gitea.token=b6598c616b1cd350b834258205da4e5e8b951005
@@ -199,6 +201,7 @@ Configuration template:
 conf.probe.types=LibreQR
 conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
+conf.probe.httpaccesslog.filepath=
 conf.probe.libreqr.datafiles=/var/www/foo.bar.org/temp/
 conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties
 ```
@@ -241,6 +244,7 @@ Configuration template:
 conf.probe.types=Nextcloud
 conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
+conf.probe.httpaccesslog.filepath=
 conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties
 ```
 
@@ -254,6 +258,7 @@ Configuration template:
 conf.probe.types=PrivateBin
 conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
+conf.probe.httpaccesslog.filepath=
 conf.probe.privatebin.data=/var/www/paste.libre-service.eu/data/
 conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties
 ```
@@ -269,13 +274,11 @@ conf.probe.httperrorlog.file=/var/log/apache2/foo.bar.org-error.log*
 conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties
 
 # Custom access log pattern with Java regex.
-# Default: ^(?<remoteAddress>[a-zA-F0-9\:\.]+) - (?<remoteUser>[^\[]+) \[(?<time>[^\]]+)\] "(?<request>.*)" (?<status>\d+) (?<bodyBytesSent>\d+) "(?<referer>.*)" "(?<userAgent>[^"]*)".*$ 
+# Default: ^(?<remoteAddress>[a-fA-F0-9\:\.]+) - (?<remoteUser>[^\[]+) \[(?<time>[^\]]+)\] "(?<request>.*)" (?<status>\d+) (?<bodyBytesSent>\d+) "(?<referer>.*)" "(?<userAgent>[^"]*)".*$ 
 conf.probe.httpaccesslog.pattern=
 
-# Filter request with Java regex.
-# In access log file, request starts with method (GET, PUT, HEAD…).
-# Default: 
-request=^\S+ /.*well-known.*$
+# Filter request with Java regex (without the initial '^' and without the final '$').
+# Example: filterpath=/.*well-known.*
 ```
 
 Warning: to have month metric values, you have to set **retention log to 7 weeks or 50 days** in Nginx or Apache logrotate configuration.