[csw-devel] SF.net SVN: gar:[4848] csw/mgar/pkg/pnp/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Thu May 14 20:28:46 CEST 2009
Revision: 4848
http://gar.svn.sourceforge.net/gar/?rev=4848&view=rev
Author: j_arndt
Date: 2009-05-14 18:28:45 +0000 (Thu, 14 May 2009)
Log Message:
-----------
pnp: configuration example added, paths corrected
Modified Paths:
--------------
csw/mgar/pkg/pnp/trunk/Makefile
csw/mgar/pkg/pnp/trunk/checksums
csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype
Added Paths:
-----------
csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff
Modified: csw/mgar/pkg/pnp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pnp/trunk/Makefile 2009-05-14 18:26:56 UTC (rev 4847)
+++ csw/mgar/pkg/pnp/trunk/Makefile 2009-05-14 18:28:45 UTC (rev 4848)
@@ -18,6 +18,7 @@
PATCHFILES += npcdmod.h.diff
PATCHFILES += npcdmod.c.diff
PATCHFILES += npcd.cfg-sample.in.diff
+PATCHFILES += nagios_commands.cfg-sample.diff
# We define upstream file regex so we can be notifed of new upstream software release
#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -58,7 +59,7 @@
include gar/category.mk
DATAROOTDIR = $(datadir)
-CONTRIBDIR = $(DATAROOTDIR)/contrib
+CONTRIBDIR = /opt/csw/nagios/pnp/contrib
SYSCONFDIR = $(sysconfdir)
LIBEXECDIR = $(libexecdir)
BINDIR = $(bindir)
@@ -132,6 +133,7 @@
@ginstall -m 644 $(WORKSRC)/sample-config/pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_nwstat.cfg.CSW
@ginstall -m 644 $(WORKSRC)/sample-config/pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages/web_traffic.cfg.CSW
@ginstall -m 644 $(WORKSRC)/sample-config/pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.CSW
+ @ginstall -m 644 $(WORKSRC)/sample-config/pnp/nagios_commands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios_commands.cfg-sample
@$(MAKECOOKIE)
install-contrib-custom:
Modified: csw/mgar/pkg/pnp/trunk/checksums
===================================================================
--- csw/mgar/pkg/pnp/trunk/checksums 2009-05-14 18:26:56 UTC (rev 4847)
+++ csw/mgar/pkg/pnp/trunk/checksums 2009-05-14 18:28:45 UTC (rev 4848)
@@ -1,9 +1,10 @@
9dbbf08191a258f6798c9516b3821ff0 download/pnp-0.4.14.tar.gz
216b8ed50919642c3fae2a6520724dd3 download/CSWpnp.gspec
-fc763dd71049d4c06f10b8898fa3c1bb download/CSWpnp.prototype
+6e75bd501030cb04740160165f8b9ed8 download/CSWpnp.prototype
fec420cb27af9cbd0daba28f04500f8c download/cswpnp
80c06e6426497ed3fa96c0e77aff613d download/makefile.diff
db6af87968e9b29272d387033f09acba download/npcd.c.diff
65d971cd9983aef7f069c7976424eb99 download/npcdmod.h.diff
8380996936f96669d8abe25dd8faf392 download/npcdmod.c.diff
01c0965ea1bdd26e4f0fdbc51640dfce download/npcd.cfg-sample.in.diff
+8458b6df4844588d578344d97a26dd5e download/nagios_commands.cfg-sample.diff
Modified: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-14 18:26:56 UTC (rev 4847)
+++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-14 18:28:45 UTC (rev 4848)
@@ -17,6 +17,7 @@
d none /opt/csw/nagios/pnp/etc/pages 0755 nagios nagios
f cswpreserveconf /opt/csw/nagios/pnp/etc/pages/web_traffic.cfg.CSW 0644 nagios nagios
f none /opt/csw/nagios/pnp/etc/pnp4nagios_release 0644 nagios nagios
+f none /opt/csw/nagios/pnp/etc/nagios_commands.cfg-sample 0644 nagios nagios
f cswpreserveconf /opt/csw/nagios/pnp/etc/process_perfdata.cfg.CSW 0644 nagios nagios
f cswpreserveconf /opt/csw/nagios/pnp/etc/rra.cfg.CSW 0644 nagios nagios
d none /opt/csw/nagios/pnp/share 0755 nagios nagios
@@ -28,12 +29,12 @@
d none /opt/csw/nagios/share/pnp 0755 nagios nagios
s none /opt/csw/nagios/pnp/share/html=/opt/csw/nagios/share/pnp
f none /opt/csw/nagios/share/pnp/ajax.php 0644 nagios nagios
-d none /opt/csw/nagios/share/pnp/contrib 0755 nagios nagios
-f none /opt/csw/nagios/share/pnp/contrib/makeserviceextinfo.pl 0644 nagios nagios
-d none /opt/csw/nagios/share/pnp/contrib/ssi 0755 nagios nagios
-f none /opt/csw/nagios/share/pnp/contrib/ssi/status-header.ssi 0644 nagios nagios
-f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config 0644 nagios nagios
-f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config.txt 0644 nagios nagios
+d none /opt/csw/nagios/pnp/contrib 0755 nagios nagios
+f none /opt/csw/nagios/pnp/contrib/makeserviceextinfo.pl 0644 nagios nagios
+d none /opt/csw/nagios/pnp/contrib/ssi 0755 nagios nagios
+f none /opt/csw/nagios/pnp/contrib/ssi/status-header.ssi 0644 nagios nagios
+f none /opt/csw/nagios/pnp/contrib/verify_pnp_config 0644 nagios nagios
+f none /opt/csw/nagios/pnp/contrib/verify_pnp_config.txt 0644 nagios nagios
d none /opt/csw/nagios/share/pnp/images 0755 nagios nagios
f none /opt/csw/nagios/share/pnp/images/ack.png 0644 nagios nagios
f none /opt/csw/nagios/share/pnp/images/action.gif 0644 nagios nagios
Added: csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff (rev 0)
+++ csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff 2009-05-14 18:28:45 UTC (rev 4848)
@@ -0,0 +1,53 @@
+diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample
+--- pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample 1970-01-01 01:00:00.000000000 +0100
++++ pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample 2009-05-13 20:15:50.819746793 +0200
+@@ -0,0 +1,49 @@
++#
++# You can append these commands to your commands.cfg and
++# uncomment the lines for the mode, which fits your environment.
++#
++# Please note, that you need to edit your nagios.cfg too,
++# see http://www.pnp4nagios.org/ for more information.
++#
++
++#
++# default mode
++#
++
++#define command {
++# command_name process-service-perfdata
++# command_line /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl
++#}
++
++#define command {
++# command_name process-host-perfdata
++# command_line /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl -d HOSTPERFDATA
++#}
++
++#
++# bulk mode
++#
++
++#define command{
++# command_name process-service-perfdata-file
++# command_line /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/service-perfdata
++#}
++
++#define command{
++# command_name process-host-perfdata-file
++# command_line /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/host-perfdata
++# }
++
++#
++# bulk mode with npcd
++#
++
++#define command{
++# command_name process-service-perfdata-file
++# command_line /bin/mv /opt/csw/nagios/pnp/var/service-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/service-perfdata.$TIMET$
++# }
++
++#define command{
++# command_name process-host-perfdata-file
++# command_line /bin/mv /opt/csw/nagios/pnp/var/host-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/host-perfdata.$TIMET$
++# }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list