From 27005582d7b00176a234b1956da23a8c428e3fbe Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Sun, 7 Jan 2024 16:06:46 +1100 Subject: [PATCH 1/3] doc: Link to the apache log config docs and fix a bad comment. --- examples/apache_common.mtail | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/apache_common.mtail b/examples/apache_common.mtail index 0120e2124..d25dfd830 100644 --- a/examples/apache_common.mtail +++ b/examples/apache_common.mtail @@ -1,5 +1,6 @@ # Parser for the common apache log format as follow. # LogFormat "%h %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-agent}i\" +# https://httpd.apache.org/docs/2.4/mod/mod_log_config.html counter apache_http_requests_total by request_method, http_version, status_code counter apache_http_bytes_total by request_method, http_version, status_code gauge apache_http_response_time by remote_host, request_method, request_uri, status_code, user_agent @@ -9,7 +10,7 @@ gauge apache_http_response_size by remote_host, request_method, request_uri, sta /(?P[0-9A-Za-z\.:-]+) / + # %h /(?P[0-9A-Za-z-]+) / + # %l /(?P[0-9A-Za-z-]+) / + # %u -/\[(?P\d{2}\/\w{3}\/\d{4}:\d{2}:\d{2}:\d{2} (\+|-)\d{4})\] / + # %u +/\[(?P\d{2}\/\w{3}\/\d{4}:\d{2}:\d{2}:\d{2} (\+|-)\d{4})\] / + # %t /"(?P[A-Z]+) (?P\S+) (?PHTTP\/[0-9\.]+)" / + # \"%r\" /(?P\d{3}) / + # %>s /((?P\d+)|-) / + # %b From 832aa958419a3869c6faaa27e65610508dc72c39 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Sun, 7 Jan 2024 16:15:36 +1100 Subject: [PATCH 2/3] doc: Fix URL to IMDB quote. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4e125a14..ed6e339c9 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ alerting tool, like [Prometheus](http://prometheus.io). > you bring them down to the monitoring system? [It deals with the instrumentation so the engineers don't have -to!](http://www.imdb.com/title/tt0151804/quotes/qt0386890) It has the +to!](http://www.imdb.com/title/tt0151804/quotes/?item=qt0386890) It has the extraction skills! It is good at dealing with log files!! ## Read More From 7651ebf3dd750f611b413b1466b2f4c18c93c9a4 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Sun, 7 Jan 2024 16:16:22 +1100 Subject: [PATCH 3/3] doc: Fix spelling error. --- docs/Deploying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Deploying.md b/docs/Deploying.md index beeb453e6..58152eb0a 100644 --- a/docs/Deploying.md +++ b/docs/Deploying.md @@ -115,7 +115,7 @@ file { mtail_programme: } ``` -Alternatively, if you're using `scp` or some similiar method to copy the programme files without a receiver, then either follow it with a `ssh $host 'killall -HUP mtail'` or use a tool like [`inotifywait`](https://linux.die.net/man/1/inotifywait) in a side process next to mtail to watch for changes and send the reload signal. +Alternatively, if you're using `scp` or some similar method to copy the programme files without a receiver, then either follow it with a `ssh $host 'killall -HUP mtail'` or use a tool like [`inotifywait`](https://linux.die.net/man/1/inotifywait) in a side process next to mtail to watch for changes and send the reload signal. ```shell inotifywait -m /etc/mtail/progs | while read event; do killall -HUP mtail; done