move SPAM BLOCKLIST check to icinga2 itself

somehow, we tend to get false positives if we run that check on the
node itself.

bundles/icinga2/files/icinga2/check_commands.conf

@@ -106,6 +106,13 @@ object CheckCommand "check_smtp" {
     }
 }
 
+object CheckCommand "spam_blocklist" {
+    import "plugin-check-command"
+    import "ipv4-or-ipv6"
+
+    command = [ "/usr/local/share/icinga/plugins/check_spam_blocklist", "$ip$" ]
+}
+
 object CheckCommand "check_usv" {
     import "plugin-check-command"
     import "ipv4-or-ipv6"

bundles/icinga2/items.py

@@ -86,6 +86,9 @@ files = {
     '/usr/local/share/icinga/plugins/check_freifunk_node': {
         'mode': '0755',
     },
+    '/usr/local/share/icinga/plugins/check_spam_blocklist': {
+        'mode': '0755',
+    },
     '/usr/local/share/icinga/plugins/check_usv_snmp': {
         'mode': '0755',
     },

bundles/postfix/items.py

@@ -62,9 +62,6 @@ files = {
     '/usr/local/share/icinga/plugins/check_postfix_queue': {
         'mode': '0755',
     },
-    '/usr/local/share/icinga/plugins/check_spam_blocklist': {
-        'mode': '0755',
-    },
 }
 
 actions = {

bundles/postfix/metadata.py

@@ -137,8 +137,8 @@ def icinga2(metadata):
         for ip in ip_type:
             if not ip.is_private:
                 services[f'SPAM BLOCKLIST {ip}'] = {
-                    'command_on_monitored_host': f'/usr/local/share/icinga/plugins/check_spam_blocklist {ip}',
+                    'check_command': 'spam_blocklist',
-                    'vars.sshmon_timeout': 15,
+                    'vars.ip': str(ip),
                 }
 
     return {