From 347879f1a9c98b83039388f62774f0b240c0667d Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 9 Apr 2012 02:32:45 -0400 Subject: Make the nsca depend on the nsca package Without this link, puppet sometimes attempts to start the service before the package is installed, wich triggers an error. Signed-off-by: Gabriel Filion --- manifests/nsca/server.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/nsca/server.pp b/manifests/nsca/server.pp index 9239f21..238e49e 100644 --- a/manifests/nsca/server.pp +++ b/manifests/nsca/server.pp @@ -1,13 +1,14 @@ class nagios::nsca::server { package { 'nsca': ensure => installed } - + service { 'nsca': ensure => running, hasstatus => false, hasrestart => true, + require => Package['nsca'], } - + file { '/etc/nsca.cfg': source => [ "puppet:///modules/site-nagios/nsca/{$fqdn}/nsca.cfg", "puppet:///modules/site-nagios/nsca/nsca.cfg", @@ -17,5 +18,5 @@ class nagios::nsca::server { mode => '400', notify => Service['nsca'], } - + } -- cgit v1.2.3 From f722765369b3900f57d845e5c9e2e170a560302c Mon Sep 17 00:00:00 2001 From: nadir Date: Mon, 4 Oct 2010 18:25:25 +0200 Subject: Basic NRPE Support amended (lelutin): removed trailing spaces and commented out code. --- manifests/nrpe.pp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 manifests/nrpe.pp (limited to 'manifests') diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp new file mode 100644 index 0000000..ff22441 --- /dev/null +++ b/manifests/nrpe.pp @@ -0,0 +1,37 @@ +class nagios::nrpe { + + if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' } + + 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"] ] + } + +} -- cgit v1.2.3 From faf85fa479e63b50cc2a3a7e69db9c0d7eb6e9ca Mon Sep 17 00:00:00 2001 From: nadir Date: Sun, 12 Dec 2010 23:12:53 +0100 Subject: Added NRPE Support for nagios::service --- manifests/service.pp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/service.pp b/manifests/service.pp index afc8650..6f82279 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -11,16 +11,25 @@ define nagios::service ( $notification_options = '', $contact_groups = '', $use = 'generic-service', - $service_description = 'absent' ) + $service_description = 'absent', + $use_nrpe = '', + $nrpe_args = '' ) { # TODO: this resource should normally accept all nagios_host parameters $real_name = "${hostname}_${name}" + if ($use_nrpe == 'true') { + $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + } + else { + $real_check_command = "$check_command" + } + @@nagios_service { "${real_name}": ensure => $ensure, - check_command => $check_command, + check_command => $real_check_command, host_name => $host_name, use => $use, notify => Service[nagios], -- cgit v1.2.3 From 9302bb5d6e6e8ed040027b8cbff606f7238ec02d Mon Sep 17 00:00:00 2001 From: nadir Date: Mon, 13 Feb 2012 11:42:27 +0100 Subject: service.pp: added nrpe support --- manifests/service.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/service.pp b/manifests/service.pp index 6f82279..0d95381 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -21,10 +21,10 @@ define nagios::service ( $real_name = "${hostname}_${name}" if ($use_nrpe == 'true') { - $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" } - else { - $real_check_command = "$check_command" + else { + $real_check_command = "$check_command" } @@nagios_service { "${real_name}": -- cgit v1.2.3 From 9da1addfa0607be4390b50000330f7740fc9fb5b Mon Sep 17 00:00:00 2001 From: nadir Date: Tue, 14 Feb 2012 11:14:51 +0100 Subject: command/nrpe.pp: check cmds for nrpe --- manifests/command/nrpe.pp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 manifests/command/nrpe.pp (limited to 'manifests') diff --git a/manifests/command/nrpe.pp b/manifests/command/nrpe.pp new file mode 100644 index 0000000..7539a26 --- /dev/null +++ b/manifests/command/nrpe.pp @@ -0,0 +1,14 @@ +class nagios::command::nrpe { + + # this command runs a program $ARG1$ with arguments $ARG2$ + nagios_command { + 'check_nrpe': + command_line => '/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ -a $ARG2$' + } + + # this command runs a program $ARG1$ with no arguments + nagios_command { + 'check_nrpe_1arg': + command_line => '/usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$' + } +} -- cgit v1.2.3 From 6f70941c33e1f621dae4722796314e94a4b23bb6 Mon Sep 17 00:00:00 2001 From: nadir Date: Tue, 14 Feb 2012 11:15:25 +0100 Subject: working nrpe support --- manifests/service.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/service.pp b/manifests/service.pp index 0d95381..ae112c1 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -21,7 +21,12 @@ define nagios::service ( $real_name = "${hostname}_${name}" if ($use_nrpe == 'true') { - $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + if ($nrpe_args != '') { + $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + } + else { + $real_check_command = "check_nrpe_1arg!$check_command" + } } else { $real_check_command = "$check_command" -- cgit v1.2.3 From 3ed7a58cc923d52c8664776b534b123d43f8fe5d Mon Sep 17 00:00:00 2001 From: nadir Date: Tue, 14 Feb 2012 14:50:38 +0100 Subject: add nrpe timeout parameter amended (lelutin): took out some trailing whitespaces and a commented out (useless) line --- manifests/command/nrpe_timeout.pp | 11 +++++++++++ manifests/service.pp | 13 ++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 manifests/command/nrpe_timeout.pp (limited to 'manifests') diff --git a/manifests/command/nrpe_timeout.pp b/manifests/command/nrpe_timeout.pp new file mode 100644 index 0000000..3415566 --- /dev/null +++ b/manifests/command/nrpe_timeout.pp @@ -0,0 +1,11 @@ +class nagios::command::nrpe_timeout { + nagios_command { + 'check_nrpe_timeout': + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$ -a $ARG3$' + } + + nagios_command { + 'check_nrpe_1arg_timeout': + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$' + } +} diff --git a/manifests/service.pp b/manifests/service.pp index ae112c1..55b2254 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -13,7 +13,8 @@ define nagios::service ( $use = 'generic-service', $service_description = 'absent', $use_nrpe = '', - $nrpe_args = '' ) + $nrpe_args = '', + $nrpe_timeout = 10 ) { # TODO: this resource should normally accept all nagios_host parameters @@ -21,11 +22,13 @@ define nagios::service ( $real_name = "${hostname}_${name}" if ($use_nrpe == 'true') { - if ($nrpe_args != '') { - $real_check_command = "check_nrpe!$check_command!\"$nrpe_args\"" + include nagios::command::nrpe_timeout + + if ($nrpe_args != '') { + $real_check_command = "check_nrpe_timeout!$nrpe_timeout!$check_command!\"$nrpe_args\"" } - else { - $real_check_command = "check_nrpe_1arg!$check_command" + else { + $real_check_command = "check_nrpe_1arg_timeout!$nrpe_timeout!$check_command" } } else { -- 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