diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix index 63c1e96..46a1332 100644 --- a/modules/journalwatch.nix +++ b/modules/journalwatch.nix @@ -42,7 +42,7 @@ priority = 5; # Default patterns: https://github.com/The-Compiler/journalwatch/blob/363725ac4b8aa841d87654fa8a63403a59ad1275/journalwatch.py#L71 - # If the value of `match` starts and ends with a slash, it is interpreted as a regular expression, if not, it's an exact match. + # If the value of `match` starts and ends with a forward-slash, it is interpreted as a regular expression, if not, it's an exact match. # `filters` are always regular expressions. # All regular expressions have to match the full string! filterBlocks = [ @@ -81,13 +81,31 @@ match = "_SYSTEMD_CGROUP = /system.slice/docker.service"; } + # + # CONTAINER_NAME + # + + { # yodaNas + filters = '' + .* + ''; + match = "CONTAINER_NAME = docker-compose-btp-proxy-1"; + } + { # yodaNas + # TODO: Open issue on GitHub https://github.com/nginx-proxy/nginx-proxy/issues/1256. Maybe set env variable RESOLVERS=1.1.1.1? + filters = '' + \S+ \S+ [warn] \S+: no resolver defined to resolve r3\.o\.lencr\.org while requesting certificate status, responder: r3\.o\.lencr\.org, certificate: "/etc/nginx/certs/\S+\.crt" + ''; + match = "CONTAINER_NAME = nginx-proxy"; + } + # # IMAGE_NAME # { # yodaYoga filters = '' - \[BABEL\] Note: The code generator has deoptimised the styling of \S+ as it exceeds the max of 500KB\. + .* ''; match = "IMAGE_NAME = /biketripplanner/digitransit-ui:\S+/"; } @@ -95,16 +113,16 @@ # TODO: logged IP is not the public one, but always 172.24.0.6 filters = '' Could not yet connect with DB\. Retrying in 10s \.\.\. - [0-9] \[>---------------------------\] [0-9] \[>---------------------------\] + [0-9] \[[>-]+\] [0-9] \[[>-]+\] # 1.1.1.1 - 28/Sep/2023:21:03:39 +0000 "GET /status.php" 200 # 1.1.1.1 - 28/Sep/2023:21:12:16 +0000 "GET /index.php" 200 # 1.1.1.1 - my-username 28/Sep/2023:21:20:16 +0000 "DELETE /index.php" 200 - [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - \S* \S+ \+0000 "(GET|DELETE) /(index|status)\.php" 200 + [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - \S* \S+ \+0000 "(GET|DELETE) /(index|status)\.php" (200|304) # 1.1.1.1 - my-username 28/Sep/2023:21:10:18 +0000 "PROPFIND /remote\.php" 207 [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - \S* \S+ \+0000 "(DELETE|GET|HEAD|MKCOL|MOVE|OPTIONS|PROPFIND|PUT|REPORT) /remote\.php" (200|201|204|207|401|404) # 1.1.1.1 - my-username 28/Sep/2023:21:11:48 +0000 "GET /ocs/v2.php" 304 # 1.1.1.1 - 28/Sep/2023:21:13:10 +0000 "GET /ocs/v2.php" 304 - [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - \S* \S+ \+0000 "GET /ocs/(v1|v2)\.php" (200|304) + [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - \S* \S+ \+0000 "GET /ocs/(v1|v2)\.php" (200|304|404) ''; match = "IMAGE_NAME = p1st/nextcloud:stable-fpm-alpine"; }