web_log: add support for empty requests part2
Ilya committed
Sep 23, 2017 at 10:00 UTC
02f5a1514c4d52ca91347015d1cf3bf67bdbf03a
1 file changed
+6
-6
python.d/web_log.chart.py
+6
-6
@@ -548,19 +548,19 @@ class Web(Mixin):
548
# REGEX: 1.IPv4 address 2.HTTP method 3. URL 4. Response code
549
# 5. Bytes sent 6. Response length 7. Response process time
550
default = re.compile(r'(?P<address>[\da-f.:]+|localhost)'
551
- r' -.*?"(?P<request>[^"]+)"'
551
+ r' -.*?"(?P<request>[^"]*)"'
552
r' (?P<code>[1-9]\d{2})'
553
r' (?P<bytes_sent>\d+|-)')
554
555
apache_ext_insert = re.compile(r'(?P<address>[\da-f.:]+|localhost)'
556
- r' -.*?"(?P<request>[^"]+)"'
556
+ r' -.*?"(?P<request>[^"]*)"'
557
r' (?P<code>[1-9]\d{2})'
558
r' (?P<bytes_sent>\d+|-)'
559
r' (?P<resp_length>\d+)'
560
r' (?P<resp_time>\d+) ')
561
562
apache_ext_append = re.compile(r'(?P<address>[\da-f.:]+|localhost)'
563
- r' -.*?"(?P<request>[^"]+)"'
563
+ r' -.*?"(?P<request>[^"]*)"'
564
r' (?P<code>[1-9]\d{2})'
565
r' (?P<bytes_sent>\d+|-)'
566
r' .*?'
@@ -569,14 +569,14 @@ class Web(Mixin):
569
r'(?: |$)')
570
571
nginx_ext_insert = re.compile(r'(?P<address>[\da-f.:]+)'
572
- r' -.*?"(?P<request>[^"]+)"'
572
+ r' -.*?"(?P<request>[^"]*)"'
573
r' (?P<code>[1-9]\d{2})'
574
r' (?P<bytes_sent>\d+)'
575
r' (?P<resp_length>\d+)'
576
r' (?P<resp_time>\d+\.\d+) ')
577
578
nginx_ext2_insert = re.compile(r'(?P<address>[\da-f.:]+)'
579
- r' -.*?"(?P<request>[^"]+)"'
579
+ r' -.*?"(?P<request>[^"]*)"'
580
r' (?P<code>[1-9]\d{2})'
581
r' (?P<bytes_sent>\d+)'
582
r' (?P<resp_length>\d+)'
@@ -584,7 +584,7 @@ class Web(Mixin):
584
r' (?P<resp_time_upstream>[\d.-]+) ')
585
586
nginx_ext_append = re.compile(r'(?P<address>[\da-f.:]+)'
587
- r' -.*?"(?P<request>[^"]+)"'
587
+ r' -.*?"(?P<request>[^"]*)"'
588
r' (?P<code>[1-9]\d{2})'
589
r' (?P<bytes_sent>\d+)'
590
r' .*?'