Add postgresql monitoring

[perso/Immae/Projets/Puppet.git] / modules / profile / manifests / monitoring / services.pp

diff --git a/modules/profile/manifests/monitoring/services.pp b/modules/profile/manifests/monitoring/services.pp
index 6e59ab1f91c21937c611f2b6ed3bf93a7e5e09df..b20a3528546c1ad6bf7c142feb099b04cb7c7850 100644 (file)
--- 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 <| |>
 }