From 0c916d8e70bdb6165fe25d6f4e3ceadb1c0622a0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 10 Mar 2015 22:51:31 +0100
Subject: Use augeas instead of file_line to configure entries in
 /etc/check_mk/mrpe.cfg (Bug #6788)

We used file_line before, but when the some check parameters change, a
new line would be added, leaving the old line there, resulting in two
checks with the same name but with different parameters.

Augeas can handle this better, but it is important to use 'rm' to
remove all old lines with different parameters before adding the
new line.

Change-Id: Iad69dfd20f487a16d372a4f4a4bc53299f9e4a66
---
 .../site_check_mk/manifests/agent/couchdb.pp       | 25 +++++++++++++++-------
 .../site_check_mk/manifests/agent/haproxy.pp       | 10 +++++----
 .../site_check_mk/manifests/agent/haveged.pp       | 10 ++++++---
 .../modules/site_check_mk/manifests/agent/mrpe.pp  | 12 ++++++++---
 puppet/modules/site_check_mk/manifests/agent/mx.pp | 10 +++++----
 .../site_check_mk/manifests/agent/soledad.pp       | 12 ++++++-----
 .../site_check_mk/manifests/agent/tapicero.pp      | 16 ++++++++------
 7 files changed, 61 insertions(+), 34 deletions(-)

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index ee0268a3..979a02d7 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -12,13 +12,19 @@ class site_check_mk::agent::couchdb {
 
 
   # check bigcouch processes
-  file_line {
+  augeas {
     'Bigcouch_epmd_procs':
-      line => 'Bigcouch_epmd_procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs',
+        'set Bigcouch_epmd_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd\'' ];
     'Bigcouch_beam_procs':
-      line => 'Bigcouch_beam_procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs',
+        'set Bigcouch_beam_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam\'' ];
   }
 
   # check open files for bigcouch proc
@@ -27,10 +33,13 @@ class site_check_mk::agent::couchdb {
     source => 'puppet:///modules/site_check_mk/agent/nagios_plugins/check_unix_open_fds.pl',
     mode   => '0755'
   }
-  file_line {
+  augeas {
     'Bigcouch_open_files':
-      line => 'Bigcouch_open_files /srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files',
+        'set Bigcouch_open_files \'/srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720\'' ];
   }
 
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/haproxy.pp b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp
index e7986db1..5e7215b4 100644
--- a/puppet/modules/site_check_mk/manifests/agent/haproxy.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp
@@ -3,10 +3,12 @@ class site_check_mk::agent::haproxy {
   include site_check_mk::agent::package::nagios_plugins_contrib
 
   # local nagios plugin checks via mrpe
-  file_line {
-    'haproxy':
-      line => 'Haproxy  /usr/lib/nagios/plugins/check_haproxy -u "http://localhost:8000/haproxy;csv"',
-      path => '/etc/check_mk/mrpe.cfg';
+  augeas { 'haproxy':
+    incl    => '/etc/check_mk/mrpe.cfg',
+    lens    => 'Spacevars.lns',
+    changes => [
+      'rm /files/etc/check_mk/mrpe.cfg/Haproxy',
+      'set Haproxy \'/usr/lib/nagios/plugins/check_haproxy -u "http://localhost:8000/haproxy;csv"\'' ];
   }
 
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/haveged.pp b/puppet/modules/site_check_mk/manifests/agent/haveged.pp
index 92e77faa..62facd9a 100644
--- a/puppet/modules/site_check_mk/manifests/agent/haveged.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/haveged.pp
@@ -1,9 +1,13 @@
 class site_check_mk::agent::haveged {
 
 # check haveged process
-  file_line {
+  augeas {
     'haveged_proc':
-      line => 'haveged_proc  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /usr/sbin/haveged',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/haveged_proc',
+        'set haveged_proc \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /usr/sbin/haveged\'' ];
   }
+
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
index 6921574f..5e1f087a 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
@@ -11,8 +11,14 @@ class site_check_mk::agent::mrpe {
     ensure  => present,
     require => Package['check-mk-agent']
   } ->
-  file_line { 'Apt':
-    line => 'APT    /usr/lib/nagios/plugins/check_apt',
-    path => '/etc/check_mk/mrpe.cfg',
+
+  augeas {
+    'Apt':
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/APT',
+        'set APT \'/usr/lib/nagios/plugins/check_apt\'' ];
   }
+
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp
index 1e370125..8215cb21 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mx.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp
@@ -6,13 +6,15 @@ class site_check_mk::agent::mx {
   }
 
   # local nagios plugin checks via mrpe
-  file_line {
+  augeas {
     'Leap_MX_Procs':
-      line => 'Leap_MX_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a \'/usr/bin/python /usr/bin/twistd --pidfile=/var/run/leap_mx.pid --rundir=/var/lib/leap_mx/ --python=/usr/share/app/leap_mx.tac --logfile=/var/log/leap_mx.log\'',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/Leap_MX_Procs',
+        'set Leap_MX_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --pidfile=/var/run/leap_mx.pid --rundir=/var/lib/leap_mx/ --python=/usr/share/app/leap_mx.tac --logfile=/var/log/leap_mx.log"\'' ];
   }
 
-
   # check stale files in queue dir
   file { '/usr/lib/check_mk_agent/local/check_leap_mx.sh':
     source  => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
index 512d1a3d..e0d00332 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -5,10 +5,12 @@ class site_check_mk::agent::soledad {
   }
 
   # local nagios plugin checks via mrpe
-  file_line {
-    'Soledad_Procs':
-      line => 'Soledad_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a \'/usr/bin/python /usr/bin/twistd --pidfile=/var/run/soledad.pid --logfile=/var/log/soledad.log web --wsgi=leap.soledad.server.application\'',
-      path => '/etc/check_mk/mrpe.cfg';
-  }
 
+  augeas { 'Soledad_Procs':
+    incl    => '/etc/check_mk/mrpe.cfg',
+    lens    => 'Spacevars.lns',
+    changes => [
+      'rm /files/etc/check_mk/mrpe.cfg/Soledad_Procs',
+      'set Soledad_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --pidfile=/var/run/soledad.pid --logfile=/var/log/soledad.log web --wsgi=leap.soledad.server.application"\'' ]
+  }
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
index ffd11100..39651567 100644
--- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -9,14 +9,16 @@ class site_check_mk::agent::tapicero {
   }
 
   # local nagios plugin checks via mrpe
-  file_line {
+  augeas {
     'Tapicero_Procs':
-      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
-      path => '/etc/check_mk/mrpe.cfg';
-
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => [
+        'rm /files/etc/check_mk/mrpe.cfg/Tapicero_Procs',
+        'set Tapicero_Procs "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero"' ];
     'Tapicero_Heartbeat':
-      line => 'Tapicero_Heartbeat  /usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600',
-      path => '/etc/check_mk/mrpe.cfg';
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => 'set Tapicero_Heartbeat \'/usr/local/lib/nagios/plugins/check_last_regex_in_log -f /var/log/syslog -r "tapicero" -w 300 -c 600\'';
   }
-
 }
-- 
cgit v1.2.3