diff --git a/bundles/backup-server/metadata.py b/bundles/backup-server/metadata.py index 098e264..692717d 100644 --- a/bundles/backup-server/metadata.py +++ b/bundles/backup-server/metadata.py @@ -35,8 +35,15 @@ def get_my_clients(metadata): continue my_clients[rnode.name] = { - 'user': rnode.metadata.get('backup-client/user-name'), + 'exclude_from_monitoring': rnode.metadata.get( + 'backup-client/exclude_from_monitoring', + rnode.metadata.get( + 'icinga_options/exclude_from_monitoring', + False, + ), + ), 'one_backup_every_hours': rnode.metadata.get('backup-client/one_backup_every_hours', 24), + 'user': rnode.metadata.get('backup-client/user-name'), 'retain': { 'daily': rnode.metadata.get('backups/retain/daily', retain_defaults['daily']), 'weekly': rnode.metadata.get('backups/retain/weekly', retain_defaults['weekly']), diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py index 0b39191..282f716 100644 --- a/nodes/kunsi-p14s.py +++ b/nodes/kunsi-p14s.py @@ -21,6 +21,7 @@ nodes['kunsi-p14s'] = { 'autologin_as': 'kunsi', }, 'backup-client': { + 'exclude_from_monitoring': False, # only alert people if we're missing more than a week of backups 'one_backup_every_hours': 7 * 24, },