Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2013-02-18 15:19:45 UTC (rev 11511)
+++ trunk/CHANGES 2013-02-18 15:32:32 UTC (rev 11512)
@@ -11,6 +11,7 @@
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-18 15:19:45 UTC (rev 11511)
+++ trunk/opsview-core/bin/nagconfgen.pl 2013-02-18 15:32:32 UTC (rev 11512)
@@ -151,6 +151,15 @@
# 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 = {};
@@ -765,6 +774,7 @@
foreach my $env ( split( ",", $envvars ) ) {
print OUTFILE "env NAGIOS_$env=\$$env\$\n";
}
+ print OUTFILE $common_envvars, "\n";
print OUTFILE "}\n";
}
@@ -1022,6 +1032,7 @@
{
print COMMAND "env NAGIOS_$env=\$$env\$\n";
}
+ print COMMAND $common_envvars, "\n";
print COMMAND "}\n";
}
elsif ( $s->event_handler ) {
@@ -1291,6 +1302,7 @@
foreach my $env ( split( ",", $plugin->envvars ) ) {
print COMMAND "env NAGIOS_$env=\$$env\$\n";
}
+ print COMMAND $common_envvars, "\n";
print COMMAND "}\n";
$c++;
}
@@ -1308,6 +1320,7 @@
foreach my $env ( split( ",", $nagios_envvars_for_eventhandlers ) ) {
print COMMAND "env NAGIOS_$env=\$$env\$\n";
}
+ print COMMAND $common_envvars, "\n";
print COMMAND "}\n";
$c++;
}
@@ -2260,6 +2273,7 @@
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-18 15:19:45 UTC (rev 11511)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/checkcommands.cfg 2013-02-18 15:32:32 UTC (rev 11512)
@@ -1,105 +1,130 @@
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
@@ -135,6 +160,7 @@
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
@@ -170,6 +196,7 @@
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
@@ -205,6 +232,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+env PERL5LIB=/opt/opsview/perl/lib/perl5
}
# event handler
define command {
@@ -241,6 +269,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+env PERL5LIB=/opt/opsview/perl/lib/perl5
}
# event handler
define command {
@@ -277,4 +306,5 @@
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-18 15:19:45 UTC (rev 11511)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg 2013-02-18 15:32:32 UTC (rev 11512)
@@ -70,6 +70,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command{
@@ -106,6 +107,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command{
@@ -142,6 +144,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command{
@@ -178,4 +181,5 @@
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-18 15:19:45 UTC (rev 11511)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache 2013-02-18 15:32:32 UTC (rev 11512)
@@ -48,137 +48,164 @@
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 {
@@ -186,27 +213,32 @@
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 {
@@ -243,6 +275,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -279,6 +312,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -315,6 +349,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -351,6 +386,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -387,6 +423,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -438,6 +475,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -474,6 +512,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -510,6 +549,7 @@
env NAGIOS_LASTSERVICESTATE=$LASTSERVICESTATE$
env NAGIOS_LASTHOSTSTATE=$LASTHOSTSTATE$
env NAGIOS_CONTACTGROUPNAMES=$CONTACTGROUPNAMES$
+ env PERL5LIB=/opt/opsview/perl/lib/perl5
}
define command {
@@ -546,6 +586,7 @@
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-18 15:19:45 UTC (rev 11511)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/services.cfg 2013-02-18 15:32:32 UTC (rev 11512)
@@ -52,37 +52,44 @@
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 {