From c06ea0f096b30fdf1b83a0d9b7f72077f067b436 Mon Sep 17 00:00:00 2001 From: Dennis Wallberg Date: Wed, 22 Apr 2015 14:44:14 +0200 Subject: added nagioshost to docker --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index e471544..410b957 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -163,6 +163,7 @@ node 'datasets.sunet.se' { } node 'docker.sunet.se' { + class { 'nagioshost': } docker::image {'registry': } docker::image {'leifj/pound': } docker::run {'sunetregistry': -- cgit v1.1 From 9a6c9b342db6b00f2786edca1d974540a766b1cf Mon Sep 17 00:00:00 2001 From: Dennis Wallberg Date: Wed, 22 Apr 2015 14:58:29 +0200 Subject: nagios configuration update --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 37 +--------------------- 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 480eacf..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,7 +128,7 @@ node 'datasets.sunet.se' { } node 'docker.sunet.se' { - class { 'nagioshost': } + class { 'sunet::nagios': } docker::image {'registry': } docker::image {'leifj/pound': } docker::run {'sunetregistry': -- cgit v1.1