From fec775ad45a87d5f3dad3927a970745da027c574 Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Fri, 28 Jul 2017 12:21:20 +0100
Subject: [PATCH] edited README

---
 README.md                   |  9 +++++++-
 manifests/client/target.pp  | 46 ++++++++++++++++++-------------------
 manifests/server/service.pp |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 76f2f76..d52b2f5 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,14 @@ Service
 Monitoring
 * monitor Nagios host
 * monitor Nagios service
-
+* monitor clients:
+  * ping
+  * root partition
+  * swap usage
+  * logged-in local users
+  * amount of total processes
+  * amount of zombie processes
+  * current Load
 
 ### Repo Structure
 Repostructure has moved to REPOSTRUCTURE.md in repo.
diff --git a/manifests/client/target.pp b/manifests/client/target.pp
index b35af5c..591c1f7 100644
--- a/manifests/client/target.pp
+++ b/manifests/client/target.pp
@@ -35,13 +35,13 @@ class cd_nagios::client::target (
         target              =>  $ng_target_host,
         hostgroups          =>  'linux-servers',
         contacts            =>  'ops',
-        max_check_attempts  =>  $max_check_attempts,
+        ng_max_check_attempts  =>  $ng_max_check_attempts,
         notification_period =>  '24x7',
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
         check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
-        notify              =>  Service['nagios'],
+        notify              =>  Service[$ng_user],
     }
 
     @@nagios_service { "root_partition_${::hostname}":
@@ -54,9 +54,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_root_partition",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
 
     @@nagios_service { "Swap_Usage_${::hostname}":
@@ -69,9 +69,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_swap_usage",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
 
     @@nagios_service { "Local_Users_${::hostname}":
@@ -84,9 +84,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_local_users",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
 
     @@nagios_service { "Total Processes_${::hostname}":
@@ -99,9 +99,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_total_processes",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
 
     @@nagios_service { "Zombie Processes_${::hostname}":
@@ -114,9 +114,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_zombie_processes",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
 
     @@nagios_service { "Current_Load_${::hostname}":
@@ -129,9 +129,9 @@ class cd_nagios::client::target (
         service_description =>  "${::hostname}_current_load",
         servicegroups       =>  'linux-services',
         target              =>  $ng_target_service,
-        owner               =>  'nagios',
-        group               =>  'nagios',
-        mode                =>  '0664',
+        owner               =>  $ng_user,
+        group               =>  $ng_user,
+        mode                =>  '0640',
     }
   }
 }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index c893b6c..74d7430 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -50,7 +50,7 @@ class cd_nagios::server::service (
       owner               =>  $ng_user,
       group               =>  $ng_user,
       mode                =>  '0640',
-      check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
+      check_command       =>  "${check_ping}!${ng_ping_warn}!${ng_ping_crit}",
       notify              =>  Service[$ng_service],
   }