From 161aec93146b9cbc41d66c80170a18f826947c8c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 29 Jan 2021 18:11:17 +0100 Subject: [PATCH] bundles/powerdnsadmin: use tagged release --- bundles/powerdnsadmin/items.py | 2 +- bundles/powerdnsadmin/metadata.py | 19 +++++++++++++++++++ nodes/gce/bind01.py | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/bundles/powerdnsadmin/items.py b/bundles/powerdnsadmin/items.py index 10cd192..cb9345c 100644 --- a/bundles/powerdnsadmin/items.py +++ b/bundles/powerdnsadmin/items.py @@ -8,7 +8,7 @@ directories = { git_deploy = { '/opt/powerdnsadmin/src': { 'repo': 'https://github.com/ngoduykhanh/PowerDNS-Admin.git', - 'rev': 'master', + 'rev': node.metadata['powerdnsadmin']['version'], 'triggers': { 'action:powerdnsadmin_install_deps', 'action:powerdnsadmin_upgrade_database', diff --git a/bundles/powerdnsadmin/metadata.py b/bundles/powerdnsadmin/metadata.py index 394269a..8389941 100644 --- a/bundles/powerdnsadmin/metadata.py +++ b/bundles/powerdnsadmin/metadata.py @@ -32,3 +32,22 @@ defaults = { }, }, } + + +@metadata_reactor.provides( + 'icinga2_api/powerdnsadmin/services', +) +def icinga_check_for_new_release(metadata): + return { + 'icinga2_api': { + 'powerdnsadmin': { + 'services': { + 'POWERDNSADMIN UPDATE': { + 'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_github_for_new_release ngoduykhanh/PowerDNS-Admin {}'.format(metadata.get('powerdnsadmin/version')), + 'vars.notification.mail': True, + 'check_interval': '60m', + }, + }, + }, + }, + } diff --git a/nodes/gce/bind01.py b/nodes/gce/bind01.py index 59d5697..7f194c5 100644 --- a/nodes/gce/bind01.py +++ b/nodes/gce/bind01.py @@ -40,6 +40,9 @@ nodes['gce.bind01'] = { 'secondary_nameservers': 'dns', 'my_hostname': 'ns-1.kunbox.net', }, + 'powerdnsadmin': { + 'version': 'v0.2.3', + }, 'vm': { 'cpu': 1, 'ram': 1,