[projects/nagios-config] replace $USER1$ macro with actual value

glen glen at pld-linux.org
Thu Mar 3 21:12:53 CET 2016


commit fe5530b1f01fa7098d938c411d56f904c54e19d8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Mar 3 22:12:02 2016 +0200

    replace $USER1$ macro with actual value

 commands/check_dhcp.cfg     |  2 +-
 commands/check_disk.cfg     |  2 +-
 commands/check_dns.cfg      |  4 ++--
 commands/check_dummy.cfg    |  4 ++--
 commands/check_file_age.cfg |  2 +-
 commands/check_ftp.cfg      |  2 +-
 commands/check_hpjd.cfg     |  2 +-
 commands/check_http.cfg     | 18 +++++++++---------
 commands/check_imap.cfg     |  6 +++---
 commands/check_ircd.cfg     |  2 +-
 commands/check_load.cfg     |  2 +-
 commands/check_mrtgtraf.cfg |  2 +-
 commands/check_mysql.cfg    |  4 ++--
 commands/check_nntp.cfg     |  2 +-
 commands/check_nt.cfg       |  2 +-
 commands/check_ntp.cfg      |  6 +++---
 commands/check_ping.cfg     |  4 ++--
 commands/check_pop.cfg      |  2 +-
 commands/check_procs.cfg    |  2 +-
 commands/check_smtp.cfg     |  6 +++---
 commands/check_snmp.cfg     |  4 ++--
 commands/check_ssh.cfg      |  2 +-
 commands/check_swap.cfg     |  2 +-
 commands/check_tcp.cfg      |  2 +-
 commands/check_telnet.cfg   |  2 +-
 commands/check_udp.cfg      |  2 +-
 commands/check_users.cfg    |  2 +-
 27 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/commands/check_dhcp.cfg b/commands/check_dhcp.cfg
index 3ed2033..27bf1b5 100644
--- a/commands/check_dhcp.cfg
+++ b/commands/check_dhcp.cfg
@@ -1,5 +1,5 @@
 # 'check_dhcp' command definition
 define command {
 	command_name    check_dhcp
-	command_line    $USER1$/check_dhcp $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_dhcp $ARG1$
 }
diff --git a/commands/check_disk.cfg b/commands/check_disk.cfg
index 6c26cb5..f6670fd 100644
--- a/commands/check_disk.cfg
+++ b/commands/check_disk.cfg
@@ -1,5 +1,5 @@
 # 'check_local_disk' command definition
 define command {
 	command_name    check_local_disk
-	command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ $ARG4$
+	command_line    /usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ $ARG4$
 }
diff --git a/commands/check_dns.cfg b/commands/check_dns.cfg
index bae780b..092c0a8 100644
--- a/commands/check_dns.cfg
+++ b/commands/check_dns.cfg
@@ -1,13 +1,13 @@
 # 'check_dns' command definition
 define command {
 	command_name    check_dns
-	command_line    $USER1$/check_dns -s $HOSTADDRESS$ -H www.yahoo.com $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_dns -s $HOSTADDRESS$ -H www.yahoo.com $ARG1$
 }
 
 # check if DNSBL is returning success on test record 127.0.0.2
 define command {
 	command_name    check_dnsbl
-	command_line    $USER1$/check_dns -s $HOSTADDRESS$ -H 2.0.0.127.$ARG1$ -a 127.0.0.2 $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_dns -s $HOSTADDRESS$ -H 2.0.0.127.$ARG1$ -a 127.0.0.2 $ARG2$
 }
 
 # DNS
diff --git a/commands/check_dummy.cfg b/commands/check_dummy.cfg
index 0626f8d..0613c17 100644
--- a/commands/check_dummy.cfg
+++ b/commands/check_dummy.cfg
@@ -1,10 +1,10 @@
 # 'check_dummy' command definition
 define command {
 	command_name    check_dummy
-	command_line    $USER1$/check_dummy $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_dummy $ARG1$
 }
 
 define command {
 	command_name    host-is-alive
-	command_line    $USER1$/check_dummy 0 "Assume host UP"
+	command_line    /usr/lib/nagios/plugins/check_dummy 0 "Assume host UP"
 }
