From b31f46be1428e91e56bf76ac4a405a8e7cffa659 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Tue, 10 Sep 2024 12:13:58 +0200
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index a1bcb32..7413e23 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -278,7 +278,7 @@
       { # yodaNas
         filters = ''
           AH[0-9]+: apache2: Could not reliably determine the server's fully qualified domain name, using \S+\. Set the 'ServerName' directive globally to suppress this message
-          \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1\] AH[0-9]+: Apache/\S+ \(Debian\) configured -- resuming normal operations
+          \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1(:tid 1)?\] AH[0-9]+: Apache/\S+ \(Debian\) configured -- resuming normal operations
           \[\S+ \S+ \S+ \S+ \S+\] \[core:notice\] \[pid 1\] AH[0-9]+: Command line: 'apache2 -D FOREGROUND'
           > Illuminate\\Foundation\\ComposerScripts::postAutoloadDump
           wait-for-it\.sh: waiting 60 seconds for \S+:3306
@@ -291,7 +291,7 @@
       { # yodaNas
         filters = ''
           AH[0-9]+: apache2: Could not reliably determine the server's fully qualified domain name, using \S+\. Set the 'ServerName' directive globally to suppress this message
-          \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1\] AH[0-9]+: Apache/\S+ \(Debian\) configured -- resuming normal operations
+          \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1(:tid 1)?\] AH[0-9]+: Apache/\S+ \(Debian\) configured -- resuming normal operations
           \[\S+ \S+ \S+ \S+ \S+\] \[core:notice\] \[pid 1(:tid 1)?\] AH[0-9]+: Command line: 'apache2 -D FOREGROUND'
           #
           \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1(:tid 1)?\] AH[0-9]+: caught SIGWINCH, shutting down gracefully
@@ -387,7 +387,8 @@
           \s+\S+ Verifying Checksum
           \s+\S+ Pull complete
           \s+\S+ Pulled
-          \s+Container \S+  (Created|Recreate|Recreated|Waiting|Starting|Started|Running|Healthy)
+          \s+Network \S+  (Creating|Created)
+          \s+Container \S+  (Creating|Created|Recreate|Recreated|Waiting|Starting|Started|Running|Healthy)
         '';
         match = "_SYSTEMD_UNIT = Jinja-Compose.service";
       }
@@ -432,10 +433,10 @@
         '';
         match = "SYSLOG_IDENTIFIER = nixos";
       }
-      { # yodaYoga
+      { # yodaYoga, yodaNas
         filters = ''
-          \S+\.(service|scope|slice|mount): Consumed .+ CPU time, read .+ from disk, written .+ to disk.+
-          \S+\.(service|scope|slice|mount): Consumed .+ CPU time, received .+ IP traffic, sent .+ IP traffic\.
+          \S+\.(service|scope|slice|mount): Consumed .+ CPU time, read .+ from disk, written .+ to disk(, .+|\.)
+          \S+\.(service|scope|slice|mount): Consumed .+ CPU time(, .+)?, received .+ IP traffic, sent .+ IP traffic\.
           \S+\.(service|scope|slice|mount): Consumed .+ CPU time, no IP traffic\.
           #
           Shutting down\.
@@ -570,7 +571,7 @@
           iwlwifi 0000:01:00\.0: api flags index 2 larger than supported by driver
         '' else if (config.networking.hostName == "yodaNas") then ''
           # Probably safe to ignore.
-          resource: resource sanity check: requesting \S+, which spans more than Reserved \S+
+          resource: resource sanity check: requesting \[mem 0x[0-9a-f]+-0x[0-9a-f]+\], which spans more than Reserved \[mem 0x[0-9a-f]+-0x[0-9a-f]+\]
           # Ingore: Probably just copying of boot graphics (.bmp) failed. https://patchwork.kernel.org/project/linux-fbdev/patch/20180617153235.16219-3-hdegoede@redhat.com/
           efifb: Ignoring BGRT: unexpected or invalid BMP data
           # Not sure about this.