[Pkg-nagios-devel] nagios/patches 02_reasonable_config.dpatch, 1.5,
1.6
seanius at haydn.debian.org
seanius at haydn.debian.org
Sun Oct 16 18:23:36 UTC 2005
- Previous message: [Pkg-nagios-devel] nagios changelog, 1.77, 1.78 control, 1.14,
1.15 rules, 1.20, 1.21
- Next message: [Pkg-nagios-devel] nagios changelog, 1.78, 1.79 control, 1.15,
1.16 nagios-common.preinst, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv32262/patches
Modified Files:
02_reasonable_config.dpatch
Log Message:
dependency change, now use --with-default-perfdata instead of --with-file-perfdata
Index: 02_reasonable_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/02_reasonable_config.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 02_reasonable_config.dpatch 5 Apr 2005 04:46:09 -0000 1.5
+++ 02_reasonable_config.dpatch 16 Oct 2005 18:23:33 -0000 1.6
@@ -5,9 +5,9 @@
## DP: Fix the config.
@DPATCH@
-diff -urNad nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in 2002-10-29 19:05:35.000000000 -0500
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in 2005-04-05 00:37:04.969841066 -0400
+diff -urNad sid~/sample-config/cgi.cfg.in sid/sample-config/cgi.cfg.in
+--- sid~/sample-config/cgi.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/cgi.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -68,7 +68,13 @@
# Nagios. Run the 'ps' command manually to see what the command
# line entry for the Nagios process looks like.
@@ -23,9 +23,9 @@
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in 2002-06-09 23:25:52.000000000 -0400
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in 2005-04-05 00:37:04.971840668 -0400
+diff -urNad sid~/sample-config/template-object/checkcommands.cfg.in sid/sample-config/template-object/checkcommands.cfg.in
+--- sid~/sample-config/template-object/checkcommands.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/checkcommands.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -124,30 +124,30 @@
}
@@ -65,9 +65,9 @@
command_line $USER1$/check_load -w $ARG1$ -c $ARG2$
}
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in 2002-10-03 20:12:48.000000000 -0400
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in 2005-04-05 00:37:04.971840668 -0400
+diff -urNad sid~/sample-config/template-object/contactgroups.cfg.in sid/sample-config/template-object/contactgroups.cfg.in
+--- sid~/sample-config/template-object/contactgroups.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/contactgroups.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -18,35 +18,35 @@
################################################################################
@@ -140,9 +140,9 @@
+# }
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in 2002-03-07 22:38:36.000000000 -0500
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in 2005-04-05 00:42:34.672145759 -0400
+diff -urNad sid~/sample-config/template-object/contacts.cfg.in sid/sample-config/template-object/contacts.cfg.in
+--- sid~/sample-config/template-object/contacts.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/contacts.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -13,7 +13,7 @@
################################################################################
# CONTACT DEFINITIONS
@@ -188,9 +188,9 @@
+# }
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in 2002-03-07 22:38:36.000000000 -0500
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in 2005-04-05 00:37:04.971840668 -0400
+diff -urNad sid~/sample-config/template-object/escalations.cfg.in sid/sample-config/template-object/escalations.cfg.in
+--- sid~/sample-config/template-object/escalations.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/escalations.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -19,24 +19,33 @@
# Serviceescalation definition
@@ -273,9 +273,9 @@
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in 2002-03-07 22:38:36.000000000 -0500
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in 2005-04-05 00:37:04.971840668 -0400
+diff -urNad sid~/sample-config/template-object/hostgroups.cfg.in sid/sample-config/template-object/hostgroups.cfg.in
+--- sid~/sample-config/template-object/hostgroups.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/hostgroups.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -17,57 +17,67 @@
#
################################################################################
@@ -379,9 +379,9 @@
+# }
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in 2002-03-10 18:49:27.000000000 -0500
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in 2005-04-05 00:37:04.972840469 -0400
+diff -urNad sid~/sample-config/template-object/hosts.cfg.in sid/sample-config/template-object/hosts.cfg.in
+--- sid~/sample-config/template-object/hosts.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/hosts.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -21,8 +21,8 @@
define host{
name generic-host ; The name of this host template - referenced in other host definitions, used for template recursion/resolution
@@ -810,9 +810,9 @@
+# }
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in 2002-10-03 20:12:48.000000000 -0400
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in 2005-04-05 00:37:04.972840469 -0400
+diff -urNad sid~/sample-config/template-object/minimal.cfg.in sid/sample-config/template-object/minimal.cfg.in
+--- sid~/sample-config/template-object/minimal.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/minimal.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -90,7 +90,7 @@
# Command used to check disk space usage on local partitions
@@ -924,9 +924,82 @@
-
-
-# EOF
-diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in
---- nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in 2002-09-18 22:15:36.000000000 -0400
-+++ /home/seanius/tmp/dpep.TVHXUw/nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in 2005-04-05 00:37:04.973840270 -0400
+diff -urNad sid~/sample-config/template-object/misccommands.cfg.in sid/sample-config/template-object/misccommands.cfg.in
+--- sid~/sample-config/template-object/misccommands.cfg.in 2002-05-27 20:20:45.000000000 -0400
++++ sid/sample-config/template-object/misccommands.cfg.in 2005-10-16 14:18:58.000000000 -0400
+@@ -80,26 +80,58 @@
+ #
+ # SAMPLE PERFORMANCE DATA COMMANDS
+ #
+-# These are sample performance data commands that can be used to send performance
+-# data output to two text files (one for hosts, another for services). If you
+-# plan on simply writing performance data out to a file, consider compiling
+-# Nagios with native file support for performance data. This is done by
+-# supplying the --with-file-perfdata option to the configure script.
++# These are sample performance data commands that can be used to send
++# performance data output to two text files (one for hosts, another
++# for services). If you plan on simply writing performance data out to
++# a file, consider compiling Nagios with native file support for
++# performance data. This is done by supplying the --with-file-perfdata
++# option to the configure script.
++#
++# note that you must also have something like the following in nagios.cfg:
++#
++# process_performance_data=1
++# service_perfdata_command=process-service-perfdata
+ #
+ ################################################################################
+
++##
++## here's a sample command to use the perfdata. this assumes your program
++## is called exec_perf
++##
+
+-# 'process-host-perfdata' command definition
+ define command{
+- command_name process-host-perfdata
+- command_line /usr/bin/printf "%b" "$LASTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$STATETYPE$\t$EXECUTIONTIME$\t$OUTPUT$\t$PERFDATA$" >> @localstatedir@/host-perfdata.out
++ command_name process-service-perfdata
++ command_line /usr/local/bin/exec_perf "$HOSTNAME$" "$SERVICEDESC$" "$SERVICESTATE$" "$OUTPUT$" "$PERFDATA$" "$LASTCHECK$"
++}
++
++##
++## here's a sample command using nagiosgraph. if nagiosgraph is ever packaged
++## for debian, this will be updated to point there (but otherwise it's assumed
++## you have it installed in /usr/local/nagiosgraph)
++##
++
++define command{
++ command_name process-service-perfdata-nagiosgraph
++ command_line /usr/local/nagiosgraph/insert.pl "$HOSTNAME$" "$LASTCHECK$||$HOSTNAME$||$SERVICEDESC$||$OUTPUT$||$PERFDATA$"
++}
++
++##
++## if you previously used --with-file-perfdata, the following two commands
++## will provide the same effect. note that it'll be your responsibility to
++## rotate/clean any logs.
++##
++
++# 'process-host-perfdata-to-file' command definition
++define command{
++ command_name process-host-perfdata-to-file
++ command_line /usr/bin/printf "%b" "$LASTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$STATETYPE$\t$EXECUTIONTIME$\t$OUTPUT$\t$PERFDATA$" >> /var/log/nagios/host-perfdata.out
+ }
+
+
+-# 'process-service-perfdata' command definition
++# 'process-service-perfdata-to-file' command definition
+ define command{
+- command_name process-service-perfdata
+- command_line /usr/bin/printf "%b" "$LASTCHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$STATETYPE$\t$EXECUTIONTIME$\t$LATENCY$\t$OUTPUT$\t$PERFDATA$" >> @localstatedir@/service-perfdata.out
++ command_name process-service-perfdata-to-file
++ command_line /usr/bin/printf "%b" "$LASTCHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$STATETYPE$\t$EXECUTIONTIME$\t$LATENCY$\t$OUTPUT$\t$PERFDATA$" >> /var/log/nagios/service-perfdata.out
+ }
+
+
+diff -urNad sid~/sample-config/template-object/services.cfg.in sid/sample-config/template-object/services.cfg.in
+--- sid~/sample-config/template-object/services.cfg.in 2005-04-06 01:24:45.000000000 -0400
++++ sid/sample-config/template-object/services.cfg.in 2005-10-16 13:28:58.000000000 -0400
@@ -19,15 +19,17 @@
# Generic service definition template
- Previous message: [Pkg-nagios-devel] nagios changelog, 1.77, 1.78 control, 1.14,
1.15 rules, 1.20, 1.21
- Next message: [Pkg-nagios-devel] nagios changelog, 1.78, 1.79 control, 1.15,
1.16 nagios-common.preinst, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Pkg-nagios-devel
mailing list