wip

bundles/icinga2/files/constants.conf

@@ -2,5 +2,5 @@ const PluginDir = "/usr/lib/nagios/plugins"
 const ManubulonPluginDir = "/usr/lib/nagios/plugins"
 const PluginContribDir = "/usr/lib/nagios/plugins"
 const NodeName = "${hostname}"
-const ZoneName = "${hostname}"
+const ZoneName = NodeName
 const TicketSalt = ""

bundles/icinga2/files/zones.conf

@@ -3,12 +3,5 @@ object Endpoint NodeName {
 }
 
 object Zone ZoneName {
-  endpoints = [ NodeName, "server.home.ckn.li" ]
-}
-
-
-
-# WHY?????
-object Endpoint "server.home.ckn.li" {
-  host = NodeName
+  endpoints = [ NodeName ]
 }

bundles/icinga2/items.py

@@ -62,7 +62,7 @@ files = {
         'group': 'nagios',
         'mode': '0640',
         'context': {
-            'hostname': node.metadata.get('icinga2/hostname')
+            'hostname': node.metadata.get('hostname')
         },
         'triggers': [
             'svc_systemd:icinga2.service:restart',