From 4c2869862f15012dd45d37ce767260220c093af8 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 16:30:38 +0100
Subject: [PATCH 01/11] =?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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 242ebbc..973faef 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,12 @@ Generate the metric file for the first time:
 Create a cron file to update the metric file everyday:
 
 ```
-1 * * * * root /srv/statoolinfos/bin/probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf
+```
+
+In case of several configuration files, just set the configuration directory (without wildcard):
+```
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/
 ```
 
 Warning: in previous day mode, the metrics generated are overwrited for the last month, the last week and the last day. So, six weeks in logs are required.

From 14217d74be9b79b05b6b54095a92ac81d8514d2c Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 18:06:51 +0100
Subject: [PATCH 02/11] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 973faef..f702253 100644
--- a/README.md
+++ b/README.md
@@ -121,12 +121,12 @@ Generate the metric file for the first time:
 Create a cron file to update the metric file everyday:
 
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf  >> /srv/statoolinfos/statoolinfos-cron.log
 ```
 
 In case of several configuration files, just set the configuration directory (without wildcard):
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/  >> /srv/statoolinfos/statoolinfos-cron.log
 ```
 
 Warning: in previous day mode, the metrics generated are overwrited for the last month, the last week and the last day. So, six weeks in logs are required.

From a977b16b3cdce69bdb09c4cc9f103d7c47d21869 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 18:07:55 +0100
Subject: [PATCH 03/11] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f702253..82c3020 100644
--- a/README.md
+++ b/README.md
@@ -121,12 +121,12 @@ Generate the metric file for the first time:
 Create a cron file to update the metric file everyday:
 
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf  >> /srv/statoolinfos/statoolinfos-cron.log
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf  >> /srv/statoolinfos/cron.log
 ```
 
 In case of several configuration files, just set the configuration directory (without wildcard):
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/  >> /srv/statoolinfos/statoolinfos-cron.log
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/  >> /srv/statoolinfos/cron.log
 ```
 
 Warning: in previous day mode, the metrics generated are overwrited for the last month, the last week and the last day. So, six weeks in logs are required.

From 5521dcaec52c5ee30dbcf2b9214381e6002e090c Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 18:08:18 +0100
Subject: [PATCH 04/11] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 82c3020..0117793 100644
--- a/README.md
+++ b/README.md
@@ -121,12 +121,12 @@ Generate the metric file for the first time:
 Create a cron file to update the metric file everyday:
 
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf  >> /srv/statoolinfos/cron.log
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf >> /srv/statoolinfos/cron.log
 ```
 
 In case of several configuration files, just set the configuration directory (without wildcard):
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/  >> /srv/statoolinfos/cron.log
+1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/ >> /srv/statoolinfos/cron.log
 ```
 
 Warning: in previous day mode, the metrics generated are overwrited for the last month, the last week and the last day. So, six weeks in logs are required.

From 4ec7e4de816d3c2445e02297b057dd1931048fef Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 18:30:38 +0100
Subject: [PATCH 05/11] =?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 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0117793..4adf64c 100644
--- a/README.md
+++ b/README.md
@@ -118,15 +118,14 @@ Generate the metric file for the first time:
 /srv/statoolinfos/bin/statoolinfos probe -full /srv/statoolinfos/conf/foo.bar.org.conf
 ```
 
-Create a cron file to update the metric file everyday:
-
+Create a cron file in `/etc/cron.d/statoolinfos` to update the metric file everyday:
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf >> /srv/statoolinfos/cron.log
+1 0,12 * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/foo.bar.org.conf >> /srv/statoolinfos/cron.log
 ```
 
 In case of several configuration files, just set the configuration directory (without wildcard):
 ```
-1 * * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/ >> /srv/statoolinfos/cron.log
+1 0,12 * * * root /srv/statoolinfos/bin/statoolinfos probe -previousday /srv/statoolinfos/conf/ >> /srv/statoolinfos/cron.log
 ```
 
 Warning: in previous day mode, the metrics generated are overwrited for the last month, the last week and the last day. So, six weeks in logs are required.

