[Opsview-checkins] [opsview] [11536] Revert of 11512.

Tue, 19 Feb 2013 12:16:55 -0800

Title: [opsview] [11536] Revert of 11512.
Revision
11536
Author
tvoon
Date
2013-02-19 20:16:51 +0000 (Tue, 19 Feb 2013)

Log Message

Revert of 11512. Envvars are set in rc.opsview and Nagios will inherit them, so
no need to pass these as part of check commands


Modified Paths




Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/CHANGES	2013-02-19 20:16:51 UTC (rev 11536)
@@ -13,7 +13,6 @@
     Fixed check_snmp_weblogic_jmsmsgbridge to reincorporate caching host data to a file
     Fixed double escape of backslashes, which can affect Windows checks
     Fixed Nagios CGI for hostnames with funny characters
-    Fixed missing PERL5LIB due to Nagios' new environment when executing plugins
 
 3.20130212
     FEATURES:

Modified: trunk/opsview-core/bin/nagconfgen.pl
===================================================================
--- trunk/opsview-core/bin/nagconfgen.pl	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/opsview-core/bin/nagconfgen.pl	2013-02-19 20:16:51 UTC (rev 11536)
@@ -151,15 +151,6 @@
 # Use same list for event handlers for the moment. Should do a parsing trick like plugins in future
 my $nagios_envvars_for_eventhandlers = $nagios_envvars_for_notifications;
 
-# Extra envvars to set for all plugins
-#<<< Ignore perltidy - retain manual style for easier reading
-my @common_envvars_list = ( 
-    "PERL5LIB=/opt/opsview/perl/lib/perl5", 
-);
-#>>>
-
-my $common_envvars = join( "\n", map { "env " . $_ } @common_envvars_list );
-
 # Lookup table
 my $keyword_host_service_lookup = {};
 
@@ -774,7 +765,6 @@
         foreach my $env ( split( ",", $envvars ) ) {
             print OUTFILE "env NAGIOS_$env=\$$env\$\n";
         }
-        print OUTFILE $common_envvars, "\n";
         print OUTFILE "}\n";
 
     }
@@ -1032,7 +1022,6 @@
                     {
                         print COMMAND "env NAGIOS_$env=\$$env\$\n";
                     }
-                    print COMMAND $common_envvars, "\n";
                     print COMMAND "}\n";
                 }
                 elsif ( $s->event_handler ) {
@@ -1302,7 +1291,6 @@
         foreach my $env ( split( ",", $plugin->envvars ) ) {
             print COMMAND "env NAGIOS_$env=\$$env\$\n";
         }
-        print COMMAND $common_envvars, "\n";
         print COMMAND "}\n";
         $c++;
     }
@@ -1320,7 +1308,6 @@
         foreach my $env ( split( ",", $nagios_envvars_for_eventhandlers ) ) {
             print COMMAND "env NAGIOS_$env=\$$env\$\n";
         }
-        print COMMAND $common_envvars, "\n";
         print COMMAND "}\n";
         $c++;
     }
@@ -2273,7 +2260,6 @@
         foreach my $env ( split( ",", $nagios_envvars_for_notifications ) ) {
             print OUTFILE "env NAGIOS_$env=\$$env\$\n";
         }
