From e22978b758b70871d1b02c6d69240e867a083fca Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sun, 8 Oct 2023 16:31:33 +0200
Subject: [PATCH] fix: journalwatch config

---
 modules/journalwatch.nix | 50 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index add3c79..ba300c0 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -119,22 +119,22 @@
         filters = ''
           \S+ \S+ \[error\] [0-9]+#[0-9]+: \S+ open\(\) "/usr/share/nginx/html/robots\.txt" failed \(2: No such file or directory\), client: \S+, server: localhost, request: "GET /robots\.txt HTTP/[^"]+", host: "[^"]+"
           #
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: signal 3 \(SIGQUIT\) received, shutting down
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: gracefully shutting down
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: exiting
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: exit
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: signal 17 \(SIGCHLD\) received from [0-9]+
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: worker process [0-9]+ exited with code 0
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: signal 3 \(SIGQUIT\) received, shutting down
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: gracefully shutting down
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: exiting
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: exit
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: signal 17 \(SIGCHLD\) received from [0-9]+
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: worker process [0-9]+ exited with code 0
           #
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: signal 1 \(SIGHUP\) received, reconfiguring
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: reconfiguring
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: using the "epoll" event method
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: nginx/\S+
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: built by gcc \S+ \S+ (Alpine \S+)
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: OS: Linux \S+
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: getrlimit\(RLIMIT_NOFILE\): [0-9]+:[0-9]+
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: start worker processes
-          \S+\S+ \[notice\] [0-9]+#[0-9]+: start worker process [0-9]+
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: signal 1 \(SIGHUP\) received, reconfiguring
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: reconfiguring
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: using the "epoll" event method
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: nginx/\S+
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: built by gcc \S+ \S+ (Alpine \S+)
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: OS: Linux \S+
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: getrlimit\(RLIMIT_NOFILE\): [0-9]+:[0-9]+
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: start worker processes
+          \S+ \S+ \[notice\] [0-9]+#[0-9]+: start worker process [0-9]+
         '';
         match = "IMAGE_NAME = /nginx:\S+/";
       }
@@ -207,17 +207,17 @@
       }
       { # yodaNas
         filters = ''
-          \S+\S+ UTC \[[0-9]+\] LOG:  listening on IPv4 address "0\.0\.0\.0", port 5432
-          \S+\S+ UTC \[[0-9]+\] LOG:  listening on IPv6 address "::", port 5432
-          \S+\S+ UTC \[[0-9]+\] LOG:  listening on Unix socket "/var/run/postgresql/\.s\.PGSQL\.5432"
-          \S+\S+ UTC \[[0-9]+\] LOG:  database system was shut down at 2023-10-03 17:21:05 UTC
-          \S+\S+ UTC \[[0-9]+\] LOG:  database system is ready to accept connections
+          \S+ \S+ UTC \[[0-9]+\] LOG:  listening on IPv4 address "0\.0\.0\.0", port 5432
+          \S+ \S+ UTC \[[0-9]+\] LOG:  listening on IPv6 address "::", port 5432
+          \S+ \S+ UTC \[[0-9]+\] LOG:  listening on Unix socket "/var/run/postgresql/\.s\.PGSQL\.5432"
+          \S+ \S+ UTC \[[0-9]+\] LOG:  database system was shut down at 2023-10-03 17:21:05 UTC
+          \S+ \S+ UTC \[[0-9]+\] LOG:  database system is ready to accept connections
           #
-          \S+\S+ UTC \[[0-9]+\] LOG:  received fast shutdown request
-          \S+\S+ UTC \[[0-9]+\] LOG:  aborting any active transactions
-          \S+\S+ UTC \[[0-9]+\] FATAL:  terminating connection due to administrator command
-          \S+\S+ UTC \[[0-9]+\] LOG:  shutting down
-          \S+\S+ UTC \[[0-9]+\] LOG:  database system is shut down
+          \S+ \S+ UTC \[[0-9]+\] LOG:  received fast shutdown request
+          \S+ \S+ UTC \[[0-9]+\] LOG:  aborting any active transactions
+          \S+ \S+ UTC \[[0-9]+\] FATAL:  terminating connection due to administrator command
+          \S+ \S+ UTC \[[0-9]+\] LOG:  shutting down
+          \S+ \S+ UTC \[[0-9]+\] LOG:  database system is shut down
         '';
         match = "IMAGE_NAME = postgres:.+";
       }