summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Mashchenko <ilya@netdata.cloud>2019-05-31 14:18:19 +0300
committerGitHub <noreply@github.com>2019-05-31 14:18:19 +0300
commit0c39c626ff1cba2d3ebde70c175fee12bade45f8 (patch)
tree041224285283e1a2925648c0f2c5d246e3acd18c
parent00a7734e550156495d01abbfd32acee0faa51304 (diff)
web log pattern fix (#6180)
* remove double quotation mark from pattern * update conf
-rw-r--r--collectors/python.d.plugin/web_log/web_log.chart.py2
-rw-r--r--collectors/python.d.plugin/web_log/web_log.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/collectors/python.d.plugin/web_log/web_log.chart.py b/collectors/python.d.plugin/web_log/web_log.chart.py
index 755be6fdd5..fa5a8bc3e0 100644
--- a/collectors/python.d.plugin/web_log/web_log.chart.py
+++ b/collectors/python.d.plugin/web_log/web_log.chart.py
@@ -659,7 +659,7 @@ class Web:
r' (?P<bytes_sent>\d+)'
r' (?P<resp_length>\d+)'
r' (?P<resp_time>\d+\.\d+)'
- r' "?(?P<resp_time_upstream>[\d.-]+)')
+ r' (?P<resp_time_upstream>[\d.-]+)')
nginx_ext_append = re.compile(r'(?P<address>[\da-f.:]+)'
r' -.*?"(?P<request>[^"]*)"'
diff --git a/collectors/python.d.plugin/web_log/web_log.conf b/collectors/python.d.plugin/web_log/web_log.conf
index b59b2c562a..220b7c2831 100644
--- a/collectors/python.d.plugin/web_log/web_log.conf
+++ b/collectors/python.d.plugin/web_log/web_log.conf
@@ -97,7 +97,7 @@
# nginx:
# log_format netdata '$remote_addr - $remote_user [$time_local] '
# '"$request" $status $body_bytes_sent '
-# '$request_length $request_time "$upstream_response_time" '
+# '$request_length $request_time $upstream_response_time '
# '"$http_referer" "$http_user_agent"';
# access_log /var/log/nginx/access.log netdata;
#