[Pkg-nagios-changes] [pkg-nagios] r1058 - nagios2/trunk/debian

Marc Haber zugschlus at alioth.debian.org
Tue Nov 28 17:22:54 CET 2006


Author: zugschlus
Date: 2006-11-28 17:22:54 +0100 (Tue, 28 Nov 2006)
New Revision: 1058

Modified:
   nagios2/trunk/debian/cfg-commands.cfg.diff
Log:
now really fix the commands file


Modified: nagios2/trunk/debian/cfg-commands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-commands.cfg.diff	2006-11-28 16:11:19 UTC (rev 1057)
+++ nagios2/trunk/debian/cfg-commands.cfg.diff	2006-11-28 16:22:54 UTC (rev 1058)
@@ -1,5 +1,5 @@
---- sample-config/template-object/commands.cfg	2006-11-28 14:57:00.000000000 +0100
-+++ debian-configs/commands.cfg	2006-11-28 15:11:45.000000000 +0100
+--- sample-config/template-object/commands.cfg	2006-11-28 17:21:07.000000000 +0100
++++ debian-configs/commands.cfg	2006-11-28 17:22:11.000000000 +0100
 @@ -1,12 +1,5 @@
  ################################################################################
 -# Sample command definitions for Nagios 2.6
@@ -23,8 +23,128 @@
  #
  # These are some example service check commands.  They may or may not work on
  # your system, as they must be modified for your plugins.  See the HTML 
-@@ -167,7 +160,7 @@
+@@ -47,45 +40,6 @@
+ ################################################################################
  
+ 
+-################################################################################
+-# NOTE:  The following 'check_local_...' functions are designed to monitor
+-#        various metrics on the host that Nagios is running on (i.e. this one).
+-################################################################################
+-
+-# 'check_local_disk' command definition
+-define command{
+-        command_name    check_local_disk
+-        command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+-        }
+-
+-
+-# 'check_local_load' command definition
+-define command{
+-        command_name    check_local_load
+-        command_line    $USER1$/check_load -w $ARG1$ -c $ARG2$
+-        }
+-
+-
+-# 'check_local_procs' command definition
+-define command{
+-        command_name    check_local_procs
+-        command_line    $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+-        }
+-
+-
+-# 'check_local_users' command definition
+-define command{
+-        command_name    check_local_users
+-        command_line    $USER1$/check_users -w $ARG1$ -c $ARG2$
+-        }
+-
+-
+-
+-################################################################################
+-# NOTE:  The following 'check_...' commands are used to monitor services on
+-#        both local and remote hosts.
+-################################################################################
+-
+ # 'check_dns' command definition
+ define command{
+         command_name    check_dns
+@@ -93,102 +47,19 @@
+         }
+ 
+ 
+-# 'check_ftp' command definition
+-define command{
+-        command_name    check_ftp
+-        command_line    $USER1$/check_ftp -H $HOSTADDRESS$
+-        }
+-
+-
+-# 'check_hpjd' command definition
+-define command{
+-        command_name    check_hpjd
+-        command_line    $USER1$/check_hpjd -H $HOSTADDRESS$ -C public
+-        }
+-
+-
+-# 'check_http' command definition
+-define command{
+-        command_name    check_http
+-        command_line    $USER1$/check_http -H $HOSTADDRESS$
+-        }
+-
+-
+-# 'check_nntp' command definition
+-define command{
+-        command_name    check_nntp
+-        command_line    $USER1$/check_nntp -H $HOSTADDRESS$
+-        }
+-
+-
+-# 'check_ping' command definition
+-define command{
+-        command_name    check_ping
+-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
+-        }
+-
+-
+-# 'check_pop' command definition
+-define command{
+-        command_name    check_pop
+-        command_line    $USER1$/check_pop -H $HOSTADDRESS$
+-        }
+-
+-
+-# 'check_smtp' command definition
+-define command{
+-        command_name    check_smtp
+-        command_line    $USER1$/check_smtp -H $HOSTADDRESS$
+-        }
+-
+-
+-# 'check_tcp' command definition
+-define command{
+-	command_name	check_tcp
+-	command_line	$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$
+-	}
+-
+-
+-# 'check_telnet' command definition
+-define command{
+-        command_name    check_telnet
+-        command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -p 23
+-        }
+-
+-
+-# 'check_udp' command definition
+-define command{
+-	command_name	check_udp
+-	command_line	$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$
+-	}
+-
+-
+-
+-
  ################################################################################
  #
 -# SAMPLE HOST CHECK COMMANDS
@@ -32,8 +152,23 @@
  #
  ################################################################################
  
-@@ -188,7 +181,7 @@
+-
+-# This command checks to see if a host is "alive" by pinging it
+-# The check must result in a 100% packet loss or 5 second (5000ms) round trip 
+-# average time to produce a critical error.
+-# Note: Only one ICMP echo packet is sent (determined by the '-p 1' argument)
+-
+-# 'check-host-alive' command definition
+-define command{
+-        command_name    check-host-alive
+-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 1
+-        }
+-
+-
++# On Debian, check-host-alive is being defined from within the
++# nagios-plugins package
  
+ 
  ################################################################################
  #
 -# SAMPLE NOTIFICATION COMMANDS
@@ -41,7 +176,7 @@
  #
  # These are some example notification commands.  They may or may not work on
  # your system without modification.  As an example, some systems will require 
-@@ -200,7 +193,7 @@
+@@ -200,7 +71,7 @@
  # 'host-notify-by-email' command definition
  define command{
  	command_name	host-notify-by-email
@@ -50,7 +185,7 @@
  	}
  
  
-@@ -213,7 +206,7 @@
+@@ -213,7 +84,7 @@
  # 'notify-by-email' command definition
  define command{
  	command_name	notify-by-email
@@ -59,7 +194,7 @@
  	}
  
  
-@@ -229,7 +222,7 @@
+@@ -229,7 +100,7 @@
  
  ################################################################################
  #




More information about the Pkg-nagios-changes mailing list