diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py index 53bf720..4a505c3 100644 --- a/bundles/zfs/metadata.py +++ b/bundles/zfs/metadata.py @@ -48,6 +48,22 @@ defaults = { 'zfs-auto-snapshot-monthly': '0 0 1 * * root /usr/local/sbin/zfs-auto-snapshot monthly', 'zfs-auto-snapshot-weekly': '0 0 * * 7 root /usr/local/sbin/zfs-auto-snapshot weekly', }, + 'icinga2_api': { + 'zfs': { + 'services': { + 'ZFS AUTO SNAPSHOT': { + 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_auto_snapshot', + }, + 'ZFS MOUNTED VOLUMES': { + 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_volumes', + 'vars.notification.mail': True, + }, + 'ZFS OLD SNAPSHOTS': { + 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_old_snapshots', + } + }, + }, + }, 'zfs': { 'datasets': {}, 'pools': {}, @@ -62,26 +78,6 @@ defaults = { }, } -if node.has_bundle('sshmon'): - defaults.update({ - 'icinga2_api': { - 'zfs': { - 'services': { - 'ZFS AUTO SNAPSHOT': { - 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_auto_snapshot', - }, - 'ZFS MOUNTED VOLUMES': { - 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_volumes', - 'vars.notification.mail': True, - }, - 'ZFS OLD SNAPSHOTS': { - 'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_old_snapshots', - } - }, - }, - }, - }) - @metadata_reactor.provides( 'cron/zfs-scrub',