From 23e3ddf1daa52d46c40d540d25218195997e8524 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 6 Apr 2011 10:44:58 +0200 Subject: try to fix nagios::plugin problem We have a serious problem with the concept that we had up to now if you start adding more than one nagios server. This is an attempt to fix it, with certain drawbacks, such as that you have to list all the nagios plugins in the nagios modules. This will be subject of further discussion. --- manifests/base.pp | 3 --- manifests/defaults/plugins.pp | 6 ++++-- manifests/plugin.pp | 2 +- manifests/plugin/deploy.pp | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'manifests') diff --git a/manifests/base.pp b/manifests/base.pp index 8b96308..0068cd5 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -71,8 +71,6 @@ class nagios::base { notify => Service['nagios'], mode => '0750', owner => root, group => nagios; } - Package <<| tag == 'nagios::plugin::deploy::package' |>> - File <<| tag == 'nagios::plugin::deploy::file' |>> Nagios_command <<||>> Nagios_contactgroup <<||>> Nagios_contact <<||>> @@ -87,7 +85,6 @@ class nagios::base { Nagios_serviceextinfo <<||>> Nagios_service <<||>> Nagios_timeperiod <<||>> - File <<| tag == 'nagios_plugin' |>> Nagios_command <||> { target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_command.cfg", diff --git a/manifests/defaults/plugins.pp b/manifests/defaults/plugins.pp index 18f8161..b713354 100644 --- a/manifests/defaults/plugins.pp +++ b/manifests/defaults/plugins.pp @@ -1,5 +1,4 @@ class nagios::defaults::plugins { - nagios::plugin { 'check_mysql_health': source => 'nagios/plugins/check_mysql_health'; @@ -7,6 +6,9 @@ class nagios::defaults::plugins { source => 'nagios/plugins/check_dns2'; 'check_dnsbl': source => 'nagios/plugins/check_dnsbl'; + 'check_jabber_login': + source => 'nagios/plugins/check_jabber_login'; } - + # for check_jabber_login + require rubygems::xmpp4r } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index abaa6e5..c2e7676 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -2,7 +2,7 @@ define nagios::plugin( $source = 'absent', $ensure = present ){ - @@file{$name: + file{$name: path => $hardwaremodel ? { 'x86_64' => "/usr/lib64/nagios/plugins/$name", default => "/usr/lib/nagios/plugins/$name", diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 75f87d7..96fea41 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -10,14 +10,14 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ } if !defined(Package[$require_package]) { - @@package { $require_package: + package { $require_package: ensure => installed, tag => "nagios::plugin::deploy::package"; } } include nagios::plugin::scriptpaths - @@file { "nagios_plugin_${name}": + file { "nagios_plugin_${name}": path => "$nagios::plugin::scriptpaths::script_path/${name}", source => "puppet://$server/modules/$real_source", mode => 0755, owner => root, group => 0, @@ -26,5 +26,5 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ } # register the plugin - @@nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] } + nagios::plugin{$name: ensure => $ensure, require => Package['nagios-plugins'] } } -- cgit v1.2.3 From 10390a88051ea4e3ad0ded1cbf0cb93df553fe78 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 15 Jul 2011 17:36:42 +0200 Subject: it is not anymore necessary to add an empty source to purge directories --- manifests/base.pp | 3 --- 1 file changed, 3 deletions(-) (limited to 'manifests') diff --git a/manifests/base.pp b/manifests/base.pp index 0068cd5..7f9312f 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -46,7 +46,6 @@ class nagios::base { file { 'nagios_private': path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/", - source => "puppet:///modules/common/empty", ensure => directory, purge => true, recurse => true, @@ -64,7 +63,6 @@ class nagios::base { file { 'nagios_confd': path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/", - source => "puppet:///modules/common/empty", ensure => directory, purge => true, recurse => true, @@ -179,7 +177,6 @@ class nagios::base { # must be defined after exported resource overrides and cfg file defs file { 'nagios_cfgdir': path => "${nagios::defaults::vars::int_nagios_cfgdir}/", - source => "puppet:///modules/common/empty", ensure => directory, recurse => true, purge => true, -- cgit v1.2.3 From 363bdd5c7519aea45be143f4a19c10dc41a9b03f Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Wed, 1 Feb 2012 16:56:49 -0800 Subject: Fully qualify facter variables to suppress warnings --- manifests/apache.pp | 2 +- manifests/base.pp | 12 ++++++------ manifests/defaults/commands.pp | 4 ++-- manifests/defaults/templates.pp | 4 ++-- manifests/defaults/vars.pp | 2 +- manifests/init.pp | 4 ++-- manifests/irc_bot.pp | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'manifests') diff --git a/manifests/apache.pp b/manifests/apache.pp index c560e5b..6acf538 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -2,7 +2,7 @@ class nagios::apache inherits ::apache { $nagios_httpd = 'apache' include nagios - case $operatingsystem { + case $::operatingsystem { 'debian': { file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf": ensure => present, diff --git a/manifests/base.pp b/manifests/base.pp index 8b96308..315298d 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -18,9 +18,9 @@ class nagios::base { file { 'nagios_main_cfg': path => "${nagios::defaults::vars::int_nagios_cfgdir}/nagios.cfg", source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios.cfg", - "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios.cfg", + "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios.cfg", "puppet:///modules/site-nagios/configs/nagios.cfg", - "puppet:///modules/nagios/configs/${operatingsystem}/nagios.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/nagios.cfg", "puppet:///modules/nagios/configs/nagios.cfg" ], notify => Service['nagios'], mode => 0644, owner => root, group => root; @@ -29,9 +29,9 @@ class nagios::base { file { 'nagios_cgi_cfg': path => "${nagios::defaults::vars::int_nagios_cfgdir}/cgi.cfg", source => [ "puppet:///modules/site-nagios/configs/${fqdn}/cgi.cfg", - "puppet:///modules/site-nagios/configs/${operatingsystem}/cgi.cfg", + "puppet:///modules/site-nagios/configs/${::operatingsystem}/cgi.cfg", "puppet:///modules/site-nagios/configs/cgi.cfg", - "puppet:///modules/nagios/configs/${operatingsystem}/cgi.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/cgi.cfg", "puppet:///modules/nagios/configs/cgi.cfg" ], mode => '0644', owner => 'root', group => 0, notify => Service['apache'], @@ -56,8 +56,8 @@ class nagios::base { file { 'nagios_private_resource_cfg': path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/resource.cfg", - source => [ "puppet:///modules/site-nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}", - "puppet:///modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}" ], + source => [ "puppet:///modules/site-nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}", + "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ], notify => Service['nagios'], owner => root, group => nagios, mode => '0640'; } diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 17d1408..3b0da37 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -4,7 +4,7 @@ class nagios::defaults::commands { include nagios::command::imap_pop3 # common service commands - case $operatingsystem { + case $::operatingsystem { debian,ubuntu: { nagios_command { check_dummy: @@ -122,7 +122,7 @@ class nagios::defaults::commands { # notification commands - $mail_cmd_location = $operatingsystem ? { + $mail_cmd_location = $::operatingsystem ? { centos => '/bin/mail', default => '/usr/bin/mail' } diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index c97eee4..aec97c0 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -4,9 +4,9 @@ class nagios::defaults::templates { file { 'nagios_templates': path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg", source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios_templates.cfg", "puppet:///modules/site-nagios/configs/nagios_templates.cfg", - "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", "puppet:///modules/nagios/configs/nagios_templates.cfg" ], notify => Service['nagios'], mode => 0644, owner => root, group => root; diff --git a/manifests/defaults/vars.pp b/manifests/defaults/vars.pp index 6302f13..b0aef57 100644 --- a/manifests/defaults/vars.pp +++ b/manifests/defaults/vars.pp @@ -1,6 +1,6 @@ class nagios::defaults::vars { case $nagios_cfgdir { - '': { $int_nagios_cfgdir = $operatingsystem ? { + '': { $int_nagios_cfgdir = $::operatingsystem ? { centos => '/etc/nagios/', default => '/etc/nagios3' } diff --git a/manifests/init.pp b/manifests/init.pp index 1aecc3a..5050b69 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,7 +21,7 @@ class nagios { 'apache': { include apache } default: { include apache } } - case $operatingsystem { + case $::operatingsystem { 'centos': { $nagios_cfgdir = '/etc/nagios' include nagios::centos @@ -30,6 +30,6 @@ class nagios { $nagios_cfgdir = '/etc/nagios3' include nagios::debian } - default: { fail("No such operatingsystem: $operatingsystem yet defined") } + default: { fail("No such operatingsystem: ${::operatingsystem} yet defined") } } } diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp index 961755a..fc47884 100644 --- a/manifests/irc_bot.pp +++ b/manifests/irc_bot.pp @@ -4,14 +4,14 @@ class nagios::irc_bot { } $nagios_nsa_socket = $nagios_nsa_socket ? { - '' => $operatingsystem ? { + '' => $::operatingsystem ? { centos => '/var/run/nagios-nsa/nsa.socket', default => '/var/run/nagios3/nsa.socket' }, default => $nagios_nsa_socket, } $nagios_nsa_pidfile = $nagios_nsa_pidfile ? { - '' => $operatingsystem ? { + '' => $::operatingsystem ? { centos => '/var/run/nagios-nsa/nsa.pid', default => '/var/run/nagios3/nsa.pid' }, @@ -40,7 +40,7 @@ class nagios::irc_bot { } file { "/etc/init.d/nagios-nsa": owner => root, group => root, mode => 0755, - content => template("nagios/irc_bot/${operatingsystem}/nagios-nsa.sh.erb"), + content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"), require => File["/usr/local/bin/riseup-nagios-server.pl"], } file { "/etc/nagios_nsa.cfg": @@ -61,7 +61,7 @@ class nagios::irc_bot { Service['nagios'] ], } - case $operatingsystem { + case $::operatingsystem { centos: { Package['libnet-irc-perl']{ name => 'perl-Net-IRC', -- cgit v1.2.3 From 9e22cc72124c9eb1612f62653ea92538bac06855 Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Wed, 1 Feb 2012 18:00:04 -0800 Subject: fully qualify fqdn and hostname facter variables --- manifests/service.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/service.pp b/manifests/service.pp index afc8650..a739317 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,6 +1,6 @@ define nagios::service ( $ensure = present, - $host_name = $fqdn, + $host_name = $::fqdn, $check_command, $check_period = '', $normal_check_interval = '', @@ -16,7 +16,7 @@ define nagios::service ( # TODO: this resource should normally accept all nagios_host parameters - $real_name = "${hostname}_${name}" + $real_name = "${::hostname}_${name}" @@nagios_service { "${real_name}": ensure => $ensure, -- cgit v1.2.3 From 60ebd42e903db7f5c1f8bb2f1d447e4d952a7265 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 10 Feb 2012 14:42:16 +0100 Subject: use trocla for that password --- manifests/service/mysql.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp index d501f06..95f0970 100644 --- a/manifests/service/mysql.pp +++ b/manifests/service/mysql.pp @@ -1,11 +1,11 @@ -# Checks a mysql instance via tcp or socket +# Checks a mysql instance via tcp or socket define nagios::service::mysql( $ensure = present, $check_host = 'absent', $check_port = '3306', $check_username = 'nagios', - $check_password = $nagios_mysql_password, + $check_password = trocla("mysql_nagios_${::fqdn}",'plain','length: 32'), $check_database = 'information_schema', $check_warning = undef, $check_critical = undef, @@ -20,7 +20,7 @@ define nagios::service::mysql( if ($check_host == 'absent') { fail("Please specify a hostname, ip address or socket to check a mysql instance.") } - + case $check_mode { 'tcp': { if ($check_host == 'localhost') { @@ -39,7 +39,7 @@ define nagios::service::mysql( } } } - + nagios::service { "mysql_health_${name}": ensure => $ensure, check_command => "check_mysql_health!${check_host}!${check_port}!${check_username}!${check_password}!${name}!${check_database}", -- cgit v1.2.3 From 1c36e5c9188636aa7e5d093e2330356b24832ada Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 9 Apr 2012 23:45:16 -0400 Subject: Define a way to configure an NRPE command We need to be able to configure what NRPE commands are defined on clients. This new method accepts inline contents or a puppet source argument. Signed-off-by: Gabriel Filion --- manifests/nrpe/command.pp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 manifests/nrpe/command.pp (limited to 'manifests') diff --git a/manifests/nrpe/command.pp b/manifests/nrpe/command.pp new file mode 100644 index 0000000..1da73c8 --- /dev/null +++ b/manifests/nrpe/command.pp @@ -0,0 +1,33 @@ +define nagios::nrpe::command ( + $ensure = present, + $command_line = '', + $source = '' ) +{ + if ($command_line == '' and $source == '') { + fail ( "Either one of 'command_line' or 'source' must be given to nagios::nrpe::command." ) + } + + if $nagios_nrpe_cfg_dir == '' { + $nagios_nrpe_cfgdir = $nagios::nrpe::base::nagios_nrpe_cfgdir + } + + file { "$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg": + ensure => $ensure, + mode => 644, owner => root, group => root, + notify => Service['nagios-nrpe-server'], + require => File [ "$nagios_nrpe_cfgdir/nrpe.d" ] + } + + case $source { + '': { + File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { + content => template( "nagios/nrpe/nrpe_command.erb" ), + } + } + default: { + File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { + source => $source, + } + } + } +} -- cgit v1.2.3 From ef56fdd676408a1068dd9b666fb2cf57b518fd04 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 24 Jan 2011 13:07:47 -0500 Subject: Add NRPE support for FreeBSD Configuration needs to be placed in a different directory in FreeBSD. Some packages are not named the same under FreeBSD. Some packages are not available under FreeBSD. Migrate those to a new nagios::nrpe::linux class so that FreeBSD does not take them into account. --- manifests/nrpe.pp | 44 ++++++++++++-------------------------------- manifests/nrpe/base.pp | 33 +++++++++++++++++++++++++++++++++ manifests/nrpe/freebsd.pp | 10 ++++++++++ manifests/nrpe/linux.pp | 9 +++++++++ 4 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 manifests/nrpe/base.pp create mode 100644 manifests/nrpe/freebsd.pp create mode 100644 manifests/nrpe/linux.pp (limited to 'manifests') diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp index ff22441..fe75708 100644 --- a/manifests/nrpe.pp +++ b/manifests/nrpe.pp @@ -1,37 +1,17 @@ class nagios::nrpe { - if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' } + case $operatingsystem { + 'freebsd': { + if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/usr/local/etc' } - package { "nagios-nrpe-server": ensure => latest; - "nagios-plugins-basic": ensure => latest; - "nagios-plugins-standard": ensure => latest; - "libnagios-plugin-perl": ensure => present; - "libwww-perl": ensure => present; # für check_apache - "ksh": ensure => present; # für check_cpustats.sh - "sysstat": ensure => present; # für check_cpustats.sh - } - - file { [ $nagios_nrpe_cfgdir, "$nagios_nrpe_cfgdir/nrpe.d" ]: - ensure => directory } - - file { "$nagios_nrpe_cfgdir/nrpe.cfg": - content => template('nagios/nrpe/nrpe.cfg'), - owner => root, group => root, mode => 644; - } - - # default commands - file { "$nagios_nrpe_cfgdir/nrpe.d/nrpe_commands.cfg": - source => [ "puppet:///site-nagios/nrpe/nrpe_commands.cfg", - "puppet:///nagios/nrpe/nrpe_commands.cfg" ], - owner => root, group => root, mode => 644; - } - - service { "nagios-nrpe-server": - ensure => running, - enable => true, - pattern => "nrpe", - subscribe => [ File["$nagios_nrpe_cfgdir/nrpe.cfg"], - File["$nagios_nrpe_cfgdir/nrpe.d/nrpe_commands.cfg"] ] - } + include nagios::nrpe::freebsd + } + default: { + case $kernel { + linux: { include nagios::nrpe::linux } + default: { include nagios::nrpe::base } + } + } + } } diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp new file mode 100644 index 0000000..6e39d7e --- /dev/null +++ b/manifests/nrpe/base.pp @@ -0,0 +1,33 @@ +class nagios::nrpe::base { + + if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' } + if $nagios_nrpe_dont_blame == '' { $nagios_nrpe_dont_blame = 1 } + + package { "nagios-nrpe-server": ensure => present; + "nagios-plugins-basic": ensure => present; + "libnagios-plugin-perl": ensure => present; + "libwww-perl": ensure => present; # for check_apache + } + + + file { [ $nagios_nrpe_cfgdir, "$nagios_nrpe_cfgdir/nrpe.d" ]: + ensure => directory } + + file { "$nagios_nrpe_cfgdir/nrpe.cfg": + content => template('nagios/nrpe/nrpe.cfg'), + owner => root, group => root, mode => 644; + } + + # default commands + nagios::nrpe::command { "basic_nrpe": + source => [ "puppet:///modules/site-nagios/configs/nrpe/nrpe_commands.cfg", + "puppet:///modules/nagios/nrpe/nrpe_commands.cfg" ], + } + + service { "nagios-nrpe-server": + ensure => running, + enable => true, + pattern => "nrpe", + subscribe => File["$nagios_nrpe_cfgdir/nrpe.cfg"] + } +} diff --git a/manifests/nrpe/freebsd.pp b/manifests/nrpe/freebsd.pp new file mode 100644 index 0000000..3e1e0e1 --- /dev/null +++ b/manifests/nrpe/freebsd.pp @@ -0,0 +1,10 @@ +class nagios::nrpe::freebsd inherits nagios::nrpe::base { + + Package["nagios-nrpe-server"] { name => "nrpe2" } + Package["nagios-plugins-basic"] { name => "nagios-plugins" } + Package["libnagios-plugin-perl"] { name => "p5-Nagios-Plugin" } + Package["libwww-perl"] { name => "p5-libwww" } + + # TODO check_cpustats.sh is probably not working as of now. the package 'sysstat' is not available under FreeBSD + +} diff --git a/manifests/nrpe/linux.pp b/manifests/nrpe/linux.pp new file mode 100644 index 0000000..14e007f --- /dev/null +++ b/manifests/nrpe/linux.pp @@ -0,0 +1,9 @@ +class nagios::nrpe::linux inherits nagios::nrpe::base { + + package { + "nagios-plugins-standard": ensure => present; + "ksh": ensure => present; # for check_cpustats.sh + "sysstat": ensure => present; # for check_cpustats.sh + } + +} -- cgit v1.2.3 From f9f47f1e2af2d7bd4b60c84697fcffe365b1d0dd Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 24 Jan 2011 13:21:02 -0500 Subject: Fix nagios::nrpe::command for FreeBSD The 'command' resource defines files under the root group. Since the 'root' group does not exist by default on FreeBSD, make an exception for FreeBSD to use the 'wheel' group instead. --- manifests/nrpe/command.pp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'manifests') diff --git a/manifests/nrpe/command.pp b/manifests/nrpe/command.pp index 1da73c8..9c90ed7 100644 --- a/manifests/nrpe/command.pp +++ b/manifests/nrpe/command.pp @@ -18,6 +18,12 @@ define nagios::nrpe::command ( require => File [ "$nagios_nrpe_cfgdir/nrpe.d" ] } + if $operatingsystem == 'freebsd' { + File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { + group => wheel, + } + } + case $source { '': { File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { -- cgit v1.2.3 From c9de09ece4508db6b216abd0f74f07ea7befe906 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Tue, 1 Feb 2011 16:21:20 -0500 Subject: nrpe FreeBSD compatibility Make some changes to ensure compatibility of the nrpe resources with FreeBSD. * Use group 0 instead of 'root' * capitalize values for testing $operatingsystem * override arguments for the nrpe service so that FreeBSD can find the init script --- manifests/nrpe.pp | 2 +- manifests/nrpe/base.pp | 2 +- manifests/nrpe/command.pp | 8 +------- manifests/nrpe/freebsd.pp | 5 +++++ 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'manifests') diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp index fe75708..c9ecf75 100644 --- a/manifests/nrpe.pp +++ b/manifests/nrpe.pp @@ -1,7 +1,7 @@ class nagios::nrpe { case $operatingsystem { - 'freebsd': { + 'FreeBSD': { if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/usr/local/etc' } include nagios::nrpe::freebsd diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index 6e39d7e..d96dc3f 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -15,7 +15,7 @@ class nagios::nrpe::base { file { "$nagios_nrpe_cfgdir/nrpe.cfg": content => template('nagios/nrpe/nrpe.cfg'), - owner => root, group => root, mode => 644; + owner => root, group => 0, mode => 644; } # default commands diff --git a/manifests/nrpe/command.pp b/manifests/nrpe/command.pp index 9c90ed7..e6ebdae 100644 --- a/manifests/nrpe/command.pp +++ b/manifests/nrpe/command.pp @@ -13,17 +13,11 @@ define nagios::nrpe::command ( file { "$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg": ensure => $ensure, - mode => 644, owner => root, group => root, + mode => 644, owner => root, group => 0, notify => Service['nagios-nrpe-server'], require => File [ "$nagios_nrpe_cfgdir/nrpe.d" ] } - if $operatingsystem == 'freebsd' { - File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { - group => wheel, - } - } - case $source { '': { File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] { diff --git a/manifests/nrpe/freebsd.pp b/manifests/nrpe/freebsd.pp index 3e1e0e1..73e7687 100644 --- a/manifests/nrpe/freebsd.pp +++ b/manifests/nrpe/freebsd.pp @@ -7,4 +7,9 @@ class nagios::nrpe::freebsd inherits nagios::nrpe::base { # TODO check_cpustats.sh is probably not working as of now. the package 'sysstat' is not available under FreeBSD + Service["nagios-nrpe-server"] { + pattern => undef, + path => "/usr/local/etc/rc.d", + name => "nrpe2", + } } -- cgit v1.2.3 From 7d9843fae4c939670f005661d5867578d0a0827e Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Tue, 15 Feb 2011 19:11:01 -0500 Subject: Avoid the "libnagios-plugin-perl" package for lenny This package doesn't exist on lenny. --- manifests/nrpe/base.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index d96dc3f..8636760 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -1,18 +1,21 @@ class nagios::nrpe::base { if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' } - if $nagios_nrpe_dont_blame == '' { $nagios_nrpe_dont_blame = 1 } package { "nagios-nrpe-server": ensure => present; "nagios-plugins-basic": ensure => present; - "libnagios-plugin-perl": ensure => present; "libwww-perl": ensure => present; # for check_apache } + # Special-case lenny. the package doesn't exist + if $lsbdistcodename != 'lenny' { + package { "libnagios-plugin-perl": ensure => present; } + } file { [ $nagios_nrpe_cfgdir, "$nagios_nrpe_cfgdir/nrpe.d" ]: ensure => directory } + if $nagios_nrpe_dont_blame == '' { $nagios_nrpe_dont_blame = 1 } file { "$nagios_nrpe_cfgdir/nrpe.cfg": content => template('nagios/nrpe/nrpe.cfg'), owner => root, group => 0, mode => 644; -- cgit v1.2.3 From 7fb80fbecfa5a186846a2909bd1d6ada32ba21e1 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Wed, 27 Apr 2011 15:46:58 -0400 Subject: Define check_load as a function of the nb of cpus The "check_load" nagios check should not be hardcoded to some arbitrary value. The thresholds should rather be adjusted in function of how many CPUs are present in the server. The factors were chosen by prior experience but could be adjusted if needed. Factors for warning thresholds (where N is the nb of cpus): * 1min : 5 * N * 5mins : 4 * N * 15mins : 3 * N Factors for critical thresholds: * 1min : 10 * N * 5mins : 9 * N * 15mins : 8 * N --- manifests/nrpe/base.pp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index 8636760..1d26849 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -23,9 +23,21 @@ class nagios::nrpe::base { # default commands nagios::nrpe::command { "basic_nrpe": - source => [ "puppet:///modules/site-nagios/configs/nrpe/nrpe_commands.cfg", + source => [ "puppet:///modules/site-nagios/configs/nrpe/nrpe_commands.${fqdn}.cfg", + "puppet:///modules/site-nagios/configs/nrpe/nrpe_commands.cfg", "puppet:///modules/nagios/nrpe/nrpe_commands.cfg" ], } + # the check for load should be customized for each server based on number + # of CPUs and the type of activity. + $warning_1_threshold = 5 * $processorcount + $warning_5_threshold = 4 * $processorcount + $warning_15_threshold = 3 * $processorcount + $critical_1_threshold = 10 * $processorcount + $critical_5_threshold = 9 * $processorcount + $critical_15_threshold = 8 * $processorcount + nagios::nrpe::command { "check_load": + command_line => "/usr/lib/nagios/plugins/check_load -w ${warning_1_threshold},${warning_5_threshold},${warning_15_threshold} -c ${critical_1_threshold},${critical_5_threshold},${critical_15_threshold}", + } service { "nagios-nrpe-server": ensure => running, -- cgit v1.2.3 From ba5ef8e555e16f9fb6a5e6bb8f8d5bf3c12c1827 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Thu, 26 May 2011 15:58:26 -0400 Subject: nrpe: bump up multipliers for check_load The CPU checks were fireing way too often. Bump up the multipliers to reduce the number of alerts. --- manifests/nrpe/base.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index 1d26849..c14692e 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -29,9 +29,9 @@ class nagios::nrpe::base { } # the check for load should be customized for each server based on number # of CPUs and the type of activity. - $warning_1_threshold = 5 * $processorcount - $warning_5_threshold = 4 * $processorcount - $warning_15_threshold = 3 * $processorcount + $warning_1_threshold = 7 * $processorcount + $warning_5_threshold = 6 * $processorcount + $warning_15_threshold = 5 * $processorcount $critical_1_threshold = 10 * $processorcount $critical_5_threshold = 9 * $processorcount $critical_15_threshold = 8 * $processorcount -- cgit v1.2.3 From d0b45ed20e2d13e70d13dbd53a8a8ba8650298c9 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 6 Jun 2011 18:01:57 -0400 Subject: Add a nagios::nrpe::xinetd class We don't really manage everything with this class (e.g. not the config for running NRPE under xinetd). We ensure that the nrpe service is not running since xinetd is the one that's supposed to spawn nrpe. This way we can manage the NRPE config and commands, but it does not conflict with xinetd. --- manifests/nrpe/xinetd.pp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 manifests/nrpe/xinetd.pp (limited to 'manifests') diff --git a/manifests/nrpe/xinetd.pp b/manifests/nrpe/xinetd.pp new file mode 100644 index 0000000..e13ed76 --- /dev/null +++ b/manifests/nrpe/xinetd.pp @@ -0,0 +1,11 @@ +# This is created only to cope with cases where we're not the only ones +# administering a machine and NRPE is running in xinetd. +class nagios::nrpe::xinetd inherits base { + + Service ["nagios-nrpe-server"] { + ensure => stopped, + } + + # TODO manage the xinetd config file that glues with NRPE + +} -- cgit v1.2.3 From c2391b7a83d8be4343622458b852bf90bd3919b6 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Thu, 28 Jul 2011 13:23:52 -0400 Subject: default processorcount to 1 if it is not present --- manifests/nrpe/base.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests') diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index c14692e..f0c76b1 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -1,6 +1,7 @@ class nagios::nrpe::base { if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' } + if $processorcount == '' { $processorcount = 1 } package { "nagios-nrpe-server": ensure => present; "nagios-plugins-basic": ensure => present; -- cgit v1.2.3 From e335357ad435c3bd9648d1763a229fd3a6077a8f Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Thu, 28 Jul 2011 13:33:58 -0400 Subject: make the nrpe service depend on the package --- manifests/nrpe/base.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index f0c76b1..f1809d7 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -44,6 +44,7 @@ class nagios::nrpe::base { ensure => running, enable => true, pattern => "nrpe", - subscribe => File["$nagios_nrpe_cfgdir/nrpe.cfg"] + subscribe => File["$nagios_nrpe_cfgdir/nrpe.cfg"], + require => Package["nagios-nrpe-server"], } } -- cgit v1.2.3 From b956d666681ccf20f70be65c3b57aa77928a9be9 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Thu, 28 Jul 2011 13:34:22 -0400 Subject: fix nrpe package name in freebsd --- manifests/nrpe/freebsd.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/nrpe/freebsd.pp b/manifests/nrpe/freebsd.pp index 73e7687..4ae693c 100644 --- a/manifests/nrpe/freebsd.pp +++ b/manifests/nrpe/freebsd.pp @@ -1,6 +1,6 @@ class nagios::nrpe::freebsd inherits nagios::nrpe::base { - Package["nagios-nrpe-server"] { name => "nrpe2" } + Package["nagios-nrpe-server"] { name => "nrpe" } Package["nagios-plugins-basic"] { name => "nagios-plugins" } Package["libnagios-plugin-perl"] { name => "p5-Nagios-Plugin" } Package["libwww-perl"] { name => "p5-libwww" } -- cgit v1.2.3 From 8f24f259caa75f78ed501377c95c0a6fab0ebb11 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 7 Nov 2011 12:07:28 -0500 Subject: Fix NRPE for FreeBSD Plugins are found under another directory. The pid file must be changed to /var/spool/nagios/nrpe2.pid, since this place is writable by the daemon, and the rc script expects the pid file to be found there. Use a pattern instead of the rc script status command. --- manifests/nrpe.pp | 5 +++++ manifests/nrpe/base.pp | 2 +- manifests/nrpe/freebsd.pp | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp index c9ecf75..5c05ed4 100644 --- a/manifests/nrpe.pp +++ b/manifests/nrpe.pp @@ -3,10 +3,15 @@ class nagios::nrpe { case $operatingsystem { 'FreeBSD': { if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/usr/local/etc' } + if $nagios_nrpe_pid_file == '' { $nagios_nrpe_pid_file = '/var/spool/nagios/nrpe2.pid' } + if $nagios_plugin_dir == '' { $nagios_plugin_dir = '/usr/local/libexec/nagios' } include nagios::nrpe::freebsd } default: { + if $nagios_nrpe_pid_file == '' { $nagios_nrpe_pid_file = '/var/run/nrpe.pid' } + if $nagios_plugin_dir == '' { $nagios_plugin_dir = '/usr/lib/nagios/plugins' } + case $kernel { linux: { include nagios::nrpe::linux } default: { include nagios::nrpe::base } diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index f1809d7..17abb04 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -37,7 +37,7 @@ class nagios::nrpe::base { $critical_5_threshold = 9 * $processorcount $critical_15_threshold = 8 * $processorcount nagios::nrpe::command { "check_load": - command_line => "/usr/lib/nagios/plugins/check_load -w ${warning_1_threshold},${warning_5_threshold},${warning_15_threshold} -c ${critical_1_threshold},${critical_5_threshold},${critical_15_threshold}", + command_line => "${nagios_plugin_dir}/check_load -w ${warning_1_threshold},${warning_5_threshold},${warning_15_threshold} -c ${critical_1_threshold},${critical_5_threshold},${critical_15_threshold}", } service { "nagios-nrpe-server": diff --git a/manifests/nrpe/freebsd.pp b/manifests/nrpe/freebsd.pp index 4ae693c..063b79b 100644 --- a/manifests/nrpe/freebsd.pp +++ b/manifests/nrpe/freebsd.pp @@ -8,8 +8,9 @@ class nagios::nrpe::freebsd inherits nagios::nrpe::base { # TODO check_cpustats.sh is probably not working as of now. the package 'sysstat' is not available under FreeBSD Service["nagios-nrpe-server"] { - pattern => undef, + pattern => "^/usr/local/sbin/nrpe2", path => "/usr/local/etc/rc.d", name => "nrpe2", + hasstatus => "false", } } -- cgit v1.2.3 From b0a5c09d81d0eb5151c32c6d8d14753c8529ede5 Mon Sep 17 00:00:00 2001 From: Erik Froese Date: Wed, 25 Apr 2012 09:57:39 -0400 Subject: Add the port arg to check_http_url_regex. Default 80. --- manifests/defaults/commands.pp | 2 +- manifests/service/http.pp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 3b0da37..195c8e3 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -64,7 +64,7 @@ class nagios::defaults::commands { check_http_url: command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$'; check_http_url_regex: - command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -e $ARG3$'; + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$'; check_https_url: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: diff --git a/manifests/service/http.pp b/manifests/service/http.pp index 8fd5059..ef63abb 100644 --- a/manifests/service/http.pp +++ b/manifests/service/http.pp @@ -6,6 +6,7 @@ define nagios::service::http( $ensure = present, $check_domain = 'absent', + $port = '80', $check_url = '/', $check_code = 'OK', $use = 'generic-service', @@ -27,7 +28,7 @@ define nagios::service::http( nagios::service{"httprd_${name}": ensure => $ensure, use => $use, - check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'301'", + check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'301'", } } } @@ -38,7 +39,7 @@ define nagios::service::http( nagios::service{"http_${name}_${check_code}": ensure => $ensure, use => $use, - check_command => "check_http_url_regex!${real_check_domain}!${check_url}!'${check_code}'", + check_command => "check_http_url_regex!${real_check_domain}!${port}!${check_url}!'${check_code}'", } } } -- cgit v1.2.3 From cd05fee87d406a77eaf0f4441062e3478c27601d Mon Sep 17 00:00:00 2001 From: Erik Froese Date: Tue, 24 Apr 2012 11:52:22 -0400 Subject: Remove unnecessary jabber dependency. --- manifests/defaults/plugins.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'manifests') diff --git a/manifests/defaults/plugins.pp b/manifests/defaults/plugins.pp index b713354..abd8b52 100644 --- a/manifests/defaults/plugins.pp +++ b/manifests/defaults/plugins.pp @@ -6,9 +6,5 @@ class nagios::defaults::plugins { source => 'nagios/plugins/check_dns2'; 'check_dnsbl': source => 'nagios/plugins/check_dnsbl'; - 'check_jabber_login': - source => 'nagios/plugins/check_jabber_login'; } - # for check_jabber_login - require rubygems::xmpp4r } -- cgit v1.2.3 From 057af9e85d958b1f75a4999570693f1fd428993a Mon Sep 17 00:00:00 2001 From: Erik Froese Date: Tue, 1 May 2012 11:15:07 -0400 Subject: Move the jabber plugin to its own class. --- manifests/plugin/jabber.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 manifests/plugin/jabber.pp (limited to 'manifests') diff --git a/manifests/plugin/jabber.pp b/manifests/plugin/jabber.pp new file mode 100644 index 0000000..380a5c0 --- /dev/null +++ b/manifests/plugin/jabber.pp @@ -0,0 +1,10 @@ +class nagios::plugins::jabber { + + # for check_jabber_login + require rubygems::xmpp4r + + nagios::plugin { 'check_jabber_login': + source => 'nagios/plugins/check_jabber_login' + } +} + -- cgit v1.2.3 From 3db1ca8f85b28978a3a9c09de3551f536b1375a6 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 15 May 2012 21:30:17 +0200 Subject: put the class the right place --- manifests/plugin/jabber.pp | 10 ---------- manifests/plugins/jabber.pp | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 manifests/plugin/jabber.pp create mode 100644 manifests/plugins/jabber.pp (limited to 'manifests') diff --git a/manifests/plugin/jabber.pp b/manifests/plugin/jabber.pp deleted file mode 100644 index 380a5c0..0000000 --- a/manifests/plugin/jabber.pp +++ /dev/null @@ -1,10 +0,0 @@ -class nagios::plugins::jabber { - - # for check_jabber_login - require rubygems::xmpp4r - - nagios::plugin { 'check_jabber_login': - source => 'nagios/plugins/check_jabber_login' - } -} - diff --git a/manifests/plugins/jabber.pp b/manifests/plugins/jabber.pp new file mode 100644 index 0000000..380a5c0 --- /dev/null +++ b/manifests/plugins/jabber.pp @@ -0,0 +1,10 @@ +class nagios::plugins::jabber { + + # for check_jabber_login + require rubygems::xmpp4r + + nagios::plugin { 'check_jabber_login': + source => 'nagios/plugins/check_jabber_login' + } +} + -- cgit v1.2.3 From 0fe7552f256f0b1508cc5d3cab952eb93bee6811 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 5 Jun 2012 19:34:51 -0300 Subject: new style for 2.7 --- manifests/apache.pp | 15 ++++--- manifests/base.pp | 94 ++++++++++++++++++++--------------------- manifests/centos.pp | 2 +- manifests/debian.pp | 4 +- manifests/defaults/templates.pp | 22 +++++----- manifests/defaults/vars.pp | 6 +-- manifests/init.pp | 17 +++++--- manifests/irc_bot.pp | 45 +++++++++----------- manifests/nsca/client.pp | 6 +-- manifests/nsca/server.pp | 10 ++--- manifests/plugin/deploy.pp | 6 +-- manifests/plugin/scriptpaths.pp | 2 +- manifests/service/ntp.pp | 8 ++-- manifests/service/ping.pp | 16 +++---- manifests/target.pp | 14 +++--- manifests/target/fqdn.pp | 4 +- 16 files changed, 132 insertions(+), 139 deletions(-) (limited to 'manifests') diff --git a/manifests/apache.pp b/manifests/apache.pp index 6acf538..0696723 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,20 +1,21 @@ class nagios::apache inherits ::apache { - $nagios_httpd = 'apache' - include nagios + class{'nagios': + httpd => 'apache' + } case $::operatingsystem { 'debian': { - file { "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf": + file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": ensure => present, - source => ["puppet:///site-nagios/configs/${fqdn}/apache2.conf", - "puppet:///site-nagios/configs/apache2.conf", + source => ["puppet:///site_nagios/configs/${::fqdn}/apache2.conf", + "puppet:///site_nagios/configs/apache2.conf", "puppet:///nagios/configs/apache2.conf"], } apache::config::global { "nagios3.conf": ensure => link, - target => "${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf", - require => File["${nagios::defaults::vars::int_nagios_cfgdir}/apache2.conf"], + target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], } } } diff --git a/manifests/base.pp b/manifests/base.pp index 5a7cb7d..e706bb9 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -4,7 +4,7 @@ class nagios::base { package { 'nagios': alias => 'nagios', - ensure => present, + ensure => present, } service { 'nagios': @@ -16,21 +16,21 @@ class nagios::base { # this file should contain all the nagios_puppet-paths: file { 'nagios_main_cfg': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/nagios.cfg", - source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios.cfg", - "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios.cfg", - "puppet:///modules/site-nagios/configs/nagios.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/nagios.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios.cfg", + "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios.cfg", + "puppet:///modules/site_nagios/configs/nagios.cfg", "puppet:///modules/nagios/configs/${::operatingsystem}/nagios.cfg", "puppet:///modules/nagios/configs/nagios.cfg" ], notify => Service['nagios'], mode => 0644, owner => root, group => root; - } + } file { 'nagios_cgi_cfg': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/cgi.cfg", - source => [ "puppet:///modules/site-nagios/configs/${fqdn}/cgi.cfg", - "puppet:///modules/site-nagios/configs/${::operatingsystem}/cgi.cfg", - "puppet:///modules/site-nagios/configs/cgi.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/cgi.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/cgi.cfg", + "puppet:///modules/site_nagios/configs/${::operatingsystem}/cgi.cfg", + "puppet:///modules/site_nagios/configs/cgi.cfg", "puppet:///modules/nagios/configs/${::operatingsystem}/cgi.cfg", "puppet:///modules/nagios/configs/cgi.cfg" ], mode => '0644', owner => 'root', group => 0, @@ -38,14 +38,14 @@ class nagios::base { } file { 'nagios_htpasswd': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/htpasswd.users", - source => [ "puppet:///modules/site-nagios/htpasswd.users", + path => "${nagios::defaults::vars::int_cfgdir}/htpasswd.users", + source => [ "puppet:///modules/site_nagios/htpasswd.users", "puppet:///modules/nagios/htpasswd.users" ], mode => 0640, owner => root, group => apache; } file { 'nagios_private': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/", + path => "${nagios::defaults::vars::int_cfgdir}/private/", ensure => directory, purge => true, recurse => true, @@ -54,15 +54,15 @@ class nagios::base { } file { 'nagios_private_resource_cfg': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/resource.cfg", - source => [ "puppet:///modules/site-nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}", + path => "${nagios::defaults::vars::int_cfgdir}/private/resource.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}", "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ], notify => Service['nagios'], owner => root, group => nagios, mode => '0640'; } file { 'nagios_confd': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/", + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/", ensure => directory, purge => true, recurse => true, @@ -85,88 +85,88 @@ class nagios::base { Nagios_timeperiod <<||>> Nagios_command <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_command.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_command.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_contact <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contact.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contact.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_contactgroup <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contactgroup.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contactgroup.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_host <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_host.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_host.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_hostdependency <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostdependency.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostdependency.cfg", notify => Service['nagios'], } Nagios_hostescalation <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostescalation.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostescalation.cfg", notify => Service['nagios'], } Nagios_hostextinfo <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostextinfo.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_hostgroup <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroup.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroup.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_service <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_service.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_service.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_servicegroup <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicegroup.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicegroup.cfg", notify => Service['nagios'], } Nagios_servicedependency <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicedependency.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicedependency.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_serviceescalation <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceescalation.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_serviceextinfo <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceextinfo.cfg", require => File['nagios_confd'], notify => Service['nagios'], } Nagios_timeperiod <||> { - target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_timeperiod.cfg", + target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_timeperiod.cfg", require => File['nagios_confd'], notify => Service['nagios'], } - file{[ "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_command.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contact.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contactgroup.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_host.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostdependency.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostescalation.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroup.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_service.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicedependency.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicegroup.cfg", - "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_timeperiod.cfg" ]: + file{[ "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_command.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contact.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contactgroup.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_host.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostdependency.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostescalation.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostextinfo.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroup.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroupescalation.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_service.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicedependency.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceescalation.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceextinfo.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicegroup.cfg", + "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_timeperiod.cfg" ]: ensure => file, replace => false, notify => Service['nagios'], @@ -176,7 +176,7 @@ class nagios::base { # manage nagios cfg files # must be defined after exported resource overrides and cfg file defs file { 'nagios_cfgdir': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/", + path => "${nagios::defaults::vars::int_cfgdir}/", ensure => directory, recurse => true, purge => true, @@ -184,7 +184,7 @@ class nagios::base { mode => 0755, owner => root, group => root; } - if $use_munin { + if hiera('use_munin',false) { include nagios::munin } diff --git a/manifests/centos.pp b/manifests/centos.pp index 35379b8..5a2ba23 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -9,7 +9,7 @@ class nagios::centos inherits nagios::base { hasstatus => true, } - if ($nagios_allow_external_cmd) { + if $nagios::allow_external_cmd { file { '/var/spool/nagios/cmd': ensure => 'directory', require => Package['nagios'], diff --git a/manifests/debian.pp b/manifests/debian.pp index b9e87ec..bb9bb38 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -14,13 +14,13 @@ class nagios::debian inherits nagios::base { File['nagios_htpasswd', 'nagios_cgi_cfg'] { group => 'www-data' } - file { "${nagios::defaults::vars::int_nagios_cfgdir}/stylesheets": + file { "${nagios::defaults::vars::int_cfgdir}/stylesheets": ensure => directory, purge => false, recurse => true, } - if ($nagios_allow_external_cmd) { + if $nagios::allow_external_cmd { exec { 'nagios_external_cmd_perms_overrides': command => 'dpkg-statoverride --update --add nagios www-data 2710 /var/lib/nagios3/rw && dpkg-statoverride --update --add nagios nagios 751 /var/lib/nagios3', unless => 'dpkg-statoverride --list nagios www-data 2710 /var/lib/nagios3/rw && dpkg-statoverride --list nagios nagios 751 /var/lib/nagios3', diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index aec97c0..0e73c97 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -1,15 +1,15 @@ class nagios::defaults::templates { - include nagios::defaults::vars + include nagios::defaults::vars - file { 'nagios_templates': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg", - source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/nagios_templates.cfg", - "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", - "puppet:///modules/nagios/configs/nagios_templates.cfg" ], - notify => Service['nagios'], - mode => 0644, owner => root, group => root; - } + file { 'nagios_templates': + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_templates.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios_templates.cfg", + "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios_templates.cfg", + "puppet:///modules/site_nagios/configs/nagios_templates.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", + "puppet:///modules/nagios/configs/nagios_templates.cfg" ], + notify => Service['nagios'], + mode => 0644, owner => root, group => root; + } } diff --git a/manifests/defaults/vars.pp b/manifests/defaults/vars.pp index b0aef57..87f41f8 100644 --- a/manifests/defaults/vars.pp +++ b/manifests/defaults/vars.pp @@ -1,10 +1,10 @@ class nagios::defaults::vars { - case $nagios_cfgdir { - '': { $int_nagios_cfgdir = $::operatingsystem ? { + case $nagios::cfgdir { + '': { $int_cfgdir = $::operatingsystem ? { centos => '/etc/nagios/', default => '/etc/nagios3' } } - default: { $int_nagios_cfgdir = $nagios_cfgdir } + default: { $int_cfgdir = $nagios::cfgdir } } } diff --git a/manifests/init.pp b/manifests/init.pp index 5050b69..d3a00df 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -8,14 +8,17 @@ # Marcel Härry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # -# This program is free software; you can redistribute -# it and/or modify it under the terms of the GNU -# General Public License version 3 as published by +# This program is free software; you can redistribute +# it and/or modify it under the terms of the GNU +# General Public License version 3 as published by # the Free Software Foundation. # -class nagios { - case $nagios_httpd { +class nagios( + $httpd = hiera('nagios_httpd','apache'), + $allow_external_cmd = hiera('nagios_allow_external_cmd',false), +) { + case $nagios::httpd { 'absent': { } 'lighttpd': { include lighttpd } 'apache': { include apache } @@ -23,11 +26,11 @@ class nagios { } case $::operatingsystem { 'centos': { - $nagios_cfgdir = '/etc/nagios' + $cfgdir = '/etc/nagios' include nagios::centos } 'debian': { - $nagios_cfgdir = '/etc/nagios3' + $cfgdir = '/etc/nagios3' include nagios::debian } default: { fail("No such operatingsystem: ${::operatingsystem} yet defined") } diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp index fc47884..5d684f8 100644 --- a/manifests/irc_bot.pp +++ b/manifests/irc_bot.pp @@ -1,33 +1,26 @@ -class nagios::irc_bot { - if ( ! ($nagios_nsa_server and $nagios_nsa_nickname and $nagios_nsa_channel) ) { - fail("Please provide values at least for \$nagios_nsa_server, \$nagios_nsa_nickname and \$nagios_nsa_channel") - } - - $nagios_nsa_socket = $nagios_nsa_socket ? { - '' => $::operatingsystem ? { +class nagios::irc_bot( + $nsa_socket = hiera('nagios_nsa_socket','absent'), + $nsa_server = hiera('nagios_nsa_server'), + $nsa_port = hiera('nagios_nsa_port',6667), + $nsa_nickname = hiera('nagios_nsa_nickname'), + $nsa_password = hiera('nagios_nsa_password',''), + $nsa_channel = hiera('nagios_nsa_channel'), + $nsa_pidfile = hiera('nagios_nsa_pidfile','absent'), + $nsa_realname = hiera('nagios_nsa_realname','Nagios') +) { + $real_nsa_socket = $nsa_socket ? { + 'absent' => $::operatingsystem ? { centos => '/var/run/nagios-nsa/nsa.socket', default => '/var/run/nagios3/nsa.socket' }, - default => $nagios_nsa_socket, + default => $nsa_socket, } - $nagios_nsa_pidfile = $nagios_nsa_pidfile ? { - '' => $::operatingsystem ? { + $real__nsa_pidfile = $nsa_pidfile ? { + 'absent' => $::operatingsystem ? { centos => '/var/run/nagios-nsa/nsa.pid', default => '/var/run/nagios3/nsa.pid' }, - default => $nagios_nsa_pidfile, - } - $nagios_nsa_port = $nagios_nsa_port ? { - '' => '6667', - default => $nagios_nsa_port, - } - $nagios_nsa_realname = $nagios_nsa_realname ? { - '' => 'Nagios', - default => $nagios_nsa_realname, - } - - if (! $nagios_nsa_password) { - $nagios_nsa_password = '' + default => $nsa_pidfile, } file { "/usr/local/bin/riseup-nagios-client.pl": @@ -64,12 +57,12 @@ class nagios::irc_bot { case $::operatingsystem { centos: { Package['libnet-irc-perl']{ - name => 'perl-Net-IRC', + name => 'perl-Net-IRC', } Service['nagios-nsa']{ enable => true, } - } + } debian,ubuntu: { exec { "nagios_nsa_init_script": command => "/usr/sbin/update-rc.d nagios-nsa defaults", @@ -87,7 +80,7 @@ class nagios::irc_bot { command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($HOSTALIAS$) $NOTIFICATIONTYPE$ n.$HOSTATTEMPT$ $HOSTSTATETYPE$ took $HOSTEXECUTIONTIME$s $HOSTOUTPUT$ $HOSTPERFDATA$ $HOSTLATENCY$s"'; } - if $use_shorewall { + if hiera('use_shorewall',false) { include shorewall::rules::out::irc } } diff --git a/manifests/nsca/client.pp b/manifests/nsca/client.pp index 6e2c472..e58721d 100644 --- a/manifests/nsca/client.pp +++ b/manifests/nsca/client.pp @@ -1,10 +1,10 @@ class nagios::nsca::client { package { 'nsca': ensure => installed } - + file { '/etc/send_nsca.cfg': - source => [ "puppet:///modules/site-nagios/nsca/{$fqdn}/send_nsca.cfg", - "puppet:///modules/site-nagios/nsca/send_nsca.cfg", + source => [ "puppet:///modules/site_nagios/nsca/{$::fqdn}/send_nsca.cfg", + "puppet:///modules/site_nagios/nsca/send_nsca.cfg", "puppet:///modules/nagios/nsca/send_nsca.cfg" ], owner => 'nagios', group => 'nogroup', diff --git a/manifests/nsca/server.pp b/manifests/nsca/server.pp index 9239f21..8ba0116 100644 --- a/manifests/nsca/server.pp +++ b/manifests/nsca/server.pp @@ -1,21 +1,21 @@ class nagios::nsca::server { package { 'nsca': ensure => installed } - + service { 'nsca': ensure => running, hasstatus => false, hasrestart => true, } - + file { '/etc/nsca.cfg': - source => [ "puppet:///modules/site-nagios/nsca/{$fqdn}/nsca.cfg", - "puppet:///modules/site-nagios/nsca/nsca.cfg", + source => [ "puppet:///modules/site_nagios/nsca/{$::fqdn}/nsca.cfg", + "puppet:///modules/site_nagios/nsca/nsca.cfg", "puppet:///modules/nagios/nsca/nsca.cfg" ], owner => 'nagios', group => 'nogroup', mode => '400', notify => Service['nsca'], } - + } diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 96fea41..3f2a1a4 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -5,7 +5,7 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ default => $ensure } $real_source = $source ? { - '' => "nagios/plugins/$plugin_src", + '' => "nagios/plugins/${plugin_src}", default => $source } @@ -15,11 +15,11 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ tag => "nagios::plugin::deploy::package"; } } - + include nagios::plugin::scriptpaths file { "nagios_plugin_${name}": path => "$nagios::plugin::scriptpaths::script_path/${name}", - source => "puppet://$server/modules/$real_source", + source => "puppet:///modules/${real_source}", mode => 0755, owner => root, group => 0, require => Package[$require_package], tag => "nagios::plugin::deploy::file"; diff --git a/manifests/plugin/scriptpaths.pp b/manifests/plugin/scriptpaths.pp index 6065709..9cd4b5d 100644 --- a/manifests/plugin/scriptpaths.pp +++ b/manifests/plugin/scriptpaths.pp @@ -1,5 +1,5 @@ class nagios::plugin::scriptpaths { - case $hardwaremodel { + case $::hardwaremodel { x86_64: { $script_path = "/usr/lib64/nagios/plugins/" } default: { $script_path = "/usr/lib/nagios/plugins" } } diff --git a/manifests/service/ntp.pp b/manifests/service/ntp.pp index eca255a..b3cde2a 100644 --- a/manifests/service/ntp.pp +++ b/manifests/service/ntp.pp @@ -1,9 +1,9 @@ # manifests/service/ntp.pp class nagios::service::ntp { - nagios::service{ "check_ntp": - check_command => "check_ntp_time", - host_name => $fqdn, - } + nagios::service{ "check_ntp": + check_command => "check_ntp_time", + host_name => $::fqdn, + } } diff --git a/manifests/service/ping.pp b/manifests/service/ping.pp index c705c68..80f2114 100644 --- a/manifests/service/ping.pp +++ b/manifests/service/ping.pp @@ -1,13 +1,9 @@ define nagios::service::ping( - $ensure = present + $ensure = present, + $ping_rate = hiera('nagios_ping_rate','!100.0,20%!500.0,60%') ){ - $real_nagios_ping_rate = $nagios_ping_rate ? { - '' => '!100.0,20%!500.0,60%', - default => $nagios_ping_rate - } - - nagios::service{ "check_ping": - ensure => $ensure, - check_command => "check_ping${real_nagios_ping_rate}", - } + nagios::service{ "check_ping": + ensure => $ensure, + check_command => "check_ping${ping_rate}", + } } diff --git a/manifests/target.pp b/manifests/target.pp index 675ac1a..fc39834 100644 --- a/manifests/target.pp +++ b/manifests/target.pp @@ -1,15 +1,17 @@ # manifests/target.pp -class nagios::target { +class nagios::target( + $parents = 'absent', +) { - @@nagios_host { "${fqdn}": - address => $ipaddress, - alias => $hostname, + @@nagios_host { $::fqdn: + address => $::ipaddress, + alias => $::hostname, use => 'generic-host', } - if ($nagios_parents != '') { - Nagios_host["${fqdn}"] { parents => $nagios_parents } + if ($parents != 'absent') { + Nagios_host["${::fqdn}"] { parents => $parents } } } diff --git a/manifests/target/fqdn.pp b/manifests/target/fqdn.pp index acac5d6..2521533 100644 --- a/manifests/target/fqdn.pp +++ b/manifests/target/fqdn.pp @@ -1,5 +1,3 @@ class nagios::target::fqdn inherits nagios::target { - - Nagios_host["${fqdn}"] { address => "${fqdn}" } - + Nagios_host[$::fqdn] { address => $::fqdn } } -- cgit v1.2.3 From 106515b61b731489cce2d8b74bea13b26d4a65f6 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 8 Jun 2012 13:04:33 -0300 Subject: refactor things for >2.7 --- manifests/apache.pp | 34 +++++++++++++++++----------------- manifests/init.pp | 6 +++--- manifests/plugin.pp | 10 +++++----- manifests/target.pp | 25 +++++++++++++++---------- manifests/target/fqdn.pp | 11 +++++++++-- 5 files changed, 49 insertions(+), 37 deletions(-) (limited to 'manifests') diff --git a/manifests/apache.pp b/manifests/apache.pp index 0696723..38026f7 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,22 +1,22 @@ class nagios::apache inherits ::apache { - class{'nagios': - httpd => 'apache' - } + class{'nagios': + httpd => 'apache' + } - case $::operatingsystem { - 'debian': { - file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": - ensure => present, - source => ["puppet:///site_nagios/configs/${::fqdn}/apache2.conf", - "puppet:///site_nagios/configs/apache2.conf", - "puppet:///nagios/configs/apache2.conf"], - } + case $::operatingsystem { + 'debian': { + file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": + ensure => present, + source => [ "puppet:///site_nagios/configs/${::fqdn}/apache2.conf", + "puppet:///site_nagios/configs/apache2.conf", + "puppet:///nagios/configs/apache2.conf"], + } - apache::config::global { "nagios3.conf": - ensure => link, - target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", - require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], - } - } + apache::config::global { "nagios3.conf": + ensure => link, + target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], + } } + } } diff --git a/manifests/init.pp b/manifests/init.pp index d3a00df..9952cd9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -20,9 +20,9 @@ class nagios( ) { case $nagios::httpd { 'absent': { } - 'lighttpd': { include lighttpd } - 'apache': { include apache } - default: { include apache } + 'lighttpd': { include ::lighttpd } + 'apache': { include ::apache } + default: { include ::apache } } case $::operatingsystem { 'centos': { diff --git a/manifests/plugin.pp b/manifests/plugin.pp index c2e7676..d32606b 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -3,14 +3,14 @@ define nagios::plugin( $ensure = present ){ file{$name: - path => $hardwaremodel ? { - 'x86_64' => "/usr/lib64/nagios/plugins/$name", - default => "/usr/lib/nagios/plugins/$name", + path => $::hardwaremodel ? { + 'x86_64' => "/usr/lib64/nagios/plugins/${name}", + default => "/usr/lib/nagios/plugins/${name}", }, ensure => $ensure, source => $source ? { - 'absent' => "puppet:///modules/nagios/plugins/$name", - default => "puppet:///modules/$source" + 'absent' => "puppet:///modules/nagios/plugins/${name}", + default => "puppet:///modules/${source}" }, tag => 'nagios_plugin', require => Package['nagios-plugins'], diff --git a/manifests/target.pp b/manifests/target.pp index fc39834..9a86c09 100644 --- a/manifests/target.pp +++ b/manifests/target.pp @@ -2,16 +2,21 @@ class nagios::target( $parents = 'absent', -) { + $address = $::ipaddress, + $nagios_alias = $::hostname, + $hostgroups = 'absent', +){ + @@nagios_host { $::fqdn: + address => $address, + alias => $nagios_alias, + use => 'generic-host', + } - @@nagios_host { $::fqdn: - address => $::ipaddress, - alias => $::hostname, - use => 'generic-host', - } - - if ($parents != 'absent') { - Nagios_host["${::fqdn}"] { parents => $parents } - } + if ($parents != 'absent') { + Nagios_host["${::fqdn}"] { parents => $parents } + } + if ($hostgroups != 'absent') { + Nagios_host["${::fqdn}"] { hostgroups => $hostgroups } + } } diff --git a/manifests/target/fqdn.pp b/manifests/target/fqdn.pp index 2521533..6bb16c1 100644 --- a/manifests/target/fqdn.pp +++ b/manifests/target/fqdn.pp @@ -1,3 +1,10 @@ -class nagios::target::fqdn inherits nagios::target { - Nagios_host[$::fqdn] { address => $::fqdn } +class nagios::target::fqdn( + $hostgroups = 'absent', + $parents = 'absent' +) { + class{'nagios::target': + address => $::fqdn, + hostgroups => $hostgroups, + parents => $parents + } } -- cgit v1.2.3 From 41fe95b36253826b8f801ee1669acdb28c70076c Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 14 Jun 2012 10:36:25 -0300 Subject: take hiera out of the params --- manifests/apache.pp | 11 +++- manifests/base.pp | 5 -- manifests/init.pp | 39 +++++++------ manifests/irc_bot.pp | 146 +++++++++++++++++++++++----------------------- manifests/lighttpd.pp | 14 ++++- manifests/service/ping.pp | 2 +- manifests/target.pp | 2 +- 7 files changed, 116 insertions(+), 103 deletions(-) (limited to 'manifests') diff --git a/manifests/apache.pp b/manifests/apache.pp index 38026f7..a90d0ee 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,6 +1,13 @@ -class nagios::apache inherits ::apache { +class nagios::apache( + $allow_external_cmd = false, + $manage_shorewall = false, + $manage_munin = false +) { class{'nagios': - httpd => 'apache' + httpd => 'apache', + allow_external_cmd => $allow_external_cmd, + manage_munin => $manage_munin, + manage_shorewall => $manage_shorewall, } case $::operatingsystem { diff --git a/manifests/base.pp b/manifests/base.pp index e706bb9..0f8b777 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -183,9 +183,4 @@ class nagios::base { notify => Service['nagios'], mode => 0755, owner => root, group => root; } - - if hiera('use_munin',false) { - include nagios::munin - } - } diff --git a/manifests/init.pp b/manifests/init.pp index 9952cd9..12d3db2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,24 +15,29 @@ # class nagios( - $httpd = hiera('nagios_httpd','apache'), - $allow_external_cmd = hiera('nagios_allow_external_cmd',false), + $httpd = 'apache', + $allow_external_cmd = false, + $manage_shorewall = false, + $manage_munin = false ) { - case $nagios::httpd { - 'absent': { } - 'lighttpd': { include ::lighttpd } - 'apache': { include ::apache } - default: { include ::apache } + case $nagios::httpd { + 'absent': { } + 'lighttpd': { include ::lighttpd } + 'apache': { include ::apache } + default: { include ::apache } + } + case $::operatingsystem { + 'centos': { + $cfgdir = '/etc/nagios' + include nagios::centos } - case $::operatingsystem { - 'centos': { - $cfgdir = '/etc/nagios' - include nagios::centos - } - 'debian': { - $cfgdir = '/etc/nagios3' - include nagios::debian - } - default: { fail("No such operatingsystem: ${::operatingsystem} yet defined") } + 'debian': { + $cfgdir = '/etc/nagios3' + include nagios::debian } + default: { fail("No such operatingsystem: ${::operatingsystem} yet defined") } + } + if $manage_munin { + include nagios::munin + } } diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp index 5d684f8..77c5fa8 100644 --- a/manifests/irc_bot.pp +++ b/manifests/irc_bot.pp @@ -1,86 +1,84 @@ class nagios::irc_bot( - $nsa_socket = hiera('nagios_nsa_socket','absent'), - $nsa_server = hiera('nagios_nsa_server'), - $nsa_port = hiera('nagios_nsa_port',6667), - $nsa_nickname = hiera('nagios_nsa_nickname'), - $nsa_password = hiera('nagios_nsa_password',''), - $nsa_channel = hiera('nagios_nsa_channel'), - $nsa_pidfile = hiera('nagios_nsa_pidfile','absent'), - $nsa_realname = hiera('nagios_nsa_realname','Nagios') + $nsa_socket = 'absent', + $nsa_server, + $nsa_port = 6667, + $nsa_nickname, + $nsa_password = '', + $nsa_channel, + $nsa_pidfile = 'absent', + $nsa_realname = 'Nagios' ) { - $real_nsa_socket = $nsa_socket ? { - 'absent' => $::operatingsystem ? { - centos => '/var/run/nagios-nsa/nsa.socket', - default => '/var/run/nagios3/nsa.socket' - }, - default => $nsa_socket, - } - $real__nsa_pidfile = $nsa_pidfile ? { - 'absent' => $::operatingsystem ? { - centos => '/var/run/nagios-nsa/nsa.pid', - default => '/var/run/nagios3/nsa.pid' - }, - default => $nsa_pidfile, - } + $real_nsa_socket = $nsa_socket ? { + 'absent' => $::operatingsystem ? { + centos => '/var/run/nagios-nsa/nsa.socket', + default => '/var/run/nagios3/nsa.socket' + }, + default => $nsa_socket, + } + $real__nsa_pidfile = $nsa_pidfile ? { + 'absent' => $::operatingsystem ? { + centos => '/var/run/nagios-nsa/nsa.pid', + default => '/var/run/nagios3/nsa.pid' + }, + default => $nsa_pidfile, + } - file { "/usr/local/bin/riseup-nagios-client.pl": - owner => root, group => root, mode => 0755, - source => "puppet:///modules/nagios/irc_bot/riseup-nagios-client.pl", - } - file { "/usr/local/bin/riseup-nagios-server.pl": - owner => root, group => root, mode => 0755, - source => "puppet:///modules/nagios/irc_bot/riseup-nagios-server.pl", - } - file { "/etc/init.d/nagios-nsa": - owner => root, group => root, mode => 0755, - content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"), - require => File["/usr/local/bin/riseup-nagios-server.pl"], - } - file { "/etc/nagios_nsa.cfg": - ensure => present, - owner => nagios, group => root, mode => 0400, - content => template('nagios/irc_bot/nsa.cfg.erb'), - } + file { + '/usr/local/bin/riseup-nagios-client.pl': + source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-client.pl', + owner => root, group => root, mode => 0755; + '/usr/local/bin/riseup-nagios-server.pl': + source => 'puppet:///modules/nagios/irc_bot/riseup-nagios-server.pl', + owner => root, group => root, mode => 0755; + '/etc/init.d/nagios-nsa': + content => template("nagios/irc_bot/${::operatingsystem}/nagios-nsa.sh.erb"), + require => File['/usr/local/bin/riseup-nagios-server.pl'], + owner => root, group => root, mode => 0755; + '/etc/nagios_nsa.cfg': + ensure => present, + content => template('nagios/irc_bot/nsa.cfg.erb'), + owner => nagios, group => root, mode => 0400; + } - package { "libnet-irc-perl": - ensure => present, - } + package { 'libnet-irc-perl': + ensure => present, + } - service { "nagios-nsa": - ensure => "running", - hasstatus => true, - require => [File["/etc/nagios_nsa.cfg"], - Package["libnet-irc-perl"], - Service['nagios'] ], - } + service { "nagios-nsa": + ensure => "running", + hasstatus => true, + require => [ File["/etc/nagios_nsa.cfg"], + Package["libnet-irc-perl"], + Service['nagios'] ], + } - case $::operatingsystem { - centos: { - Package['libnet-irc-perl']{ - name => 'perl-Net-IRC', - } - Service['nagios-nsa']{ - enable => true, - } + case $::operatingsystem { + centos: { + Package['libnet-irc-perl']{ + name => 'perl-Net-IRC', } - debian,ubuntu: { - exec { "nagios_nsa_init_script": - command => "/usr/sbin/update-rc.d nagios-nsa defaults", - unless => "/bin/ls /etc/rc3.d/ | /bin/grep nagios-nsa", - require => File["/etc/init.d/nagios-nsa"], - before => Service['nagios-nsa'], - } + Service['nagios-nsa']{ + enable => true, } } - - nagios_command { - "notify-by-irc": - command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ n.$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$"'; - "host-notify-by-irc": - command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($HOSTALIAS$) $NOTIFICATIONTYPE$ n.$HOSTATTEMPT$ $HOSTSTATETYPE$ took $HOSTEXECUTIONTIME$s $HOSTOUTPUT$ $HOSTPERFDATA$ $HOSTLATENCY$s"'; + debian,ubuntu: { + exec { "nagios_nsa_init_script": + command => "/usr/sbin/update-rc.d nagios-nsa defaults", + unless => "/bin/ls /etc/rc3.d/ | /bin/grep nagios-nsa", + require => File["/etc/init.d/nagios-nsa"], + before => Service['nagios-nsa'], + } } + } - if hiera('use_shorewall',false) { - include shorewall::rules::out::irc - } + nagios_command { + 'notify-by-irc': + command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($SERVICEDESC$) $NOTIFICATIONTYPE$ n.$SERVICEATTEMPT$ $SERVICESTATETYPE$ $SERVICEEXECUTIONTIME$s $SERVICELATENCY$s $SERVICEOUTPUT$ $SERVICEPERFDATA$"'; + 'host-notify-by-irc': + command_line => '/usr/local/bin/riseup-nagios-client.pl "$HOSTNAME$ ($HOSTALIAS$) $NOTIFICATIONTYPE$ n.$HOSTATTEMPT$ $HOSTSTATETYPE$ took $HOSTEXECUTIONTIME$s $HOSTOUTPUT$ $HOSTPERFDATA$ $HOSTLATENCY$s"'; + } + + if $nagios::manage_shorewall { + include shorewall::rules::out::irc + } } diff --git a/manifests/lighttpd.pp b/manifests/lighttpd.pp index 27aff43..0f29896 100644 --- a/manifests/lighttpd.pp +++ b/manifests/lighttpd.pp @@ -1,4 +1,12 @@ -class nagios::lighttpd { - $nagios_httpd = 'lighttpd' - include nagios +class nagios::lighttpd( + $allow_external_cmd = false, + $manage_shorewall = false, + $manage_munin = false +) { + class{'nagios': + httpd => 'lighttpd', + allow_external_cmd => $allow_external_cmd, + manage_munin => $manage_munin, + manage_shorewall => $manage_shorewall, + } } diff --git a/manifests/service/ping.pp b/manifests/service/ping.pp index 80f2114..f1c8d87 100644 --- a/manifests/service/ping.pp +++ b/manifests/service/ping.pp @@ -1,6 +1,6 @@ define nagios::service::ping( $ensure = present, - $ping_rate = hiera('nagios_ping_rate','!100.0,20%!500.0,60%') + $ping_rate = '!100.0,20%!500.0,60%' ){ nagios::service{ "check_ping": ensure => $ensure, diff --git a/manifests/target.pp b/manifests/target.pp index 9a86c09..f9b7e13 100644 --- a/manifests/target.pp +++ b/manifests/target.pp @@ -4,7 +4,7 @@ class nagios::target( $parents = 'absent', $address = $::ipaddress, $nagios_alias = $::hostname, - $hostgroups = 'absent', + $hostgroups = 'absent' ){ @@nagios_host { $::fqdn: address => $address, -- cgit v1.2.3