Ignore laptop sleep/wakeup events, and separate usbutils lines.

3 files changed, 23 insertions, 4 deletions

diff --git a/logcheck/ignore.d.workstation/local b/logcheck/ignore.d.workstation/local
index 612a392..e165363 100644
--- a/logcheck/ignore.d.workstation/local
+++ b/logcheck/ignore.d.workstation/local
@@ -454,9 +454,16 @@ syslogd started: BusyBox v[\.0-9]+ \([^[:space:]]+\)$
 init: Entering runlevel: 2
 rpc.mountd: authenticated mount request from 192\.168\..* for /home/opt/ltsp/i386 \(/home/opt/ltsp/i386\)
 # Laptop sleep
-kernel: usb-ohci.c: USB suspend: usb-10:[0-9\.]+$
-kernel: eth[0-9]: suspending, WakeOnLan disabled$
+kernel: ADB keyboard at [0-9], handler [0-9]$
+kernel: ADB mouse at [0-9], handler set to [0-9] \(trackpad\)$
+kernel: adb devices: (\[[0-9]\]: [0-9] [0-9a-f]+)+$
+kernel: adb: (starting|finished) probe task\.\.\.$
+kernel: eth[0-9]: Airport (entering sleep mode|waking up)$
 kernel: eth[0-9]: resuming$
+kernel: eth[0-9]: suspending, WakeOnLan disabled$
+kernel: hda: Enabling MultiWord DMA [1-9]$
+kernel: hda: Enabling Ultra DMA [1-9]$
+kernel: hda: PCI: Enabling bus mastering for device [0-9:\.]+$
 ### ignore.d.workstation/ntp-simple
 ntpd\[[0-9]+\]: synchronisation lost$
 ntpd\[[0-9]+\]: time reset [\.0-9]+ s$
@@ -475,3 +482,6 @@ pmud\[[0-9]+\]: system awake again$
 ### ignore.d.workstation/sfs-client
 : sfsrwcd: reloaded resolv.conf file$
 : sfsrwcd: changing nameserver to [\.0-9]+$
+### ignore.d.workstation/usbutils
+kernel: usb-ohci.c: USB continue: usb-[0-9:\.]+ from host wakeup$
+kernel: usb-ohci.c: USB suspend: usb-[0-9:\.]++$
diff --git a/logcheck/ignore.d.workstation/misc b/logcheck/ignore.d.workstation/misc
index ff5b6cb..9a97b34 100644
--- a/logcheck/ignore.d.workstation/misc
+++ b/logcheck/ignore.d.workstation/misc
@@ -3,6 +3,13 @@ syslogd started: BusyBox v[\.0-9]+ \([^[:space:]]+\)$
 init: Entering runlevel: 2
 rpc.mountd: authenticated mount request from 192\.168\..* for /home/opt/ltsp/i386 \(/home/opt/ltsp/i386\)
 # Laptop sleep
-kernel: usb-ohci.c: USB suspend: usb-10:[0-9\.]+$
-kernel: eth[0-9]: suspending, WakeOnLan disabled$
+kernel: ADB keyboard at [0-9], handler [0-9]$
+kernel: ADB mouse at [0-9], handler set to [0-9] \(trackpad\)$
+kernel: adb devices: (\[[0-9]\]: [0-9] [0-9a-f]+)+$
+kernel: adb: (starting|finished) probe task\.\.\.$
+kernel: eth[0-9]: Airport (entering sleep mode|waking up)$
 kernel: eth[0-9]: resuming$
+kernel: eth[0-9]: suspending, WakeOnLan disabled$
+kernel: hda: Enabling MultiWord DMA [1-9]$
+kernel: hda: Enabling Ultra DMA [1-9]$
+kernel: hda: PCI: Enabling bus mastering for device [0-9:\.]+$
diff --git a/logcheck/ignore.d.workstation/usbutils b/logcheck/ignore.d.workstation/usbutils
new file mode 100644
index 0000000..98b8e7f
--- /dev/null
+++ b/logcheck/ignore.d.workstation/usbutils
@@ -0,0 +1,2 @@
+kernel: usb-ohci.c: USB continue: usb-[0-9:\.]+ from host wakeup$
+kernel: usb-ohci.c: USB suspend: usb-[0-9:\.]++$