From a534036c8d036275aa802f86470d67e4ee46db96 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 31 Jan 2016 18:19:57 -0500
Subject: parametrize nagios::nrpe

the current code for configuring NRPE is still relying on global
variables. This is not working at all with puppet 3.x and forward, so in
order to make this code functional, we need to parametrize values that
are used.
---
 manifests/nrpe/base.pp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'manifests/nrpe/base.pp')

diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp
index fe1cd7c..fb62693 100644
--- a/manifests/nrpe/base.pp
+++ b/manifests/nrpe/base.pp
@@ -1,7 +1,12 @@
 # basic nrpe stuff
 class nagios::nrpe::base {
 
-  if $nagios_nrpe_cfgdir == '' { $nagios_nrpe_cfgdir = '/etc/nagios' }
+  # Import all variables from entry point
+  $cfg_dir = $::nagios::nrpe::real_cfg_dir
+  $pid_file = $::nagios::nrpe::real_pid_file
+  $plugin_dir = $::nagios::nrpe::real_plugin_dir
+  $server_address = $::nagios::nrpe::server_address
+  $allowed_hosts = $::nagios::nrpe::allowed_hosts
 
   package{['nagios-nrpe-server', 'nagios-plugins-basic', 'libwww-perl']:
     ensure => installed;
@@ -13,12 +18,12 @@ class nagios::nrpe::base {
   }
 
   file{
-    [ $nagios_nrpe_cfgdir, "${nagios_nrpe_cfgdir}/nrpe.d" ]:
+    [ $cfg_dir, "${cfg_dir}/nrpe.d" ]:
       ensure => directory;
   }
 
   if $nagios_nrpe_dont_blame == '' { $nagios_nrpe_dont_blame = 1 }
-  file { "${nagios_nrpe_cfgdir}/nrpe.cfg":
+  file { "${cfg_dir}/nrpe.cfg":
     content => template('nagios/nrpe/nrpe.cfg'),
     owner   => root,
     group   => 0,
@@ -40,14 +45,14 @@ class nagios::nrpe::base {
   $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}",
+    command_line => "${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"],
+    subscribe => File["${cfg_dir}/nrpe.cfg"],
     require   => Package['nagios-nrpe-server'],
   }
 }
-- 
cgit v1.2.3


From c6faaaf04cbf33db4430893b6b0eeacfc5f74776 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 31 Jan 2016 18:21:46 -0500
Subject: nrpe: parametrize dont_blame_nrpe

This value is used in order to enable or disable arguments to nrpe
commands. Since some ppl might need to enable it, we should parametrize
it.
---
 manifests/nrpe/base.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/nrpe/base.pp')

diff --git a/manifests/nrpe/base.pp b/manifests/nrpe/base.pp
index fb62693..03ac5ab 100644
--- a/manifests/nrpe/base.pp
+++ b/manifests/nrpe/base.pp
@@ -7,6 +7,7 @@ class nagios::nrpe::base {
   $plugin_dir = $::nagios::nrpe::real_plugin_dir
   $server_address = $::nagios::nrpe::server_address
   $allowed_hosts = $::nagios::nrpe::allowed_hosts
+  $dont_blame = $::nagios::nrpe::dont_blame
 
   package{['nagios-nrpe-server', 'nagios-plugins-basic', 'libwww-perl']:
     ensure => installed;
@@ -22,7 +23,6 @@ class nagios::nrpe::base {
       ensure => directory;
   }
 
-  if $nagios_nrpe_dont_blame == '' { $nagios_nrpe_dont_blame = 1 }
   file { "${cfg_dir}/nrpe.cfg":
     content => template('nagios/nrpe/nrpe.cfg'),
     owner   => root,
-- 
cgit v1.2.3