From b30de55da777c020dc99ca5eb23594f411a17c38 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Wed, 8 Nov 2023 19:34:23 +0100
Subject: [PATCH] journalwatch config

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

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 5553577..4b70792 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -105,6 +105,10 @@
         filters = ''
           \S+ \S+ \[warn\] [0-9]+#[0-9]+: no resolver defined to resolve r3\.o\.lencr\.org while requesting certificate status, responder: r3\.o\.lencr\.org, certificate: "/etc/nginx/certs/\S+\.crt"
           \S+ \S+ \[error\] [0-9]+#[0-9]+: OCSP responder sent invalid "Content-Type" header: "text/html" while requesting certificate status, responder: r3\.o\.lencr\.org, peer: \S+, certificate: "/etc/nginx/certs/\S+\.crt"
+          \S+ \S+ \[error\] [0-9]+#[0-9]+: recv\(\) failed \(111: Connection refused\) while requesting certificate status, responder: r3\.o\.lencr\.org, peer: \S+, certificate: "/etc/nginx/certs/\S+.crt"
+          #
+          #
+          \S+ \S+ \[error\] [0-9]+#[0-9]+: \*[0-9]+ upstream timed out \(110: Operation timed out\) while reading upstream, client: \S+, server: \S+, request: "[^"]+", upstream: "[^"]+", host: "[^"]+"
           \S+ \S+ \[error\] [0-9]+#[0-9]+: \*[0-9]+ connect\(\) failed \(111: Connection refused\) while connecting to upstream, client: \S+, server: \S+, request: "[^"]+", upstream: "[^"]+", host: "[^"]+"
         '';
         match = "CONTAINER_NAME = nginx-proxy";
@@ -271,7 +275,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\] 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'
           #
           \[\S+ \S+ \S+ \S+ \S+\] \[mpm_prefork:notice\] \[pid 1\] AH[0-9]+: caught SIGWINCH, shutting down gracefully
@@ -357,7 +361,7 @@
           error: kex_exchange_identification: banner line contains invalid characters
           # error: kex_exchange_identification: client sent invalid protocol identifier "MGLNDD_188.194.209.73_2222"
           # error: kex_exchange_identification: client sent invalid protocol identifier "GET / HTTP/1.1"
-          error: kex_exchange_identification: client sent invalid protocol identifier "[^"]+"
+          error: kex_exchange_identification: client sent invalid protocol identifier "[^"]*"
           error: kex_exchange_identification: Connection closed by remote host
           error: kex_exchange_identification: read: Connection reset by peer
           error: PAM: Authentication failure for \S+ from \S+
@@ -430,7 +434,8 @@
           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'
           Kernel command line: initrd=\\efi\\nixos\\\S+-initrd-linux-\S+-initrd\.efi init=/nix/store/\S+-nixos-system-\S+-[0-9]+\.[0-9]+pre-git/init ip=dhcp loglevel=[0-9]
-          Linux version \S+ \(nixbld@localhost\) \(gcc \(GCC\) \S+, GNU ld \(GNU Binutils\) \S+\) #1-NixOS SMP PREEMPT_DYNAMIC \S+ \S+ \S+ \S+ UTC \S+
+          # Linux version 6.1.61 (nixbld@localhost) (gcc (GCC) 12.2.0, GNU ld (GNU Binutils) 2.40) #1-NixOS SMP PREEMPT_DYNAMIC Thu Nov  2 08:35:33 UTC 2023
+          Linux version \S+ \(nixbld@localhost\) \(gcc \(GCC\) \S+, GNU ld \(GNU Binutils\) \S+\) #1-NixOS SMP PREEMPT_DYNAMIC \S+ \S+\s+\S+ \S+ UTC \S+
           random: crng reseeded on system resumption
           random: crng init done
           sd [0-9]:0:0:0: \[sd[a-z]\] [0-9]+ 512-byte logical blocks: \(\S+ (GB|TB)/\S+ (GiB|TiB)\)
@@ -473,6 +478,12 @@
           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
+          # Ignore.
+          ata2.00: Entering standby power mode
+          ata2.00: Entering active power mode
+          ------------\[ cut here \]------------
+          Hardware name: To Be Filled By O\.E\.M\. To Be Filled By O\.E\.M\./N3150-ITX, BIOS P1\.10 05/20/2015
+          Workqueue: pm pm_runtime_work
         '';
         match = "SYSLOG_IDENTIFIER = kernel";
       }