3 files changed, 45 insertions, 35 deletions

diff --git a/modules/profile/manifests/monitoring/commands.pp b/modules/profile/manifests/monitoring/commands.pp
index a25f7b3..4ccc816 100644
--- a/modules/profile/manifests/monitoring/commands.pp
+++ b/modules/profile/manifests/monitoring/commands.pp
@@ -3,25 +3,24 @@ class profile::monitoring::commands inherits profile::monitoring {
 
   file { "/etc/naemon/monitoring-plugins":
     ensure => "directory",
-    owner  => "naemon",
-    group  => "naemon",
-    mode   => "0700",
-  }
-
-  file { "/etc/naemon/monitoring-plugins/check_command":
-    ensure => "present",
-    owner  => "naemon",
+    owner  => "root",
     group  => "naemon",
-    mode   => "0700",
-    source => "puppet:///modules/profile/monitoring/check_command",
+    mode   => "0755",
   }
 
-  file { "/etc/naemon/monitoring-plugins/check_md_raid":
-    ensure => "present",
-    owner  => "naemon",
-    group  => "naemon",
-    mode   => "0700",
-    source => "puppet:///modules/profile/monitoring/check_md_raid",
+  [
+    "check_command",
+    "check_md_raid",
+    "check_postgres_replication",
+    "check_last_file_date",
+  ].each |$file| {
+    file { "/etc/naemon/monitoring-plugins/$file":
+      ensure => "present",
+      owner  => "root",
+      group  => "naemon",
+      mode   => "0755",
+      source => "puppet:///modules/profile/monitoring/$file",
+    }
   }
 
   Nagios_command {
@@ -48,10 +47,17 @@ class profile::monitoring::commands inherits profile::monitoring {
     "check_ntp":
       command_line => '$USER1$/check_ntp_time -H 0.arch.pool.ntp.org';
     "check_md_raid":
-      command_line => '$USER2$/check_md_raid';
+      command_line => '$USER2$/check_md_raid',
+      require      => File["/etc/naemon/monitoring-plugins/check_md_raid"];
     "check_command_output":
       command_line => '$USER2$/check_command -c "$ARG1$" -o "$ARG2$" $ARG3$',
       require      => File["/etc/naemon/monitoring-plugins/check_command"];
+    "check_postgresql_replication":
+      command_line => '/usr/bin/sudo -u postgres $USER2$/check_postgres_replication "$ARG1$" "$ARG2$" "$ARG3$"',
+      require      => File["/etc/naemon/monitoring-plugins/check_postgres_replication"];
+    "check_last_file_date":
+      command_line => '$USER2$/check_last_file_date "$ARG1$" "$ARG2$" "$ARG3$"',
+      require      => File["/etc/naemon/monitoring-plugins/check_last_file_date"],
   }
 
   unless empty($naemon_url) {
diff --git a/modules/profile/manifests/monitoring/local_service.pp b/modules/profile/manifests/monitoring/local_service.pp
index 3b39d1f..0caf72e 100644
--- a/modules/profile/manifests/monitoring/local_service.pp
+++ b/modules/profile/manifests/monitoring/local_service.pp
@@ -1,4 +1,5 @@
 define profile::monitoring::local_service (
+  Optional[Hash] $sudos  = {},
   Optional[Hash] $common = {},
   Optional[Hash] $master = {},
   Optional[Hash] $local  = {},
@@ -6,6 +7,15 @@ define profile::monitoring::local_service (
   $service_description = $title
   $real_hostname = lookup("base_installation::real_hostname")
 
+  Nagios_service {
+    ensure  => "present",
+    owner   => "naemon",
+    group   => "naemon",
+    notify  => Service["naemon"],
+    before  => Service["naemon"],
+    require => File["/etc/naemon"],
+  }
+
   $service_generic = {
     active_checks_enabled        => "1",
     check_freshness              => "0",
@@ -35,6 +45,12 @@ define profile::monitoring::local_service (
     retry_interval     => "1",
     })
 
+  $sudos.each |$sudo_name, $content| {
+    sudo::conf { $sudo_name:
+      content        => $content,
+      before         => Nagios_service[$service_description],
+    }
+  }
 
   [true, false].each |$services_for_master| {
     if $services_for_master {
diff --git a/modules/profile/manifests/monitoring/services.pp b/modules/profile/manifests/monitoring/services.pp
index 6e59ab1..b20a352 100644
--- a/modules/profile/manifests/monitoring/services.pp
+++ b/modules/profile/manifests/monitoring/services.pp
@@ -1,21 +1,5 @@
 class profile::monitoring::services {
 
-  Nagios_service {
-    ensure  => "present",
-    owner   => "naemon",
-    group   => "naemon",
-    notify  => Service["naemon"],
-    before  => Service["naemon"],
-    require => File["/etc/naemon"],
-  }
-
-  sudo::conf {
-    default:
-      sudo_file_name => "naemon";
-    'naemon-fail2ban':
-      content => "naemon  ALL=(root) NOPASSWD: /usr/bin/fail2ban-client ping";
-  }
-
   profile::monitoring::local_service {
     "Size on root partition":
       local => {
@@ -34,9 +18,11 @@ class profile::monitoring::services {
         check_command => "check_local_swap!20!10",
       };
     "fail2ban is active":
-      local => {
+      sudos   => {
+        "naemon-fail2ban" => "naemon  ALL=(root) NOPASSWD: /usr/bin/fail2ban-client ping",
+      },
+      local   => {
         check_command => "check_command_output!fail2ban-client ping!pong!-r root",
-        require       => Sudo::Conf["naemon-fail2ban"],
       };
     "NTP is activated and working":
       local => {
@@ -50,4 +36,6 @@ class profile::monitoring::services {
         check_command => "check_md_raid",
       };
   }
+
+  Profile::Monitoring::Local_service <| |>
 }