WIP on icinga2 rework