diff --git a/bundles/simple-icinga-dashboard/items.py b/bundles/simple-icinga-dashboard/items.py index 74f05db..7568c86 100644 --- a/bundles/simple-icinga-dashboard/items.py +++ b/bundles/simple-icinga-dashboard/items.py @@ -43,16 +43,6 @@ git_deploy = { } files = { - '/etc/systemd/system/simple-icinga-dashboard.service': { - 'triggers': { - 'action:systemd-reload', - }, - }, - '/etc/systemd/system/simple-icinga-dashboard.timer': { - 'triggers': { - 'action:systemd-reload', - }, - }, '/opt/simple-icinga-dashboard/config.toml': { 'content_type': 'mako', 'needs': { @@ -69,13 +59,3 @@ symlinks = { }, }, } - -svc_systemd = { - 'simple-icinga-dashboard.timer': { - 'needs': { - 'action:simple-icinga-dashboard_install_requirements', - 'file:/etc/systemd/system/simple-icinga-dashboard.service', - 'file:/etc/systemd/system/simple-icinga-dashboard.timer', - }, - }, -} diff --git a/bundles/simple-icinga-dashboard/metadata.py b/bundles/simple-icinga-dashboard/metadata.py index 1d1b905..91c5cf5 100644 --- a/bundles/simple-icinga-dashboard/metadata.py +++ b/bundles/simple-icinga-dashboard/metadata.py @@ -11,4 +11,17 @@ defaults = { 'filename': '/opt/simple-icinga-dashboard/out/index.html', }, }, + 'systemd-timers': { + 'timers': { + 'simple-icinga-dashboard': { + 'when': 'minutely', + 'command': '/opt/simple-icinga-dashboard/venv/bin/python /opt/simple-icinga-dashboard/src/service.py', + 'pwd': '/opt/simple-icinga-dashboard/src/', + 'user': 'icinga_dashboard', + 'environment': { + 'STATUSPAGE_CONFIG': '/opt/simple-icinga-dashboard/config.toml', + }, + }, + }, + }, } diff --git a/nodes/ovh/icinga2.py b/nodes/ovh/icinga2.py index 0de9a46..0e9e309 100644 --- a/nodes/ovh/icinga2.py +++ b/nodes/ovh/icinga2.py @@ -39,7 +39,8 @@ nodes['ovh.icinga2'] = { 'dashboard': { 'password': vault.password_for('ovh.icinga2 icinga2 api_user dashboard'), 'permissions': { - 'objects/query/Service' + 'objects/query/Service', + 'objects/query/Host', }, }, # Used with