From 17b21b0e74d29783e88243a745561b273426e1e1 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Tue, 24 Sep 2024 22:17:46 +0200
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 308acf3..8e5d88e 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -147,12 +147,6 @@
         '';
         match = "IMAGE_NAME = /nginx:\\S+/";
       }
-      { # yodaNas
-        filters = ''
-          127\.0\.0\.1 - - \[\S+ \+0200\] "GET /health HTTP/1\.1" 200 1741 "-" "Firefly III Health Checker/[0-9\.]+"
-        '';
-        match = "IMAGE_NAME = fireflyiii/data-importer:latest";
-      }
       { # yodaNas
         # TODO: logged IP is not the public one, but always 172.24.0.6.
         filters = ''
@@ -460,6 +454,8 @@
           wait-for-it\.sh: \S+:3306 is available after [0-9]+ seconds
           #
           \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1\] AH[0-9]+: caught SIGWINCH, shutting down gracefully
+          #
+          127\.0\.0\.1 - - \[\S+ \S+\] "GET /health HTTP/1\.1" 200 [0-9]+ "-" "(User-Agent: )?Firefly III Health Checker/\S+"
         '';
         match = "IMAGE_NAME = fireflyiii/core:latest";
       }
@@ -470,6 +466,8 @@
           \[\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
+          #
+          127\.0\.0\.1 - - \[\S+ \S+\] "GET /health HTTP/1\.1" 200 [0-9]+ "-" "(User-Agent: )?Firefly III Health Checker/\S+"
         '';
         match = "IMAGE_NAME = fireflyiii/data-importer:latest";
       }