Modified: trunk/opsview-core/bin/import_slaveresultsd
===================================================================
--- trunk/opsview-core/bin/import_slaveresultsd 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/bin/import_slaveresultsd 2011-01-13 14:18:28 UTC (rev 5679)
@@ -34,7 +34,7 @@
use warnings;
use strict;
use FindBin qw($Bin);
-use lib $Bin, "$Bin/../lib", "$Bin/../etc", "$Bin/../perl/lib";
+use lib "$Bin/../perl/lib", "$Bin/../lib", "$Bin/../etc";
use Log::Log4perl;
use POSIX;
use Time::HiRes qw(sleep gettimeofday);
Modified: trunk/opsview-core/bin/nrd
===================================================================
--- trunk/opsview-core/bin/nrd 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/bin/nrd 2011-01-13 14:18:28 UTC (rev 5679)
@@ -4,6 +4,8 @@
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if 0; # not running under some shell
+use FindBin qw($Bin);
+use lib "$Bin/../perl/lib";
use NRD::Daemon;
# Do not use a hash ref here as the nrd.conf will not get read correctly
Modified: trunk/opsview-core/bin/send_nrd
===================================================================
--- trunk/opsview-core/bin/send_nrd 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/bin/send_nrd 2011-01-13 14:18:28 UTC (rev 5679)
@@ -6,6 +6,8 @@
use strict;
use warnings;
+use FindBin qw($Bin);
+use lib "$Bin/../perl/lib";
use Getopt::Std;
use IO::Socket;
use NRD::Packet;
Modified: trunk/opsview-core/filelist
===================================================================
--- trunk/opsview-core/filelist 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/filelist 2011-01-13 14:18:28 UTC (rev 5679)
@@ -27,6 +27,7 @@
f nagios:nagios 0750 /usr/local/nagios/bin/import_ndologsd bin/import_ndologsd
f nagios:nagios 0750 /usr/local/nagios/bin/import_perfdatarrd bin/import_perfdatarrd
f nagios:nagios 0750 /usr/local/nagios/bin/import_runtime bin/import_runtime
+f nagios:nagios 0750 /usr/local/nagios/bin/import_slaveresultsd bin/import_slaveresultsd
f nagios:nagios 0750 /usr/local/nagios/bin/ndoutils_configdumpend bin/ndoutils_configdumpend
f nagios:nagios 0750 /usr/local/nagios/bin/nlcat bin/nlcat
f nagios:nagios 0750 /usr/local/nagios/bin/nrd bin/nrd
@@ -52,6 +53,7 @@
f nagios:nagios 0750 /usr/local/nagios/bin/run_scheduled_reports bin/run_scheduled_reports
f nagios:nagios 0750 /usr/local/nagios/bin/rsync_nmis_database bin/rsync_nmis_database
f nagios:nagios 0750 /usr/local/nagios/bin/opsviewd bin/opsviewd
+f nagios:nagios 0750 /usr/local/nagios/bin/send_nrd bin/send_nrd
f nagios:nagios 0750 /usr/local/nagios/bin/send_opsview_cmd bin/send_opsview_cmd
f root:nagios 0550 /usr/local/nagios/bin/install_slave bin/install_slave
f root:nagios 0540 /usr/local/nagios/bin/snmpd bin/snmpd
Modified: trunk/opsview-core/t/var/configs/Cluster/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Cluster/misccommands.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Cluster/misccommands.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -17,30 +17,27 @@
#
################################################################################
-# For nagiosgraph
+# For nagiosgraph, master only
define command{
command_name process-service-perfdata-nagiosgraph
command_line /usr/local/nagios/bin/rotate_async_log perfdata.log perfdatarrd
}
-
-# ocsp_command for distributed monitoring
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
-
-# for processing cached obsessive compulsive host and service data on slaves
+# for slave results via NRD
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
command_name rotate_ndo_log
Modified: trunk/opsview-core/t/var/configs/Cluster/nagios.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Cluster/nagios.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Cluster/nagios.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -600,9 +600,6 @@
# event handlers may take longer than 10 seconds. Watch out as nagios stops new checks over this period
event_handler_timeout=60
notification_timeout=30
-# ocsp timeout needs to be > 10 seconds because of nsca timeouts
-ocsp_timeout=12
-ochp_timeout=10
perfdata_timeout=12
@@ -860,8 +857,8 @@
# to the performance data file. Some examples of what you can do are
# shown below.
-host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$|$HOSTPERFDATA$
-service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$|$SERVICEPERFDATA$
+host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$\\n$LONGHOSTOUTPUT$|$HOSTPERFDATA$
+service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$\\n$LONGSERVICEOUTPUT$|$SERVICEPERFDATA$
@@ -898,61 +895,23 @@
# service performance data files. The interval at which the
# processing occurs is determined by the options above.
-host_perfdata_file_processing_command=process-host-cache-data
-service_perfdata_file_processing_command=process-service-cache-data
+host_perfdata_file_processing_command=process-host-cache-nrd
+service_perfdata_file_processing_command=process-service-cache-nrd
# OBSESS OVER SERVICE CHECKS OPTION
-# This determines whether or not Nagios will obsess over service
-# checks and run the ocsp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over services, 0 = do not obsess (default)
-
+# OBSESS OVER HOST CHECKS OPTION
obsess_over_services=0
-
-
-
+obsess_over_hosts=0
# OBSESSIVE COMPULSIVE SERVICE PROCESSOR COMMAND
-# This is the command that is run for every service check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_services option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-ocsp_command=ocsp_command
-ochp_command=ochp_command
-
-
-
# OBSESS OVER HOST CHECKS OPTION
-# This determines whether or not Nagios will obsess over host
-# checks and run the ochp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over hosts, 0 = do not obsess (default)
+# Not used in Opsview
+#ocsp_command=
+#ochp_command=
-obsess_over_hosts=0
-
-
-# OBSESSIVE COMPULSIVE HOST PROCESSOR COMMAND
-# This is the command that is run for every host check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_hosts option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-#ochp_command=somecommand
-
-
-
# TRANSLATE PASSIVE HOST CHECKS OPTION
# This determines whether or not Nagios will translate
# DOWN/UNREACHABLE passive host check results into their proper
Modified: trunk/opsview-core/t/var/configs/Cluster/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/Cluster/objects.cache 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Cluster/objects.cache 2011-01-13 14:18:28 UTC (rev 5679)
@@ -291,23 +291,23 @@
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
Modified: trunk/opsview-core/t/var/configs/ClusterA/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/ClusterA/misccommands.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/ClusterA/misccommands.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -17,30 +17,27 @@
#
################################################################################
-# For nagiosgraph
+# For nagiosgraph, master only
define command{
command_name process-service-perfdata-nagiosgraph
command_line /usr/local/nagios/bin/rotate_async_log perfdata.log perfdatarrd
}
-
-# ocsp_command for distributed monitoring
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
-
-# for processing cached obsessive compulsive host and service data on slaves
+# for slave results via NRD
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
command_name rotate_ndo_log
Modified: trunk/opsview-core/t/var/configs/ClusterA/nagios.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/ClusterA/nagios.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/ClusterA/nagios.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -600,9 +600,6 @@
# event handlers may take longer than 10 seconds. Watch out as nagios stops new checks over this period
event_handler_timeout=60
notification_timeout=30
-# ocsp timeout needs to be > 10 seconds because of nsca timeouts
-ocsp_timeout=12
-ochp_timeout=10
perfdata_timeout=12
@@ -860,8 +857,8 @@
# to the performance data file. Some examples of what you can do are
# shown below.
-host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$|$HOSTPERFDATA$
-service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$|$SERVICEPERFDATA$
+host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$\\n$LONGHOSTOUTPUT$|$HOSTPERFDATA$
+service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$\\n$LONGSERVICEOUTPUT$|$SERVICEPERFDATA$
@@ -898,61 +895,23 @@
# service performance data files. The interval at which the
# processing occurs is determined by the options above.
-host_perfdata_file_processing_command=process-host-cache-data
-service_perfdata_file_processing_command=process-service-cache-data
+host_perfdata_file_processing_command=process-host-cache-nrd
+service_perfdata_file_processing_command=process-service-cache-nrd
# OBSESS OVER SERVICE CHECKS OPTION
-# This determines whether or not Nagios will obsess over service
-# checks and run the ocsp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over services, 0 = do not obsess (default)
-
+# OBSESS OVER HOST CHECKS OPTION
obsess_over_services=0
-
-
-
+obsess_over_hosts=0
# OBSESSIVE COMPULSIVE SERVICE PROCESSOR COMMAND
-# This is the command that is run for every service check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_services option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-ocsp_command=ocsp_command
-ochp_command=ochp_command
-
-
-
# OBSESS OVER HOST CHECKS OPTION
-# This determines whether or not Nagios will obsess over host
-# checks and run the ochp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over hosts, 0 = do not obsess (default)
+# Not used in Opsview
+#ocsp_command=
+#ochp_command=
-obsess_over_hosts=0
-
-
-# OBSESSIVE COMPULSIVE HOST PROCESSOR COMMAND
-# This is the command that is run for every host check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_hosts option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-#ochp_command=somecommand
-
-
-
# TRANSLATE PASSIVE HOST CHECKS OPTION
# This determines whether or not Nagios will translate
# DOWN/UNREACHABLE passive host check results into their proper
Modified: trunk/opsview-core/t/var/configs/ClusterA/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/ClusterA/objects.cache 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/ClusterA/objects.cache 2011-01-13 14:18:28 UTC (rev 5679)
@@ -296,23 +296,23 @@
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -17,30 +17,27 @@
#
################################################################################
-# For nagiosgraph
+# For nagiosgraph, master only
define command{
command_name process-service-perfdata-nagiosgraph
command_line /usr/local/nagios/bin/rotate_async_log perfdata.log perfdatarrd
}
-
-# ocsp_command for distributed monitoring
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
-
-# for processing cached obsessive compulsive host and service data on slaves
+# for slave results via NRD
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
command_name rotate_ndo_log
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/nagios.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/nagios.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/nagios.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -603,9 +603,6 @@
# event handlers may take longer than 10 seconds. Watch out as nagios stops new checks over this period
event_handler_timeout=60
notification_timeout=30
-# ocsp timeout needs to be > 10 seconds because of nsca timeouts
-ocsp_timeout=12
-ochp_timeout=10
perfdata_timeout=12
@@ -907,55 +904,17 @@
# OBSESS OVER SERVICE CHECKS OPTION
-# This determines whether or not Nagios will obsess over service
-# checks and run the ocsp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over services, 0 = do not obsess (default)
-
+# OBSESS OVER HOST CHECKS OPTION
obsess_over_services=0
-
-
-
+obsess_over_hosts=0
# OBSESSIVE COMPULSIVE SERVICE PROCESSOR COMMAND
-# This is the command that is run for every service check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_services option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-ocsp_command=ocsp_command
-ochp_command=ochp_command
-
-
-
# OBSESS OVER HOST CHECKS OPTION
-# This determines whether or not Nagios will obsess over host
-# checks and run the ochp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over hosts, 0 = do not obsess (default)
+# Not used in Opsview
+#ocsp_command=
+#ochp_command=
-obsess_over_hosts=0
-
-
-# OBSESSIVE COMPULSIVE HOST PROCESSOR COMMAND
-# This is the command that is run for every host check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_hosts option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-#ochp_command=somecommand
-
-
-
# TRANSLATE PASSIVE HOST CHECKS OPTION
# This determines whether or not Nagios will translate
# DOWN/UNREACHABLE passive host check results into their proper
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache 2011-01-13 14:18:28 UTC (rev 5679)
@@ -306,23 +306,23 @@
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
Modified: trunk/opsview-core/t/var/configs/PassiveSlave/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/PassiveSlave/misccommands.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/PassiveSlave/misccommands.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -17,30 +17,27 @@
#
################################################################################
-# For nagiosgraph
+# For nagiosgraph, master only
define command{
command_name process-service-perfdata-nagiosgraph
command_line /usr/local/nagios/bin/rotate_async_log perfdata.log perfdatarrd
}
-
-# ocsp_command for distributed monitoring
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
-
-# for processing cached obsessive compulsive host and service data on slaves
+# for slave results via NRD
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
command_name rotate_ndo_log
Modified: trunk/opsview-core/t/var/configs/PassiveSlave/nagios.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/PassiveSlave/nagios.cfg 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/PassiveSlave/nagios.cfg 2011-01-13 14:18:28 UTC (rev 5679)
@@ -600,9 +600,6 @@
# event handlers may take longer than 10 seconds. Watch out as nagios stops new checks over this period
event_handler_timeout=60
notification_timeout=30
-# ocsp timeout needs to be > 10 seconds because of nsca timeouts
-ocsp_timeout=12
-ochp_timeout=10
perfdata_timeout=12
@@ -860,8 +857,8 @@
# to the performance data file. Some examples of what you can do are
# shown below.
-host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$|$HOSTPERFDATA$
-service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$|$SERVICEPERFDATA$
+host_perfdata_file_template=$HOSTNAME$\t$HOSTSTATEID$\t$HOSTOUTPUT$\\n$LONGHOSTOUTPUT$|$HOSTPERFDATA$
+service_perfdata_file_template=$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATEID$\t$SERVICEOUTPUT$\\n$LONGSERVICEOUTPUT$|$SERVICEPERFDATA$
@@ -898,61 +895,23 @@
# service performance data files. The interval at which the
# processing occurs is determined by the options above.
-host_perfdata_file_processing_command=process-host-cache-data
-service_perfdata_file_processing_command=process-service-cache-data
+host_perfdata_file_processing_command=process-host-cache-nrd
+service_perfdata_file_processing_command=process-service-cache-nrd
# OBSESS OVER SERVICE CHECKS OPTION
-# This determines whether or not Nagios will obsess over service
-# checks and run the ocsp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over services, 0 = do not obsess (default)
-
+# OBSESS OVER HOST CHECKS OPTION
obsess_over_services=0
-
-
-
+obsess_over_hosts=0
# OBSESSIVE COMPULSIVE SERVICE PROCESSOR COMMAND
-# This is the command that is run for every service check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_services option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-ocsp_command=ocsp_command
-ochp_command=ochp_command
-
-
-
# OBSESS OVER HOST CHECKS OPTION
-# This determines whether or not Nagios will obsess over host
-# checks and run the ochp_command defined below. Unless you're
-# planning on implementing distributed monitoring, do not enable
-# this option. Read the HTML docs for more information on
-# implementing distributed monitoring.
-# Values: 1 = obsess over hosts, 0 = do not obsess (default)
+# Not used in Opsview
+#ocsp_command=
+#ochp_command=
-obsess_over_hosts=0
-
-
-# OBSESSIVE COMPULSIVE HOST PROCESSOR COMMAND
-# This is the command that is run for every host check that is
-# processed by Nagios. This command is executed only if the
-# obsess_over_hosts option (above) is set to 1. The command
-# argument is the short name of a command definition that you
-# define in your host configuration file. Read the HTML docs for
-# more information on implementing distributed monitoring.
-
-#ochp_command=somecommand
-
-
-
# TRANSLATE PASSIVE HOST CHECKS OPTION
# This determines whether or not Nagios will translate
# DOWN/UNREACHABLE passive host check results into their proper
Modified: trunk/opsview-core/t/var/configs/PassiveSlave/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/PassiveSlave/objects.cache 2011-01-13 12:06:58 UTC (rev 5678)
+++ trunk/opsview-core/t/var/configs/PassiveSlave/objects.cache 2011-01-13 14:18:28 UTC (rev 5679)
@@ -291,23 +291,23 @@
}
define command {
- command_name ochp_command
- command_line /usr/local/nagios/bin/ochp_append_to_file
+ command_name process-host-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_host.log
}
define command {
- command_name ocsp_command
- command_line /usr/local/nagios/bin/ocsp_append_to_file
+ command_name process-host-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_host.log slaveresults
}
define command {
- command_name process-host-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_host.log
+ command_name process-service-cache-data
+ command_line /usr/local/nagios/bin/process-cache-data cache_service.log
}
define command {
- command_name process-service-cache-data
- command_line /usr/local/nagios/bin/process-cache-data cache_service.log
+ command_name process-service-cache-nrd
+ command_line /usr/local/nagios/bin/rotate_async_log -n cache_service.log slaveresults
}
define command {
