journalwatch: ignore failed SSH attempts... there are just too many...

diff --git a/roles/journalwatch/templates/config b/roles/journalwatch/files/config
similarity index 85%
rename from roles/journalwatch/templates/config
rename to roles/journalwatch/files/config
index 8da85b8a2a277171316ca4919c709a574ac66c64..468a7b2771e073f7ad54d3bd743e3a1b9b721386 100644 (file)
--- a/roles/journalwatch/templates/config
+++ b/roles/journalwatch/files/config
@@ -11,5 +11,5 @@
 priority=5
 mail_from=root
 mail_to=root
 priority=5
 mail_from=root
 mail_to=root

-mail_subject={hostname}: {count} system events
+mail_subject={hostname}: {count} system events (journalwatch)

 mail_binary=/usr/sbin/sendmail
 mail_binary=/usr/sbin/sendmail

diff --git a/roles/journalwatch/templates/patterns b/roles/journalwatch/files/patterns
similarity index 93%
rename from roles/journalwatch/templates/patterns
rename to roles/journalwatch/files/patterns
index 8b5d7d2384eb1f0b8e3465f4dcc82806f92ee155..ef042a2d07faf3d16cc0a4b0ef737b739759a488 100644 (file)
--- a/roles/journalwatch/templates/patterns
+++ b/roles/journalwatch/files/patterns
@@ -59,6 +59,8 @@ warning: non-SMTP command from \w+\[[\da-fA-F.:]+\]: .*
 SYSLOG_IDENTIFIER = sshd
 error: Received disconnect from [\da-fA-F.:]+ port \d+:\d+: .*
 error: maximum authentication attempts exceeded for invalid user \w+ from [\da-fA-F.:]+ port \d+ ssh2( \[preauth\])?
 SYSLOG_IDENTIFIER = sshd
 error: Received disconnect from [\da-fA-F.:]+ port \d+:\d+: .*
 error: maximum authentication attempts exceeded for invalid user \w+ from [\da-fA-F.:]+ port \d+ ssh2( \[preauth\])?

+pam_unix\(sshd:auth\): check pass; user unknown
+pam_unix\(sshd:auth\): authentication failure; logname= uid=0 euid=0 tty=ssh ruser= rhost=[\da-fA-F.:]+(  user=root)?

 
 _SYSTEMD_UNIT = bind9.service
 client [\da-fA-F.:]+#\d+ \([\w.-]+\): (zone transfer '[\w.-]+/AXFR/IN' denied|message parsing failed: (bad compression pointer|bad label type))
 
 _SYSTEMD_UNIT = bind9.service
 client [\da-fA-F.:]+#\d+ \([\w.-]+\): (zone transfer '[\w.-]+/AXFR/IN' denied|message parsing failed: (bad compression pointer|bad label type))

diff --git a/roles/journalwatch/tasks/journalwatch.yml b/roles/journalwatch/tasks/journalwatch.yml
index c9a5375f4e44278d26ccd0beec9a28e5bf75cf81..74e8f6836b90a2bfe081cbb8f43f361323edd8a1 100644 (file)
--- a/roles/journalwatch/tasks/journalwatch.yml
+++ b/roles/journalwatch/tasks/journalwatch.yml
@@ -8,8 +8,8 @@
 - name: create journalwatch config dir
   file: path=/root/.config/journalwatch state=directory
 - name: install journalwatch config files
 - name: create journalwatch config dir
   file: path=/root/.config/journalwatch state=directory
 - name: install journalwatch config files

-  template:
-    src: templates/{{item}}
+  copy:
+    src: files/{{item}}

     dest: /root/.config/journalwatch/{{item}}
   loop:
   - config
     dest: /root/.config/journalwatch/{{item}}
   loop:
   - config