From 0eb1a0491e4d59ebca1c8d8bf28ad3299a29e0ad Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 4 Oct 2013 14:17:46 +0200 Subject: Require Package['nagios-nrpe-server'] for nrpe cmds --- manifests/command/nrpe_timeout.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/command/nrpe_timeout.pp b/manifests/command/nrpe_timeout.pp index 3415566..799f2fc 100644 --- a/manifests/command/nrpe_timeout.pp +++ b/manifests/command/nrpe_timeout.pp @@ -1,11 +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$' - } + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$ -a $ARG3$', + require => Package['nagios-nrpe-server']; - nagios_command { 'check_nrpe_1arg_timeout': - command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$' + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$', + require => Package['nagios-nrpe-server'] } } -- cgit v1.2.3 From d4992d7307e71ebdf4effb0439177e68ce8a415a Mon Sep 17 00:00:00 2001 From: nadir Date: Mon, 25 Oct 2010 15:01:24 +0200 Subject: Fix allowed_hosts typo in templates/nrpe/nrpe.cfg --- templates/nrpe/nrpe.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nrpe/nrpe.cfg b/templates/nrpe/nrpe.cfg index 5368bc8..2ae2d71 100644 --- a/templates/nrpe/nrpe.cfg +++ b/templates/nrpe/nrpe.cfg @@ -75,7 +75,7 @@ nrpe_group=nagios <%- if nagios_nrpe_allowed_hosts.to_s.empty? then %> allowed_hosts=127.0.0.1 <%- else %> -allowed_host=127.0.0.1,<%= nagios_nrpe_allowed_hosts %> +allowed_hosts=127.0.0.1,<%= nagios_nrpe_allowed_hosts %> <%- end %> # COMMAND ARGUMENT PROCESSING -- cgit v1.2.3 From 993b624bd14dc5ef88847b11abc06d2b708c23b6 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 27 Oct 2012 10:09:19 +0200 Subject: Lint nagios::nrpe::base --- manifests/nrpe/base.pp | 55 ++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp index 17abb04..7bfa27e 100644 --- a/manifests/nrpe/base.pp +++ b/manifests/nrpe/base.pp @@ -1,32 +1,34 @@ +# install nrpe-server 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; - "libwww-perl": ensure => present; # for check_apache - } + + package { + 'nagios-nrpe-server': ensure => present; + 'nagios-plugins-basic': 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; } + if $::lsbdistcodename != 'lenny' { + package { 'libnagios-plugin-perl': ensure => present; } } - - file { [ $nagios_nrpe_cfgdir, "$nagios_nrpe_cfgdir/nrpe.d" ]: - ensure => directory } + + 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; + file { "${nagios_nrpe_cfgdir}/nrpe.cfg": + content => template('nagios/nrpe/nrpe.cfg'), + owner => root, group => 0, mode => '0644'; } - + # default commands - nagios::nrpe::command { "basic_nrpe": - 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" ], + nagios::nrpe::command { 'basic_nrpe': + 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. @@ -36,15 +38,16 @@ class nagios::nrpe::base { $critical_1_threshold = 10 * $processorcount $critical_5_threshold = 9 * $processorcount $critical_15_threshold = 8 * $processorcount - nagios::nrpe::command { "check_load": - 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}", + nagios::nrpe::command { 'check_load': + 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": - ensure => running, - enable => true, - pattern => "nrpe", - subscribe => File["$nagios_nrpe_cfgdir/nrpe.cfg"], - require => Package["nagios-nrpe-server"], + service { 'nagios-nrpe-server': + ensure => running, + enable => true, + pattern => 'nrpe', + hasstatus => false, + subscribe => File["${nagios_nrpe_cfgdir}/nrpe.cfg"], + require => Package['nagios-nrpe-server'], } } -- cgit v1.2.3