Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/conf.d/python.d/web_log.conf b/collectors/python.d.plugin/web_log/web_log.conf
index c185f8d85..a67957aef 100644
--- a/conf.d/python.d/web_log.conf
+++ b/collectors/python.d.plugin/web_log/web_log.conf
@@ -84,7 +84,7 @@
 #          stub_status: 'stub_status'     # name(dimension): REGEX to match
 #     custom_log_format:                  # define a custom log format
 #          pattern: '(?P<address>[\da-f.:]+) -.*?"(?P<method>[A-Z]+) (?P<url>.*?)" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+\.\d+) '
-#          time_multiplier: 1000000       # type <int> - convert time to microseconds
+#          time_multiplier: 1000000       # type <int>/<float> - convert time to microseconds
 #     histogram: [1,3,10,30,100, ...]      # type list of int - Cumulative histogram of response time in milli seconds
 
 # ----------------------------------------------------------------------
@@ -109,6 +109,17 @@
 #   CustomLog "/var/log/apache2/access.log" netdata
 
 # ----------------------------------------------------------------------
+# VHOST AND PORT
+# if your want to graph the request/sec per virtual host and per port (to check the number of requests in http vs https)
+
+# in apache : (%v gives the hostname, %p the port number)
+#  LogFormat "%v %p %h %t \"%r\" %>s %O %I %D \"%{Referer}i\" \"%{User-Agent}i\"" vhost_netdata
+#
+# and in this file in apache_vhosts_log section, add :
+#  custom_log_format:
+#     pattern: '(?P<vhost>[a-zA-Z\d.-_]+) (?P<port>\d+) (?P<address>[\da-f.:]+) \[.*\] "(?P<method>[A-Z]+)[^"]*" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+)'
+
+# ----------------------------------------------------------------------
 # AUTO-DETECTION JOBS
 # only one of them per web server will run (when they have the same name)