less redundant redundancy

[ansible.git] / roles / journalwatch / templates / patterns

diff --git a/roles/journalwatch/templates/patterns b/roles/journalwatch/templates/patterns
index be653661d28dbfef65a5dbf5a229a906abed386c..77014473cc3d4113e47a4af2406bd58c0e582639 100644 (file)
--- a/roles/journalwatch/templates/patterns
+++ b/roles/journalwatch/templates/patterns
@@ -64,7 +64,7 @@ SYSLOG_IDENTIFIER = su
 _SYSTEMD_UNIT = postfix@-.service
 warning: hostname [^\s]+ does not resolve to address [\da-fA-F.:]+(: Name or service not known)?
 warning: [._\w-]+\[[\da-fA-F.:]+\]: SASL (LOGIN|PLAIN) authentication failed:.*
 _SYSTEMD_UNIT = postfix@-.service
 warning: hostname [^\s]+ does not resolve to address [\da-fA-F.:]+(: Name or service not known)?
 warning: [._\w-]+\[[\da-fA-F.:]+\]: SASL (LOGIN|PLAIN) authentication failed:.*

-warning: non-SMTP command from \w+\[[\da-fA-F.:]+\]: .*
+warning: non-SMTP command from [._\w-]+\[[\da-fA-F.:]+\]: .*

 warning: TLS library problem: error:[0-9A-F]+:SSL routines:\w+:(no shared cipher|decryption failed or bad record mac|unknown protocol|version too low):[\w./]+:\d+:
 {% if journalwatch is defined and journalwatch.postfix_slow | default(False) %}
 warning: psc_cache_update: btree:/var/lib/postfix/[a-z_]+ (update|lookup) average delay is \d\d\d ms
 warning: TLS library problem: error:[0-9A-F]+:SSL routines:\w+:(no shared cipher|decryption failed or bad record mac|unknown protocol|version too low):[\w./]+:\d+:
 {% if journalwatch is defined and journalwatch.postfix_slow | default(False) %}
 warning: psc_cache_update: btree:/var/lib/postfix/[a-z_]+ (update|lookup) average delay is \d\d\d ms


@@ -90,4 +90,4 @@ _SYSTEMD_UNIT = opendkim.service
 [A-Z0-9]+: key retrieval failed \(s=[\w._-]+, d=[\w._-]+\)(: '[\w._-]+' record not found)?
 
 _SYSTEMD_SLICE=system-openvpn.slice
 [A-Z0-9]+: key retrieval failed \(s=[\w._-]+, d=[\w._-]+\)(: '[\w._-]+' record not found)?
 
 _SYSTEMD_SLICE=system-openvpn.slice

-(client/)?[0-9a-f.:]+ (peer info: .*|VERIFY OK: .*|Data Channel Encrypt: .*|Data Channel Decrypt: .*|Control Channel: .*|TLS: .*|\[client\] .*|MULTI(_sva)?: .*|SIGUSR1.*|PUSH: .*|SENT CONTROL \[client\]: .*)
+(client/)?[0-9a-f.:]+ (peer info: .*|VERIFY OK: .*|Outgoing Data Channel: .*|Incoming Data Channel: .*|Control Channel: .*|TLS: .*|\[client\] .*|MULTI(_sva)?: .*|SIGUSR1.*|PUSH: .*|SENT CONTROL \[client\]: .*)