-        print OUTFILE $common_envvars, "\n";
         print OUTFILE "}\n";
     }
 

Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/checkcommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/checkcommands.cfg	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/checkcommands.cfg	2013-02-19 20:16:51 UTC (rev 11536)
@@ -1,130 +1,105 @@
 define command {
         command_name    check_dhcp
         command_line    /usr/local/nagios/libexec/check_dhcp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_dig
         command_line    /usr/local/nagios/libexec/check_dig $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_ftp
         command_line    /usr/local/nagios/libexec/check_ftp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_http
         command_line    /usr/local/nagios/libexec/check_http $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_icmp
         command_line    /usr/local/nagios/libexec/check_icmp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_imap
         command_line    /usr/local/nagios/libexec/check_imap $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_mysql_query
         command_line    /usr/local/nagios/libexec/check_mysql_query $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_nrpe
         command_line    /usr/local/nagios/libexec/check_nrpe $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_ntp
         command_line    /usr/local/nagios/libexec/check_ntp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_opsview_slave
         command_line    /usr/local/nagios/libexec/check_opsview_slave $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_opsview_slave_cluster
         command_line    /usr/local/nagios/libexec/check_opsview_slave_cluster $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_opsview_slave_node
         command_line    /usr/local/nagios/libexec/check_opsview_slave_node $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_pop
         command_line    /usr/local/nagios/libexec/check_pop $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_smtp
         command_line    /usr/local/nagios/libexec/check_smtp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_cisco_loadavg
         command_line    /usr/local/nagios/libexec/check_snmp_cisco_loadavg $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_cisco_memutil
         command_line    /usr/local/nagios/libexec/check_snmp_cisco_memutil $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_interfaces
         command_line    /usr/local/nagios/libexec/check_snmp_interfaces $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_interfaces_cascade
         command_line    /usr/local/nagios/libexec/check_snmp_interfaces_cascade $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_linkstatus
         command_line    /usr/local/nagios/libexec/check_snmp_linkstatus $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_sysinfo
         command_line    /usr/local/nagios/libexec/check_snmp_sysinfo $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_tcpcurrestab
         command_line    /usr/local/nagios/libexec/check_snmp_tcpcurrestab $ARG1$
 env NAGIOS_EVENTSTARTTIME=$EVENTSTARTTIME$
 env NAGIOS_PROCESSSTARTTIME=$PROCESSSTARTTIME$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_snmp_uptime
         command_line    /usr/local/nagios/libexec/check_snmp_uptime $ARG1$
 env NAGIOS_HOSTNAME=$HOSTNAME$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_tcp
         command_line    /usr/local/nagios/libexec/check_tcp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_tftp
         command_line    /usr/local/nagios/libexec/check_tftp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
         command_name    check_udp
         command_line    /usr/local/nagios/libexec/check_udp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
 command_name event-handler-1
@@ -160,7 +135,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
 command_name event-handler-96
@@ -196,7 +170,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 define command {
 command_name event-handler-94
@@ -232,7 +205,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # event handler
 define command {
@@ -269,7 +241,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # event handler
 define command {
@@ -306,5 +277,4 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }

Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg	2013-02-19 20:16:51 UTC (rev 11536)
@@ -70,7 +70,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 
 define command{
@@ -107,7 +106,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 
 define command{
@@ -144,7 +142,6 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 
 define command{
@@ -181,5 +178,4 @@
 env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }

Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache	2013-02-19 20:16:51 UTC (rev 11536)
@@ -48,164 +48,137 @@
 define command {
 	command_name	check_dhcp
 	command_line	/usr/local/nagios/libexec/check_dhcp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_dig
 	command_line	/usr/local/nagios/libexec/check_dig $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_ftp
 	command_line	/usr/local/nagios/libexec/check_ftp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_1
 	command_line	/usr/local/nagios/libexec/check_ping $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_15
 	command_line	/usr/local/nagios/libexec/check_icmp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_17
 	command_line	/usr/local/nagios/libexec/check_icmp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_18
 	command_line	/usr/local/nagios/libexec/check_nrpe $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_3
 	command_line	/usr/local/nagios/libexec/check_ssh $ARG1$
 	env	NAGIOS_HOSTADDRESS=$HOSTADDRESS$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_4
 	command_line	/usr/local/nagios/libexec/check_tcp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_host_7
 	command_line	/usr/local/nagios/libexec/check_nrpe $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_http
 	command_line	/usr/local/nagios/libexec/check_http $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_icmp
 	command_line	/usr/local/nagios/libexec/check_icmp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_imap
 	command_line	/usr/local/nagios/libexec/check_imap $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_mysql_query
 	command_line	/usr/local/nagios/libexec/check_mysql_query $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_nrpe
 	command_line	/usr/local/nagios/libexec/check_nrpe $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_ntp
 	command_line	/usr/local/nagios/libexec/check_ntp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_opsview_slave
 	command_line	/usr/local/nagios/libexec/check_opsview_slave $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_opsview_slave_cluster
 	command_line	/usr/local/nagios/libexec/check_opsview_slave_cluster $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_opsview_slave_node
 	command_line	/usr/local/nagios/libexec/check_opsview_slave_node $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_pop
 	command_line	/usr/local/nagios/libexec/check_pop $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_smtp
 	command_line	/usr/local/nagios/libexec/check_smtp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_cisco_loadavg
 	command_line	/usr/local/nagios/libexec/check_snmp_cisco_loadavg $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_cisco_memutil
 	command_line	/usr/local/nagios/libexec/check_snmp_cisco_memutil $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_interfaces
 	command_line	/usr/local/nagios/libexec/check_snmp_interfaces $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_interfaces_cascade
 	command_line	/usr/local/nagios/libexec/check_snmp_interfaces_cascade $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_linkstatus
 	command_line	/usr/local/nagios/libexec/check_snmp_linkstatus $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_sysinfo
 	command_line	/usr/local/nagios/libexec/check_snmp_sysinfo $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -213,32 +186,27 @@
 	command_line	/usr/local/nagios/libexec/check_snmp_tcpcurrestab $ARG1$
 	env	NAGIOS_EVENTSTARTTIME=$EVENTSTARTTIME$
 	env	NAGIOS_PROCESSSTARTTIME=$PROCESSSTARTTIME$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_snmp_uptime
 	command_line	/usr/local/nagios/libexec/check_snmp_uptime $ARG1$
 	env	NAGIOS_HOSTNAME=$HOSTNAME$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_tcp
 	command_line	/usr/local/nagios/libexec/check_tcp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_tftp
 	command_line	/usr/local/nagios/libexec/check_tftp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
 	command_name	check_udp
 	command_line	/usr/local/nagios/libexec/check_udp $ARG1$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -275,7 +243,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -312,7 +279,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -349,7 +315,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -386,7 +351,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -423,7 +387,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -475,7 +438,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -512,7 +474,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -549,7 +510,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {
@@ -586,7 +546,6 @@
 	env	NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
 	env	NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
 	env	NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
-	env	PERL5LIB=/opt/opsview/perl/lib/perl5
 	}
 
 define command {

Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/services.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/services.cfg	2013-02-19 20:09:44 UTC (rev 11535)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/services.cfg	2013-02-19 20:16:51 UTC (rev 11536)
@@ -52,44 +52,37 @@
     define command{
         command_name    check_host_1
         command_line    /usr/local/nagios/libexec/check_ping $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_3' command definition for tcp port 22 (SSH)
     define command{
         command_name    check_host_3
         command_line    /usr/local/nagios/libexec/check_ssh $ARG1$
 env NAGIOS_HOSTADDRESS=$HOSTADDRESS$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_4' command definition for tcp port 23 (Telnet)
     define command{
         command_name    check_host_4
         command_line    /usr/local/nagios/libexec/check_tcp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_7' command definition for NRPE (on port 5666)
     define command{
         command_name    check_host_7
         command_line    /usr/local/nagios/libexec/check_nrpe $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_15' command definition for ping
     define command{
         command_name    check_host_15
         command_line    /usr/local/nagios/libexec/check_icmp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_17' command definition for ping address1
     define command{
         command_name    check_host_17
         command_line    /usr/local/nagios/libexec/check_icmp $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # 'check_host_18' command definition for host attributes
     define command{
         command_name    check_host_18
         command_line    /usr/local/nagios/libexec/check_nrpe $ARG1$
-env PERL5LIB=/opt/opsview/perl/lib/perl5
 }
 # Check Memory service definition for host cisco
 define service {


_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to