From 03737a4d31287c3d47fd2ac1ed5b4784c074aed6 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sat, 24 Aug 2024 13:22:13 +0200
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 47 +++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 65be872..580ec6f 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -86,7 +86,7 @@
         filters = ''
           .*
         '';
-        match = "CONTAINER_NAME = /(jc-config-btp-proxy-1|nc_web_[^-_\\s]+|nginx_arch\\.p1st\\.de|recipe\\.privacy1st\\.de_nginx|nginx_privacy1st\\.de)/";
+        match = "CONTAINER_NAME = /(nc_web_[^-_\\s]+|nginx_arch\\.p1st\\.de|recipe\\.privacy1st\\.de_nginx|nginx_privacy1st\\.de)/";
       }
       { # yodaNas
         # TODO: Open issue on GitHub https://github.com/nginx-proxy/nginx-proxy/issues/1256. Maybe set env variable RESOLVERS=1.1.1.1?
@@ -112,7 +112,7 @@
         filters = ''
           .*
         '';
-        match = "IMAGE_NAME = /(p1st/docker-gen:.+|nginxproxy/acme-companion|biketripplanner/digitransit-ui:.+|thetorproject/snowflake-proxy:.+|collabora/code|wordpress|danielszabo99/microbin|p1st/mastodon-toot-follower:.+|browserless/chrome|vabene1111/recipes)/";
+        match = "IMAGE_NAME = /(p1st/docker-gen:.+|nginxproxy/acme-companion|thetorproject/snowflake-proxy:.+|collabora/code|wordpress|danielszabo99/microbin|p1st/mastodon-toot-follower:.+|browserless/chrome|vabene1111/recipes)/";
       }
       { # yodaNas
         filters = ''
@@ -432,7 +432,7 @@
         '';
         match = "SYSLOG_IDENTIFIER = //nix/store/.+/libexec/gdm-x-session/";
       }
-      { # yodaTux, yodaTab
+      {
         filters = (''
           #
           # yodaNas
@@ -457,13 +457,6 @@
           #
           # yodaTux
           #
-          # Ignore BIOS bug.
-          ACPI: FW issue: working around C-state latencies out of order
-          # Kernel WiFi driver bug.
-          #iwlwifi 0000:01:00\.0: .*
-          iwlwifi 0000:01:00\.0: Unhandled alg: 0x707
-          iwlwifi 0000:01:00\.0: Not associated and the session protection is over already...
-          iwlwifi 0000:01:00\.0: api flags index 2 larger than supported by driver
           # Ignore.
           audit: type=2000 audit\([0-9]+\.[0-9]+:[0-9]+\): state=initialized audit_enabled=0 res=1
           ENERGY_PERF_BIAS: Set to 'normal', was 'performance'
@@ -506,15 +499,6 @@
           #
           done\.
           #
-          # yodaYoga
-          #
-          # Ignore BIOS bug.
-          ACPI: \[Firmware Bug\]: .*
-          ACPI BIOS Error \(bug\): .*
-          ACPI Error: .*
-          ACPI Warning: .*
-          # Ignore.
-          usb: port power management may be unreliable
           #
           # yodaHedgehog
           #
@@ -522,20 +506,27 @@
           ata[0-9]\.00: Entering standby power mode
           ata[0-9]\.00: Entering active power mode
         '' + (if (config.networking.hostName == "yodaHedgehog") then ''
+          #
           # Not sure about this.
-          ACPI BIOS Warning \(bug\): 32/64X length mismatch in FADT/Gpe0Block: 128/32 \(20220331/tbfadt-564\)
+          #
           hpet: number irqs doesn't agree with number of timers
           gpio gpiochip0: \(INT0002 Virtual GPIO\): not an immutable chip, please consider fixing it!
           at24 0-0050: supply vcc not found, using dummy regulator
           intel-spi: probe of intel-spi failed with error -22
+          systemd\[[0-9]\]: memfd_create\(\) called without MFD_EXEC or MFD_NOEXEC_SEAL set
+          #
           # Ignore.
+          #
+          ACPI BIOS Warning \(bug\): .*
           ata[0-9]: link is slow to respond, please be patient \(ready=0\)
           # Not sure about this.
           ata4\.00: qc timeout after 10000 msecs \(cmd 0x40\)
           ata4\.00: VERIFY failed \(err_mask=0x4\)
           ata4\.00: failed to IDENTIFY \(I/O error, err_mask=0x40\)
           ata4\.00: revalidation failed \(errno=-5\)
+          #
           # Ignore very frequent kernel stack traces
+          #
           ------------\[ cut here \]------------
           i915 0000:00:02\.0: drm_WARN_ON\(\(intel_uncore_read\(&dev_priv->uncore, \(\(const i915_reg_t\){ \.reg = \(0x130090\) }\)\) & mask\) != mask\)
           WARNING: CPU: [0-9]+ PID: [0-9]+ at drivers/gpu/drm/i915/vlv_suspend\.c:.*
@@ -563,6 +554,22 @@
            (intel_runtime_suspend|pci_pm_runtime_suspend|__rpm_callback|rpm_callback|rpm_suspend|pm_runtime_work|process_one_work|worker_thread|kthread|ret_from_fork|ret_from_fork_asm|async_run_entry_fn|async_suspend_late|__device_suspend_late|dpm_run_callback|i915_drm_suspend_late)\+0x[0-9abcdef]+/0x[0-9abcdef]+( \[i915\])?
            </TASK>
           ---\[ end trace 0000000000000000 \]---
+        '' else if (config.networking.hostName == "yodaYoga") then ''
+          # Ignore BIOS bug.
+          ACPI: \[Firmware Bug\]: .*
+          ACPI BIOS Error \(bug\): .*
+          ACPI Error: .*
+          ACPI Warning: .*
+          # Ignore.
+          usb: port power management may be unreliable
+        '' else if (config.networking.hostName == "yodaTux") then ''
+          # Ignore BIOS bug.
+          ACPI: FW issue: working around C-state latencies out of order
+          # Kernel WiFi driver bug.
+          #iwlwifi 0000:01:00\.0: .*
+          iwlwifi 0000:01:00\.0: Unhandled alg: 0x707
+          iwlwifi 0000:01:00\.0: Not associated and the session protection is over already...
+          iwlwifi 0000:01:00\.0: api flags index 2 larger than supported by driver
         '' else ""));
         match = "SYSLOG_IDENTIFIER = kernel";
       }