From 07b830e92fec1c901dc4608404dcdfd1d0807bcc Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Wed, 5 Feb 2025 10:24:30 +0100
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index f98768d..a0b32e5 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -452,7 +452,9 @@ in
           #
           \S+ \S+ UTC \[[0-9]+\] LOG:\s+checkpoint starting: shutdown immediate
           \S+ \S+ UTC \[[0-9]+\] LOG:\s+checkpoint complete: .*
-          # background worker "logical replication launcher" (PID 28) exited with exit code 1 -> See https://postgrespro.com/list/thread-id/2498034
+          #
+          # See https://postgrespro.com/list/thread-id/2498034
+          \S+ \S+ UTC \[[0-9]+\] LOG:\s+background worker "logical replication launcher" \(PID [0-9]+\) exited with exit code 1
         '';
         match = "IMAGE_NAME = /postgres:.+/";
       }
@@ -650,6 +652,8 @@ in
         filters = ''
           \S+\.(service|scope|slice|swap|mount): Consumed ([0-9]+d )?([0-9]+h )?([0-9]+min )?[0-9\.]+(s|ms) CPU time(, .+)?\.
           #
+          Reload requested from client PID [0-9]+ \('\.switch-to-conf'\) \(unit session-[0-9]+\.scope\)\.\.\.
+          #
           Starting \S+\.service\.\.\.
           \S+\.service: Scheduled restart job, restart counter is at 1\.
           Finished \S+\.service\.
@@ -696,9 +700,9 @@ in
           (\S+ )+was skipped because of an unmet condition check \([^)]+\)\.
           File System Check on Root Device was skipped because of an unmet condition check (ConditionPathIsReadWrite=!/).
           #
-          # TODO bug
-          smtpd-key\.service: Found left-over process [0-9]+ \(smtpd-key-pre-s\) in control group while starting unit\. Ignoring\.
-          smtpd-key\.service: This usually indicates unclean termination of a previous run, or service implementation deficiencies\.
+          # TODO colmena secret files bug when switching NixOS system profile
+          (smtpd-key|netcup-dns-[0-9]+.json-key)\.service: Found left-over process [0-9]+ \((smtpd-key-pre-s|netcup-dns-[0-9]+)\) in control group while starting unit\. Ignoring\.
+          (smtpd-key|netcup-dns-[0-9]+.json-key)\.service: This usually indicates unclean termination of a previous run, or service implementation deficiencies\.
         '';
         match = "_SYSTEMD_UNIT = init.scope";
       }
@@ -731,7 +735,7 @@ in
           Queued start job for default target Main User Target\.
           pam_unix\(systemd-user:session\): session opened for user root\(uid=0\) by \(uid=0\)
           pam_unix\(systemd-user:session\): session closed for user (root|yoda)
-          Reexecuting requested from client PID [0-9]+ \('systemctl'\)\.\.\.
+          Reexecuting requested from client PID [0-9]+ \('(systemctl|switch-to-confi)'\)\.\.\.
           Reexecuting\.
           Run (\S+ )+was skipped because of an unmet condition check \([^)]+\)\.
         '';