[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Naparuba naparuba at gmail.com
Tue Feb 28 22:11:29 UTC 2012


The following commit has been merged in the debian/master branch:
commit 8ded2e88ae36a173e4529da6b45eb06a74cf751a
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Jan 3 10:54:37 2012 +0100

    Enh : cut commands.cfg into packs file.

diff --git a/etc/commands.cfg b/etc/commands.cfg
index 248be68..f7e96b8 100644
--- a/etc/commands.cfg
+++ b/etc/commands.cfg
@@ -50,24 +50,8 @@ define command {
        command_line	$PLUGINSDIR$/check_tcp  -H $HOSTADDRESS$ -p $ARG1$
 }
 
-# Simple web check
-define command {
-       command_name	check_http
-       command_line	$PLUGINSDIR$/check_http -H $HOSTADDRESS$
-}
-
-# And with SSL
-define command {
-       command_name     check_https
-       command_line     $PLUGINSDIR$/check_http -H $HOSTADDRESS$ -S
-}
 
 
-# Check a DNS server
-define command {
-       command_name     check_dns
-       command_line     $PLUGINSDIR$/check_dns -H $HOSTADDRESS$
-}
 
 
 # Check a DNS entry
@@ -76,11 +60,6 @@ define command {
        command_line 	$PLUGINSDIR$/check_dig -H $HOSTADDRESS$ -l $ARG1$
 }
 
-# Check a FTP service
-define command {
-       command_name	check_ftp
-       command_line	$PLUGINSDIR$/check_ftp -H $HOSTADDRESS$
-}
 
 
 # Ask a nrpe agent
@@ -107,29 +86,6 @@ define command {
        command_line	$PLUGINSDIR$/check_ssh -H $HOSTADDRESS$
 }
 
-# Look for good smtp connection
-define command {
-       command_name	check_smtp
-       command_line	$PLUGINSDIR$/check_smtp -H $HOSTADDRESS$
-}
-
-# And SMTPS too
-define command {
-       command_name	check_smtps
-       command_line	$PLUGINSDIR$/check_smtp -H $HOSTADDRESS$ -S
-}
-
-# Look at a SSL certificate
-define command {
-       command_name	check_https_certificate
-       command_line	$PLUGINSDIR$/check_http -H $HOSTADDRESS$ -C 30
-}
-
-#Look at an HP printer state
-define command{
-       command_name     check_hpjd
-       command_line     $PLUGINSDIR$/check_hpjd -H $HOSTADDRESS$ -C $SNMPCOMMUNITYREAD$
-}
 
 
 # Look at Oracle connection
@@ -138,34 +94,7 @@ define command {
        command_line	$PLUGINSDIR$/check_oracle --tns $HOSTADDRESS$
 }
 
-# Look at a Dhcp server
-# Beware : the check_dhcp should be SETUID (chmod u+s /usr/lib/nagios/plugins/check_dhcp)
-define command {
-       command_name	check_dhcp
-       command_line	$PLUGINSDIR$/check_dhcp -s $HOSTADDRESS$
-}
-
-
-# Ldap query
-# Don't forget to update the macros in the resources.cfg file
-define command {
-       command_name	check_ldap
-       command_line	$PLUGINSDIR$/check_ldap -H $HOSTADDRESS$ -b "$LDAPBASE$" -D $DOMAINUSER$ -P "$DOMAINPASSWORD$"
-}
-
-# Now the same, but in LDAPS
-# Don't forget to update the macros in the resources.cfg
-define command {
-       command_name     check_ldaps
-       command_line     $PLUGINSDIR$/check_ldaps -H $HOSTADDRESS$ -b "$LDAPBASE$" -D $DOMAINUSER$ -P "$DOMAINPASSWORD$"
-}
-
 
-# Asterisk (SIP) check. available at : http://www.bashton.com/downloads/nagios-check_sip-1.2.tar.gz
-define command {
-       command_name     check_sip
-       command_line     $PLUGINSDIR$/check_sip -H $HOSTADDRESS$ -u sip:$SIPUSER$
-}
 
 
 
diff --git a/etc/packs/asterisk/commands.cfg b/etc/packs/asterisk/commands.cfg
new file mode 100644
index 0000000..28f5c63
--- /dev/null
+++ b/etc/packs/asterisk/commands.cfg
@@ -0,0 +1,6 @@
+# Asterisk (SIP) check. available at : http://www.bashton.com/downloads/nagios-check_sip-1.2.tar.gz
+define command {
+       command_name     check_sip
+       command_line     $PLUGINSDIR$/check_sip -H $HOSTADDRESS$ -u sip:$SIPUSER$
+}
+
diff --git a/etc/packs/dhcp/commands.cfg b/etc/packs/dhcp/commands.cfg
new file mode 100644
index 0000000..d6fc59d
--- /dev/null
+++ b/etc/packs/dhcp/commands.cfg
@@ -0,0 +1,6 @@
+# Look at a Dhcp server
+# Beware : the check_dhcp should be SETUID (chmod u+s /usr/lib/nagios/plugins/check_dhcp)
+define command {
+       command_name	check_dhcp
+       command_line	$PLUGINSDIR$/check_dhcp -s $HOSTADDRESS$
+}
diff --git a/etc/packs/dns/commands.cfg b/etc/packs/dns/commands.cfg
new file mode 100644
index 0000000..e2a62d4
--- /dev/null
+++ b/etc/packs/dns/commands.cfg
@@ -0,0 +1,5 @@
+# Check a DNS server
+define command {
+       command_name     check_dns
+       command_line     $PLUGINSDIR$/check_dns -H $HOSTADDRESS$
+}
diff --git a/etc/packs/esx/commands.cfg b/etc/packs/esx/commands.cfg
index 1dfdf83..d889ff8 100644
--- a/etc/packs/esx/commands.cfg
+++ b/etc/packs/esx/commands.cfg
@@ -40,26 +40,3 @@ define command{
        command_line     $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -H $HOSTADDRESS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l mem
 }
 
-
-# Now for the VMs
-define command{
-        command_name    check_esx_vm_cpu
-        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l cpu
-}
-
-define command{
-        command_name    check_esx_vm_io
-        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l io
-}
-
-define command{
-        command_name    check_esx_vm_net
-        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l net
-}
-
-define command{
-        command_name    check_esx_vm_mem
-        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l mem
-}
-
-
diff --git a/etc/packs/ftp/commands.cfg b/etc/packs/ftp/commands.cfg
new file mode 100644
index 0000000..a74ce2a
--- /dev/null
+++ b/etc/packs/ftp/commands.cfg
@@ -0,0 +1,5 @@
+# Check a FTP service
+define command {
+       command_name	check_ftp
+       command_line	$PLUGINSDIR$/check_ftp -H $HOSTADDRESS$
+}
diff --git a/etc/packs/http/commands.cfg b/etc/packs/http/commands.cfg
new file mode 100644
index 0000000..32d2e0f
--- /dev/null
+++ b/etc/packs/http/commands.cfg
@@ -0,0 +1,5 @@
+# Simple web check
+define command {
+       command_name	check_http
+       command_line	$PLUGINSDIR$/check_http -H $HOSTADDRESS$
+}
diff --git a/etc/packs/https/certificate.cfg b/etc/packs/https/certificate.cfg
index 7af6d06..9ad1d14 100644
--- a/etc/packs/https/certificate.cfg
+++ b/etc/packs/https/certificate.cfg
@@ -1,7 +1,7 @@
 define service{
-   name           Https
-   use            generic-service
-   register       0
-   host_name	  https
-   check_command  check_https_certificate
+   service_description     HttpsCertificate
+   use            	   generic-service
+   register       	   0
+   host_name	  	   https
+   check_command  	   check_https_certificate
 }
diff --git a/etc/packs/https/commands.cfg b/etc/packs/https/commands.cfg
new file mode 100644
index 0000000..bb12c0d
--- /dev/null
+++ b/etc/packs/https/commands.cfg
@@ -0,0 +1,12 @@
+# And with SSL
+define command {
+       command_name     check_https
+       command_line     $PLUGINSDIR$/check_http -H $HOSTADDRESS$ -S
+}
+
+
+# Look at a SSL certificate
+define command {
+       command_name	check_https_certificate
+       command_line	$PLUGINSDIR$/check_http -H $HOSTADDRESS$ -C 30
+}
diff --git a/etc/packs/ldap/commands.cfg b/etc/packs/ldap/commands.cfg
new file mode 100644
index 0000000..c13ee50
--- /dev/null
+++ b/etc/packs/ldap/commands.cfg
@@ -0,0 +1,7 @@
+
+# Ldap query
+# Don't forget to update the macros in the resources.cfg file
+define command {
+       command_name	check_ldap
+       command_line	$PLUGINSDIR$/check_ldap -H $HOSTADDRESS$ -b "$LDAPBASE$" -D $DOMAINUSER$ -P "$DOMAINPASSWORD$"
+}
diff --git a/etc/packs/ldap/ldap.cfg b/etc/packs/ldap/ldap.cfg
new file mode 100644
index 0000000..34943b6
--- /dev/null
+++ b/etc/packs/ldap/ldap.cfg
@@ -0,0 +1,7 @@
+define service{
+   service_description    Ldap
+   use            	  generic-service
+   register       	  0
+   host_name	  	  ldap
+   check_command  	  check_ldap
+}
diff --git a/etc/packs/ldaps/certificate.cfg b/etc/packs/ldaps/certificate.cfg
new file mode 100644
index 0000000..3294d75
--- /dev/null
+++ b/etc/packs/ldaps/certificate.cfg
@@ -0,0 +1,8 @@
+define service{
+   service_description    LdapsCertificate
+   use            	  generic-service
+   register       	  0
+   host_name	  	  ldaps
+   check_command  	  check_ldaps_certificate
+}
+
diff --git a/etc/packs/ldaps/commands.cfg b/etc/packs/ldaps/commands.cfg
new file mode 100644
index 0000000..3a58394
--- /dev/null
+++ b/etc/packs/ldaps/commands.cfg
@@ -0,0 +1,12 @@
+# Now the same, but in LDAPS
+# Don't forget to update the macros in the resources.cfg!
+define command {
+       command_name     check_ldaps
+       command_line     $PLUGINSDIR$/check_ldaps -H $HOSTADDRESS$ -b "$LDAPBASE$" -D $DOMAINUSER$ -P "$DOMAINPASSWORD$"
+}
+
+
+define command {
+       command_name     check_ldaps_certificate
+       command_line     $PLUGINSDIR$/check_tcp -H $HOSTADDRESS$ -p 636 -D 30
+}
diff --git a/etc/packs/ldaps/ldaps.cfg b/etc/packs/ldaps/ldaps.cfg
new file mode 100644
index 0000000..5e2f90d
--- /dev/null
+++ b/etc/packs/ldaps/ldaps.cfg
@@ -0,0 +1,8 @@
+define service{
+   service_description    Ldaps
+   use            	  generic-service
+   register       	  0
+   host_name	  	  ldaps
+   check_command  	  check_ldaps
+}
+
diff --git a/etc/packs/printers/hp/commands.cfg b/etc/packs/printers/hp/commands.cfg
new file mode 100644
index 0000000..a2cfbbe
--- /dev/null
+++ b/etc/packs/printers/hp/commands.cfg
@@ -0,0 +1,5 @@
+#Look at an HP printer state
+define command{
+       command_name     check_hpjd
+       command_line     $PLUGINSDIR$/check_hpjd -H $HOSTADDRESS$ -C $SNMPCOMMUNITYREAD$
+}
diff --git a/etc/packs/printers/hp/state.cfg b/etc/packs/printers/hp/state.cfg
index ab0cb7b..94264d9 100644
--- a/etc/packs/printers/hp/state.cfg
+++ b/etc/packs/printers/hp/state.cfg
@@ -1,7 +1,7 @@
 define service{
    service_description    State
-   use            generic-service
-   register       0
-   host_name	  printer-hp
-   check_command  check_hpjd
+   use            	  generic-service
+   register       	  0
+   host_name	  	  printer-hp
+   check_command  	  check_hpjd
 }
diff --git a/etc/packs/smtp/commands.cfg b/etc/packs/smtp/commands.cfg
new file mode 100644
index 0000000..cca5ffe
--- /dev/null
+++ b/etc/packs/smtp/commands.cfg
@@ -0,0 +1,5 @@
+# Look for good smtp connection
+define command {
+       command_name	check_smtp
+       command_line	$PLUGINSDIR$/check_smtp -H $HOSTADDRESS$
+}
diff --git a/etc/packs/ftp/ftp.cfg b/etc/packs/smtp/smtp.cfg
similarity index 50%
copy from etc/packs/ftp/ftp.cfg
copy to etc/packs/smtp/smtp.cfg
index a558dad..6769dc6 100644
--- a/etc/packs/ftp/ftp.cfg
+++ b/etc/packs/smtp/smtp.cfg
@@ -1,7 +1,7 @@
 define service{
-   name           ftp
+   name           smtp
    use            generic-service
    register       0
-   host_name	  ftp
-   check_command  check_ftp
+   host_name	  smtp
+   check_command  check_smtp
 }
diff --git a/etc/packs/smtps/commands.cfg b/etc/packs/smtps/commands.cfg
new file mode 100644
index 0000000..0ebd640
--- /dev/null
+++ b/etc/packs/smtps/commands.cfg
@@ -0,0 +1,10 @@
+# And SMTPS too
+define command {
+       command_name	check_smtps
+       command_line	$PLUGINSDIR$/check_smtp -H $HOSTADDRESS$ -S
+}
+
+define command {
+       command_name     check_smtps_certificate
+       command_line     $PLUGINSDIR$/check_smtp -H $HOSTADDRESS$ -S -D 30
+}
diff --git a/etc/packs/smtps/smtps.cfg b/etc/packs/smtps/smtps.cfg
new file mode 100644
index 0000000..c8e4023
--- /dev/null
+++ b/etc/packs/smtps/smtps.cfg
@@ -0,0 +1,7 @@
+define service{
+   name           smtps
+   use            generic-service
+   register       0
+   host_name	  smtps
+   check_command  check_smtps
+}
diff --git a/etc/packs/smtps/smtps_certificate.cfg b/etc/packs/smtps/smtps_certificate.cfg
new file mode 100644
index 0000000..288c791
--- /dev/null
+++ b/etc/packs/smtps/smtps_certificate.cfg
@@ -0,0 +1,7 @@
+define service{
+   service_description           SmtpsCertificate
+   use            		 generic-service
+   register       		 0
+   host_name	  		 smtps
+   check_command  		 check_smtps_certificate
+}
diff --git a/etc/packs/vm/commands.cfg b/etc/packs/vm/commands.cfg
new file mode 100644
index 0000000..c79ee7d
--- /dev/null
+++ b/etc/packs/vm/commands.cfg
@@ -0,0 +1,29 @@
+# -----------------------------------------------------------------
+#
+#      VMware standard check
+#      Need chck_esx3.pl for working
+#                                                                                                                                                             # -----------------------------------------------------------------                                                                                                                                             
+
+
+# Now for the VMs
+define command{
+        command_name    check_esx_vm_cpu
+        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l cpu
+}
+
+define command{
+        command_name    check_esx_vm_io
+        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l io
+}
+
+define command{
+        command_name    check_esx_vm_net
+        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l net
+}
+
+define command{
+        command_name    check_esx_vm_mem
+        command_line    $PLUGINSDIR$/check_esx3.pl -D $VCENTER$ -N $HOSTALIAS$ -u $VCENTERLOGIN$ -p $VCENTERPASSWORD$ -l mem
+}
+
+
diff --git a/etc/shinken-specific.cfg b/etc/shinken-specific.cfg
index 1e132f8..83af846 100755
--- a/etc/shinken-specific.cfg
+++ b/etc/shinken-specific.cfg
@@ -356,6 +356,9 @@ define module{
        port		50000   ; port to listen
        database_file    livestatus.db
 
+       # If you want to use a unix socket file, uncomment it
+       # socket         /etc/nagios3/var/rw/live
+
        # Only set debug if you're having problems with this module
        # debug		/tmp/ls.debug
        # Set to 1 if you want to dump queries/responses too
diff --git a/etc/templates.cfg b/etc/templates.cfg
index b66b125..013b62f 100644
--- a/etc/templates.cfg
+++ b/etc/templates.cfg
@@ -158,6 +158,32 @@ define host{
 
 
 define host{
+   name           smtp
+   use            generic-host
+   register       0
+}
+
+define host{
+   name           smtps
+   use            generic-host
+   register       0
+}
+
+define host{
+   name           ldap
+   use            generic-host
+   register       0
+}
+
+define host{
+   name           ldaps
+   use            generic-host
+   register       0
+}
+
+
+
+define host{
    name           imap
    use            generic-host
    register       0

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list