Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-22-v10

4 files changed, 38 insertions, 36 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index c2736bd..c7bc59c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -50,41 +50,6 @@ class mailclient ($domain) {
    cosmos::preseed::preseed_package {"postfix": ensure => present, domain => $domain}
 }
 
-class nagioshost {
-
-   $nagios_ip_v4 = hiera('nagios_ip_v4', '109.105.111.111')
-   $nagios_ip_v6 = hiera('nagios_ip_v6', '2001:948:4:6::111')
-   $allowed_hosts = "${nagios_ip_v4},${nagios_ip_v6}"
-
-   package {'nagios-nrpe-server':
-       ensure => 'installed',
-   } ->
-   file { "/etc/nagios/nrpe.cfg" :
-       ensure  => 'file',
-       mode    => '0640',
-       group   => 'nagios',
-       content => template('sunet/nagioshost/nrpe.cfg.erb'),
-   } ->
-   file { "/usr/lib/nagios/plugins/check_uptime.pl" :
-       ensure  => 'file',
-       mode    => '0640',
-       group   => 'nagios',
-       content => template('sunet/nagioshost/check_uptime.pl.erb'),
-   } ->
-   ufw::allow { "allow-nrpe-v4":
-       from  => "${nagios_ip_v4}",
-       ip    => 'any',
-       proto => 'tcp',
-       port  => 5666
-   } ->
-   ufw::allow { "allow-nrpe-v6":
-       from  => "${nagios_ip_v6}",
-       ip    => 'any',
-       proto => 'tcp',
-       port  => 5666
-   }
-}
-
 node 'sto-tug-kvm1.swamid.se' {
 
    package {'python-vm-builder':
@@ -163,6 +128,7 @@ node 'datasets.sunet.se' {
 }
 
 node 'docker.sunet.se' {
+   class { 'sunet::nagios': }
    docker::image {'registry': }
    docker::image {'leifj/pound': }
    docker::run {'sunetregistry':
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp b/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp
index 58a10bc..b05100e 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp
@@ -1,3 +1,37 @@
 class sunet::nagios {
 
+   $nagios_ip_v4 = hiera('nagios_ip_v4', '109.105.111.111')
+   $nagios_ip_v6 = hiera('nagios_ip_v6', '2001:948:4:6::111')
+   $allowed_hosts = "${nagios_ip_v4},${nagios_ip_v6}"
+
+   package {'nagios-nrpe-server':
+       ensure => 'installed',
+   } ->
+   service {'nagios-nrpe-server':
+       ensure => 'running'
+   } ->
+   file { "/etc/nagios/nrpe.cfg" :
+       ensure  => 'file',
+       mode    => '0640',
+       group   => 'nagios',
+       content => template('sunet/nagioshost/nrpe.cfg.erb'),
+   } ->
+   file { "/usr/lib/nagios/plugins/check_uptime.pl" :
+       ensure  => 'file',
+       mode    => '0751',
+       group   => 'nagios',
+       content => template('sunet/nagioshost/check_uptime.pl.erb'),
+   } ->
+   ufw::allow { "allow-nrpe-v4":
+       from  => "${nagios_ip_v4}",
+       ip    => 'any',
+       proto => 'tcp',
+       port  => 5666
+   } ->
+   ufw::allow { "allow-nrpe-v6":
+       from  => "${nagios_ip_v6}",
+       ip    => 'any',
+       proto => 'tcp',
+       port  => 5666
+   }
 }
diff --git a/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/check_uptime.pl.erb b/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/check_uptime.pl.erb
index dda05e4..e599218 100755
--- a/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/check_uptime.pl.erb
+++ b/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/check_uptime.pl.erb
@@ -1,3 +1,4 @@
+<%# check_uptime.pl %>
 #!/usr/bin/perl -w
 #
 # ============================== SUMMARY =====================================
diff --git a/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/nrpe.cfg.erb b/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/nrpe.cfg.erb
index 348aa93..960dd61 100644
--- a/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/nrpe.cfg.erb
+++ b/global/overlay/etc/puppet/modules/sunet/templates/nagioshost/nrpe.cfg.erb
@@ -236,7 +236,8 @@ command[check_load]=/usr/lib/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
 command[check_root]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p /
 command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z
 command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w 150 -c 200 
-
+command[check_uptime]=/usr/lib/nagios/plugins/check_uptime.pl -f
+command[check_reboot]=/usr/lib/nagios/plugins/check_reboot
 
 # The following examples allow user-supplied arguments and can
 # only be used if the NRPE daemon was compiled with support for