From cec2315b2d60db53526de009eaecc4ff49e3e8d3 Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Wed, 12 Feb 2025 08:17:18 +0100 Subject: [PATCH] Add nagios check baas2-restore-status --- .../overlay/etc/nagios/nrpe.d/baas2-restore.cfg | 2 ++ .../etc/puppet/modules/net/manifests/baas2_restoretest.pp | 7 +++++++ global/overlay/etc/puppet/modules/net/manifests/nrpe.pp | 7 ------- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 baas2-restoretest-prod-1.sunet.se/overlay/etc/nagios/nrpe.d/baas2-restore.cfg diff --git a/baas2-restoretest-prod-1.sunet.se/overlay/etc/nagios/nrpe.d/baas2-restore.cfg b/baas2-restoretest-prod-1.sunet.se/overlay/etc/nagios/nrpe.d/baas2-restore.cfg new file mode 100644 index 0000000..2fa17f2 --- /dev/null +++ b/baas2-restoretest-prod-1.sunet.se/overlay/etc/nagios/nrpe.d/baas2-restore.cfg @@ -0,0 +1,2 @@ +# check_baas2-restore-status +command[check_baas2-restore-status]=/usr/local/sbin/baas2-check-restore-status \ No newline at end of file diff --git a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp index 031fab6..cdb1763 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp @@ -71,6 +71,13 @@ class net::baas2_restoretest( hour => '8', ok_criteria => ['exit_status=0', 'max_age=48h'], } + + nagioscfg::service {'check_baas2-restore-status': + host_name => ['baas2-restoretest-prod-1.sunet.se'], + check_command => "check_command => 'check_nrpe_1arg!check_baas2-restore-status',", + description => 'Validates that baas2 restores are working as intended', + contact_groups => ['alerts'] + } } if $node_type == 'backupnode' { diff --git a/global/overlay/etc/puppet/modules/net/manifests/nrpe.pp b/global/overlay/etc/puppet/modules/net/manifests/nrpe.pp index 11b9849..31720be 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/nrpe.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/nrpe.pp @@ -18,12 +18,5 @@ class net::nrpe { 'nrpe_check_var', 'nrpe_check_zombie_procs', ] - - nagioscfg::service {'check_baas2-restore-status': - host_name => ['baas2-restoretest-prod-1.sunet.se'], - check_command => "check_command => 'check_nrpe_1arg!check_baas2-restore-status',", - description => 'Validates that baas2 restores are working as intended', - contact_groups => ['alerts'] - } } }