From 84d073ab8e57fe6de1fb60c6934cd9effffe053f Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 2 Feb 2023 20:14:33 +0100
Subject: [PATCH 06/11] =?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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4adf64c..9be0630 100644
--- a/README.md
+++ b/README.md
@@ -140,6 +140,7 @@ conf.probe.httpaccesslog.file=/var/log/apache2/foo.bar.org-access.log*
 conf.probe.httpaccesslog.pattern=
 # 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:
 # jdbc:mariadb://localhost:1234/databasename
 # jdbc:mysql://localhost:1234/databasename
 # jdbc:postgresql://localhost:1234/databasename

From f69847abb9061b3b8c138f7bf6d5102234455e87 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 4 Feb 2023 18:22:15 +0100
Subject: [PATCH 07/11] =?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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9be0630..b1c9040 100644
--- a/README.md
+++ b/README.md
@@ -151,8 +151,6 @@ conf.probe.etherpad.database.password=
 conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.properties
 ```
 
-
-
 ### Framdadate metrics (coming soon)
 
 Configuration template:
@@ -273,4 +271,6 @@ conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.
 # Custom access log pattern with Java regex.
 # Default: "^(?<remoteAddress>[a-zA-F0-9\\\\:\\\\.]+) - (?<remoteUser>[^\\[]+) \\[(?<time>[^\\]]+)\\] \"(?<request>.*)\" (?<status>\\d+) (?<bodyBytesSent>\\d+) \"(?<referer>.*)\" \"(?<userAgent>[^\"]*)\".*$"
 conf.probe.httpaccesslog.pattern=
-```
\ No newline at end of file
+```
+
+Warning: to have month metric values, you have to set retention log to *7 weeks or 50 days in nginx or Apache logrotate* configuration.
\ No newline at end of file

From bb2e551196d8a0a111a3f13ba14b464e1977c4f1 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 4 Feb 2023 18:22:47 +0100
Subject: [PATCH 08/11] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b1c9040..6495f9a 100644
--- a/README.md
+++ b/README.md
@@ -273,4 +273,4 @@ conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.
 conf.probe.httpaccesslog.pattern=
 ```
 
-Warning: to have month metric values, you have to set retention log to *7 weeks or 50 days in nginx or Apache logrotate* configuration.
\ No newline at end of file
+Warning: to have month metric values, you have to set retention log to **7 weeks or 50 days in nginx or Apache logrotate** configuration.
\ No newline at end of file

From 9d63f37e33fb1037aba0ca761ae3567e105a7e93 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 4 Feb 2023 18:23:50 +0100
Subject: [PATCH 09/11] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6495f9a..d442cf3 100644
--- a/README.md
+++ b/README.md
@@ -273,4 +273,4 @@ conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.
 conf.probe.httpaccesslog.pattern=
 ```
 
-Warning: to have month metric values, you have to set retention log to **7 weeks or 50 days in nginx or Apache logrotate** configuration.
\ No newline at end of file
+Warning: to have month metric values, you have to set **retention log to 7 weeks or 50 days** in nginx or Apache logrotate configuration.
\ No newline at end of file

From b1d46f61a6dc2120b72770afe7963686f3fe3d48 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Mon, 13 Feb 2023 11:51:14 +0100
Subject: [PATCH 10/11] =?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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d442cf3..341c9b0 100644
--- a/README.md
+++ b/README.md
@@ -273,4 +273,20 @@ conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/foo.bar.org-metrics.
 conf.probe.httpaccesslog.pattern=
 ```
 
-Warning: to have month metric values, you have to set **retention log to 7 weeks or 50 days** in nginx or Apache logrotate configuration.
\ No newline at end of file
+Warning: to have month metric values, you have to set **retention log to 7 weeks or 50 days** in Nginx or Apache logrotate configuration.
+
+Pour Nginx, éditer le fichier `/etc/logrotate.d/nginx` :
+```
+/var/log/nginx/*.log {
+        weekly
+        missingok
+        rotate 7
+```
+
+Pour Apache, éditer le fichier `/etc/logrotate.d/apache2` :
+```
+/var/log/apache2/*.log {
+    weekly
+    missingok
+    rotate 7
+```

From 5080c980d8cba653d6d43ed487279906c5625c54 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Tue, 21 Feb 2023 17:43:38 +0100
Subject: [PATCH 11/11] =?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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 341c9b0..c854538 100644
--- a/README.md
+++ b/README.md
@@ -269,8 +269,13 @@ 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-zA-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.*$
 ```
 
 Warning: to have month metric values, you have to set **retention log to 7 weeks or 50 days** in Nginx or Apache logrotate configuration.