diff --git a/commands/check_file_age.cfg b/commands/check_file_age.cfg
index 3ee6cc5..65f8061 100644
--- a/commands/check_file_age.cfg
+++ b/commands/check_file_age.cfg
@@ -2,7 +2,7 @@
 # check_file_age [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>
 define command {
 	command_name    check_file_age
-	command_line    $USER1$/check_file_age $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_file_age $ARG1$
 }
 
 define service {
diff --git a/commands/check_ftp.cfg b/commands/check_ftp.cfg
index d6346c2..9423fdd 100644
--- a/commands/check_ftp.cfg
+++ b/commands/check_ftp.cfg
@@ -1,7 +1,7 @@
 # 'check_ftp' command definition
 define command {
 	command_name    check_ftp
-	command_line    $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ftp -H $HOSTADDRESS$ $ARG1$
 }
 
 define service {
diff --git a/commands/check_hpjd.cfg b/commands/check_hpjd.cfg
index a5a6808..c6869df 100644
--- a/commands/check_hpjd.cfg
+++ b/commands/check_hpjd.cfg
@@ -1,5 +1,5 @@
 # 'check_hpjd' command definition
 define command {
 	command_name    check_hpjd
-	command_line    $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_hpjd -H $HOSTADDRESS$ $ARG1$
 }
diff --git a/commands/check_http.cfg b/commands/check_http.cfg
index e7c9f00..a588922 100644
--- a/commands/check_http.cfg
+++ b/commands/check_http.cfg
@@ -1,17 +1,17 @@
 # 'check_http' command definition
 define command {
 	command_name    check_http
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -f warning $ARG1$
 }
 
 define command {
 	command_name    check_https
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning -S $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -f warning -S $ARG1$
 }
 
 define command {
 	command_name    check_https.crt
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -S -C 14 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -S -C 14 $ARG1$
 }
 
 define service {
@@ -56,32 +56,32 @@ define service {
 # 'check_http' with port support
 define command {
 	command_name    check_http_port
-	command_line    $USER1$/check_http -H $HOSTADDRESS$ -p $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$
 }
 
 # check http service with URI
 define command {
 	command_name    check_http_uri
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$
 }
 
 define command {
 	command_name    check_http_uri_string
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -p $ARG2$ -u $ARG3$ -s '$ARG4$' $ARG5$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -H $ARG1$ -p $ARG2$ -u $ARG3$ -s '$ARG4$' $ARG5$
 }
 
 # check http service with URI and expect regex
 define command {
 	command_name    check_http_regex
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -r $ARG3$ $ARG4$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -r $ARG3$ $ARG4$
 }
 
 define command {
 	command_name    check_https_string
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -s '$ARG2$'
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -s '$ARG2$'
 }
 
 define command {
 	command_name    check_https_cert
-	command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -C 14 $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_http -I $HOSTADDRESS$ -H $ARG1$ -S -C 14 $ARG2$
 }
diff --git a/commands/check_imap.cfg b/commands/check_imap.cfg
index ee2ecf8..962bb16 100644
--- a/commands/check_imap.cfg
+++ b/commands/check_imap.cfg
@@ -1,18 +1,18 @@
 # 'check_imap' command definition
 define command {
 	command_name    check_imap
-	command_line    $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_imap -H $HOSTADDRESS$ $ARG1$
 }
 
 # check secure imap
 define command {
 	command_name    check_imaps
-	command_line    $USER1$/check_simap -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_simap -H $HOSTADDRESS$ $ARG1$
 }
 
 define command {
 	command_name    check_imaps.crt
-	command_line    $USER1$/check_simap -H $HOSTADDRESS$ -D 14 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_simap -H $HOSTADDRESS$ -D 14 $ARG1$
 }
 
 define service {
diff --git a/commands/check_ircd.cfg b/commands/check_ircd.cfg
index 33070ec..9b816a0 100644
--- a/commands/check_ircd.cfg
+++ b/commands/check_ircd.cfg
@@ -1,7 +1,7 @@
 # check for ircd
 define command {
 	command_name    check_ircd
-	command_line    $USER1$/check_ircd -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ircd -H $HOSTADDRESS$ $ARG1$
 }
 
 define service {
diff --git a/commands/check_load.cfg b/commands/check_load.cfg
index 97b2ece..6f9dd65 100644
--- a/commands/check_load.cfg
+++ b/commands/check_load.cfg
@@ -2,5 +2,5 @@
 # 'check_local_load' command definition
 define command {
 	command_name    check_local_load
-	command_line    $USER1$/check_load $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_load $ARG1$
 }
diff --git a/commands/check_mrtgtraf.cfg b/commands/check_mrtgtraf.cfg
index 0cc1039..3b1029d 100644
--- a/commands/check_mrtgtraf.cfg
+++ b/commands/check_mrtgtraf.cfg
@@ -1,5 +1,5 @@
 # 'check_local_mrtgtraf' command definition
 define command {
 	command_name    check_local_mrtgtraf
-	command_line    $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$ $ARG6$
+	command_line    /usr/lib/nagios/plugins/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$ $ARG6$
 }
diff --git a/commands/check_mysql.cfg b/commands/check_mysql.cfg
index c63d5e4..1e0e744 100644
--- a/commands/check_mysql.cfg
+++ b/commands/check_mysql.cfg
@@ -1,11 +1,11 @@
 define command {
 	command_name    check_mysql
-	command_line    $USER1$/check_mysql -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_mysql -H $HOSTADDRESS$ $ARG1$
 }
 
 define command {
 	command_name    check_mysql_query
-	command_line    $USER1$/check_mysql_query -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_mysql_query -H $HOSTADDRESS$ $ARG1$
 }
 
 # MYSQL Server
diff --git a/commands/check_nntp.cfg b/commands/check_nntp.cfg
index 27d55db..73e822b 100644
--- a/commands/check_nntp.cfg
+++ b/commands/check_nntp.cfg
@@ -1,5 +1,5 @@
 # 'check_nntp' command definition
 define command {
 	command_name    check_nntp
-	command_line    $USER1$/check_nntp -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_nntp -H $HOSTADDRESS$ $ARG1$
 }
diff --git a/commands/check_nt.cfg b/commands/check_nt.cfg
index f3cf755..0d4951d 100644
--- a/commands/check_nt.cfg
+++ b/commands/check_nt.cfg
@@ -1,5 +1,5 @@
 # 'check_nt' command definition
 define command {
 	command_name    check_nt
-	command_line    $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$
 }
diff --git a/commands/check_ntp.cfg b/commands/check_ntp.cfg
index 9f01798..8f6d5ca 100644
--- a/commands/check_ntp.cfg
+++ b/commands/check_ntp.cfg
@@ -2,19 +2,19 @@
 # DEPRECATED: use check_ntp_time or check_ntp_peer
 define command {
 	command_name    check_ntp
-	command_line    $USER1$/check_ntp -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ntp -H $HOSTADDRESS$ $ARG1$
 }
 
 # Checks the clock offset with the NTP server.
 define command {
 	command_name    check_ntp_time
-	command_line    $USER1$/check_ntp_time -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ntp_time -H $HOSTADDRESS$ $ARG1$
 }
 
 # Check the health of an NTP server. 
 define command {
 	command_name    check_ntp_peer
-	command_line    $USER1$/check_ntp_peer -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ntp_peer -H $HOSTADDRESS$ $ARG1$
 }
 
 define service {
diff --git a/commands/check_ping.cfg b/commands/check_ping.cfg
index 949ccd9..a94f23b 100644
--- a/commands/check_ping.cfg
+++ b/commands/check_ping.cfg
@@ -1,7 +1,7 @@
 # 'check_ping' command definition
 define command {
 	command_name    check_ping
-	command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 $ARG3$
+	command_line    /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 $ARG3$
 }
 
 # This command checks to see if a host is "alive" by pinging it
@@ -12,7 +12,7 @@ define command {
 # Command to check to see if a host is "alive" (up) by pinging it
 define command {
 	command_name    check-host-alive
-	command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w 100,99% -c 5000,100% -p 1 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 100,99% -c 5000,100% -p 1 $ARG1$
 }
 
 define service {
diff --git a/commands/check_pop.cfg b/commands/check_pop.cfg
index 310f762..5ae5086 100644
--- a/commands/check_pop.cfg
+++ b/commands/check_pop.cfg
@@ -1,7 +1,7 @@
 # 'check_pop' command definition
 define command {
 	command_name    check_pop
-	command_line    $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_pop -H $HOSTADDRESS$ $ARG1$
 }
 
 # POP3
diff --git a/commands/check_procs.cfg b/commands/check_procs.cfg
index 0b9cf1b..285e48f 100644
--- a/commands/check_procs.cfg
+++ b/commands/check_procs.cfg
@@ -2,5 +2,5 @@
 # 'check_local_procs' command definition
 define command {
 	command_name    check_local_procs
-	command_line    $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ $ARG4$
+	command_line    /usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ $ARG4$
 }
diff --git a/commands/check_smtp.cfg b/commands/check_smtp.cfg
index 615368f..6ee6838 100644
--- a/commands/check_smtp.cfg
+++ b/commands/check_smtp.cfg
@@ -1,17 +1,17 @@
 # 'check_smtp' command definition
 define command {
 	command_name    check_smtp
-	command_line    $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_smtp -H $HOSTADDRESS$ $ARG1$
 }
 
 define command {
 	command_name    check_smtps
-	command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -S -p 465 -e 220 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -S -p 465 -e 220 $ARG1$
 }
 
 define command {
 	command_name    check_smtps.crt
-	command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -p 465 -D 14 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 465 -D 14 $ARG1$
 }
 
 # SMTP
diff --git a/commands/check_snmp.cfg b/commands/check_snmp.cfg
index fc6a876..07822b4 100644
--- a/commands/check_snmp.cfg
+++ b/commands/check_snmp.cfg
@@ -2,7 +2,7 @@
 # prints out system name, location, contact and system uptime
 define command {
 	command_name    check_snmpd
-	command_line    $USER1$/check_snmp -H $HOSTADDRESS$ -P 2c -m SNMPv2-MIB -m HOST-RESOURCES-MIB -o system.sysName.0,system.sysLocation.0,system.sysContact.0,hrSystemUptime.0 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -P 2c -m SNMPv2-MIB -m HOST-RESOURCES-MIB -o system.sysName.0,system.sysLocation.0,system.sysContact.0,hrSystemUptime.0 $ARG1$
 }
 
 # Check any SNMP OID.
@@ -13,7 +13,7 @@ define command {
 # -w warning Level
 define command {
 	command_name    check_snmp
-	command_line    $USER1$/check_snmp -H $HOSTADDRESS$ -P 2c $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -P 2c $ARG1$
 }
 
 # SNMPD service
diff --git a/commands/check_ssh.cfg b/commands/check_ssh.cfg
index 0bdd28e..251812f 100644
--- a/commands/check_ssh.cfg
+++ b/commands/check_ssh.cfg
@@ -1,7 +1,7 @@
 # 'check_ssh' command definition
 define command {
 	command_name    check_ssh
-	command_line    $USER1$/check_ssh -H $HOSTADDRESS$ $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_ssh -H $HOSTADDRESS$ $ARG1$
 }
 
 # SSH
diff --git a/commands/check_swap.cfg b/commands/check_swap.cfg
index e37a2b9..08f2207 100644
--- a/commands/check_swap.cfg
+++ b/commands/check_swap.cfg
@@ -1,5 +1,5 @@
 # 'check_local_swap' command definition
 define command {
 	command_name    check_local_swap
-	command_line    $USER1$/check_swap -w $ARG1$ -c $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_swap -w $ARG1$ -c $ARG2$
 }
diff --git a/commands/check_tcp.cfg b/commands/check_tcp.cfg
index 16d7909..a053600 100644
--- a/commands/check_tcp.cfg
+++ b/commands/check_tcp.cfg
@@ -1,7 +1,7 @@
 # 'check_tcp' command definition
 define command {
 	command_name    check_tcp
-	command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
 }
 
 # Any TCP service
diff --git a/commands/check_telnet.cfg b/commands/check_telnet.cfg
index b59b435..732be05 100644
--- a/commands/check_telnet.cfg
+++ b/commands/check_telnet.cfg
@@ -1,5 +1,5 @@
 # 'check_telnet' command definition
 define command {
 	command_name    check_telnet
-	command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -p 23 $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 23 $ARG1$
 }
diff --git a/commands/check_udp.cfg b/commands/check_udp.cfg
index af64d24..85f75fc 100644
--- a/commands/check_udp.cfg
+++ b/commands/check_udp.cfg
@@ -1,5 +1,5 @@
 # 'check_udp' command definition
 define command {
 	command_name    check_udp
-	command_line    $USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
 }
diff --git a/commands/check_users.cfg b/commands/check_users.cfg
index 4dd65be..30d0a18 100644
--- a/commands/check_users.cfg
+++ b/commands/check_users.cfg
@@ -2,5 +2,5 @@
 # local machine
 define command {
 	command_name    check_local_users
-	command_line    $USER1$/check_users -w $ARG1$ -c $ARG2$ $ARG3$
+	command_line    /usr/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$ $ARG3$
 }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/nagios-config.git/commitdiff/fe5530b1f01fa7098d938c411d56f904c54e19d8



More information about the pld-cvs-commit mailing list