diff --git a/bundles/icinga2/files/check_spam_blocklist b/bundles/icinga2/files/check_spam_blocklist index aa80164..d6a2d31 100644 --- a/bundles/icinga2/files/check_spam_blocklist +++ b/bundles/icinga2/files/check_spam_blocklist @@ -50,12 +50,18 @@ def check_list(ip_list, blocklist, warn_ips): dns_name ]).decode().splitlines() for item in result: - msgs.append('{} listed in {} as {}'.format( - ip, - blocklist, - item, - )) - if item in warn_ips and returncode < 2: + if line.startswith(';;'): + msgs.append('{} - {}'.format( + blocklist, + item, + )) + else: + msgs.append('{} listed in {} as {}'.format( + ip, + blocklist, + item, + )) + if (item in warn_ips or line.startswith(';;')) and returncode < 2: returncode = 1 else: returncode = 2