From bff7d1b743bc2239d7ce7ced37dd03e4e846c03d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 10 Jul 2018 10:45:04 +0200
Subject: [PATCH] Add monitoring for backup

---
 modules/profile/manifests/fstab.pp                    | 6 ++++++
 modules/profile/manifests/monitoring/local_service.pp | 8 ++++----
 modules/profile/manifests/postgresql/backup_dump.pp   | 6 +++---
 modules/role/manifests/backup.pp                      | 1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/profile/manifests/fstab.pp b/modules/profile/manifests/fstab.pp
index 8ecfe72..3af316e 100644
--- a/modules/profile/manifests/fstab.pp
+++ b/modules/profile/manifests/fstab.pp
@@ -15,6 +15,12 @@ class profile::fstab (
         device => "UUID=${infos[1]}",
         fstype => $infos[2]
       }
+
+      @profile::monitoring::local_service { "Size on ${infos[0]} partition":
+        local => {
+          check_command => "check_local_disk!10%!5%!${infos[0]}",
+        };
+      }
     }
   }
 }
diff --git a/modules/profile/manifests/monitoring/local_service.pp b/modules/profile/manifests/monitoring/local_service.pp
index 0caf72e..9af7c7a 100644
--- a/modules/profile/manifests/monitoring/local_service.pp
+++ b/modules/profile/manifests/monitoring/local_service.pp
@@ -46,10 +46,10 @@ define profile::monitoring::local_service (
     })
 
   $sudos.each |$sudo_name, $content| {
-    sudo::conf { $sudo_name:
-      content        => $content,
-      before         => Nagios_service[$service_description],
-    }
+    ensure_resource("sudo::conf", $sudo_name, {
+      content => $content,
+      before  => Nagios_service[$service_description],
+    })
   }
 
   [true, false].each |$services_for_master| {
diff --git a/modules/profile/manifests/postgresql/backup_dump.pp b/modules/profile/manifests/postgresql/backup_dump.pp
index 5e469c5..5f456ed 100644
--- a/modules/profile/manifests/postgresql/backup_dump.pp
+++ b/modules/profile/manifests/postgresql/backup_dump.pp
@@ -60,10 +60,10 @@ define profile::postgresql::backup_dump (
 
   @profile::monitoring::local_service { "Last postgresql dump in $pg_backup_path is not too old":
     sudos => {
-      "naemon-postgresql-dumps" => "naemon  ALL=($pg_user) NOPASSWD: /usr/bin/find $pg_backup_path -mindepth 1 -maxdepth 1 -printf %T@\\n",
-    }
+      "naemon-postgresql-dumps-$pg_host" => "naemon  ALL=($pg_user) NOPASSWD: /usr/bin/find $pg_backup_path -mindepth 1 -maxdepth 1 -printf %T@?n",
+    },
     local => {
-      check_command => "check_last_file_date!$pg_backup_path!10!$pg_user"
+      check_command => "check_last_file_date!$pg_backup_path!10!$pg_user",
     }
   }
 }
diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp
index b35c542..c0672c6 100644
--- a/modules/role/manifests/backup.pp
+++ b/modules/role/manifests/backup.pp
@@ -14,6 +14,7 @@ class role::backup (
   include "profile::xmr_stak"
   include "profile::known_hosts"
   include "profile::boinc"
+  include "profile::monitoring"
 
   include "role::backup::postgresql"
 
-- 
2.41.0