Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

1 files changed, 0 insertions, 60 deletions

diff --git a/Monitoring/nagios/conf/localhost.cfg b/Monitoring/nagios/conf/localhost.cfg
deleted file mode 100644
index 3b098195..00000000
--- a/Monitoring/nagios/conf/localhost.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-# A simple configuration file for monitoring the local host
-# This can serve as an example for configuring other servers;
-# Custom services specific to this host are added here, but services
-# defined in nagios2-common_services.cfg may also apply.
-# 
-
-define host{
-        use                     generic-host            ; Name of host template to use
-        host_name               localhost
-        alias                   localhost
-        address                 127.0.0.1
-        hostgroups              krebs-machines
-        }
-
-# Define a service to check the disk space of the root partition
-# on the local machine.  Warning if < 20% free, critical if
-# < 10% free space on partition.
-
-define service{
-        use                             generic-service         ; Name of service template to use
-        host_name                       localhost
-        service_description             Disk Space
-        check_command                   check_all_disks!20%!10%
-        }
-
-
-
-# Define a service to check the number of currently logged in
-# users on the local machine.  Warning if > 20 users, critical
-# if > 50 users.
-
-define service{
-        use                             generic-service         ; Name of service template to use
-        host_name                       localhost
-        service_description             Current Users
-        check_command                   check_users!20!50
-        }
-
-
-# Define a service to check the number of currently running procs
-# on the local machine.  Warning if > 250 processes, critical if
-# > 400 processes.
-
-define service{
-        use                             generic-service         ; Name of service template to use
-        host_name                       localhost
-        service_description             Total Processes
-		check_command                   check_procs!250!400
-        }
-
-
-
-# Define a service to check the load on the local machine. 
-
-define service{
-        use                             generic-service         ; Name of service template to use
-        host_name                       localhost
-        service_description             Current Load
-		check_command                   check_load!5.0!4.0!3.0!10.0!6.0!4.0
-        }