[csw-devel] SF.net SVN: gar:[4960] csw/mgar/pkg/pnp/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Tue May 19 21:20:43 CEST 2009
Revision: 4960
http://gar.svn.sourceforge.net/gar/?rev=4960&view=rev
Author: j_arndt
Date: 2009-05-19 19:20:43 +0000 (Tue, 19 May 2009)
Log Message:
-----------
pnp: changed paths to match OpenCSW layout standards, added sample configuration
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/commands.cfg-sample.diff
csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff
Removed 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-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/Makefile 2009-05-19 19:20:43 UTC (rev 4960)
@@ -18,7 +18,8 @@
PATCHFILES += npcdmod.h.diff
PATCHFILES += npcdmod.c.diff
PATCHFILES += npcd.cfg-sample.in.diff
-PATCHFILES += nagios_commands.cfg-sample.diff
+PATCHFILES += commands.cfg-sample.diff
+PATCHFILES += nagios.cfg-sample.diff
# We define upstream file regex so we can be notifed of new upstream software release
#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -33,7 +34,8 @@
sysconfdir = $(prefix)/nagios/pnp/etc
bindir = $(prefix)/nagios/pnp/bin
libexecdir = $(prefix)/libexec/nagios-plugins
-localstatedir =$(prefix)/nagios/pnp/var
+localstatedir = /var/opt/csw/pnp
+#localstatedir =$(prefix)/nagios/pnp/var
REQUIRED_PKGS += CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd CSWnagios CSWcswclassutils
SPKG_CLASSES = none cswpreserveconf cswinitsmf
@@ -44,9 +46,11 @@
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-perl_lib_path=/opt/csw/lib/perl/csw
-CONFIGURE_ARGS += --with-perfdata-logfile=/opt/csw/nagios/pnp/var/perfdata.log
+#CONFIGURE_ARGS += --with-perfdata-logfile=/opt/csw/nagios/pnp/var/perfdata.log
+CONFIGURE_ARGS += --with-perfdata-logfile=/var/opt/csw/pnp/perfdata.log
CONFIGURE_ARGS += --with-perfdata-dir=/opt/csw/nagios/pnp/share/perfdata
-CONFIGURE_ARGS += --with-perfdata-spool-dir=/opt/csw/nagios/pnp/var/spool/perfdata
+#CONFIGURE_ARGS += --with-perfdata-spool-dir=/opt/csw/nagios/pnp/var/spool/perfdata
+CONFIGURE_ARGS += --with-perfdata-spool-dir=/var/opt/csw/pnp/spool/perfdata
CONFIGURE_ARGS += --htmldir=/opt/csw/nagios/share/pnp
BUILD_ARGS = all
@@ -65,7 +69,8 @@
SYSCONFDIR = $(sysconfdir)
LIBEXECDIR = $(libexecdir)
BINDIR = $(bindir)
-PERFDATA_SPOOL_DIR=/opt/csw/nagios/pnp/var/spool/perfdata/
+#PERFDATA_SPOOL_DIR=/opt/csw/nagios/pnp/var/spool/perfdata/
+PERFDATA_SPOOL_DIR=/var/opt/csw/pnp/spool/perfdata/
PERFDATADIR = /opt/csw/nagios/pnp/share/perfdata
install-base-custom:
@@ -135,7 +140,8 @@
@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
+ @ginstall -m 644 $(WORKSRC)/sample-config/pnp/commands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/commands.cfg-sample
+ @ginstall -m 644 $(WORKSRC)/sample-config/pnp/nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios.cfg-sample
@$(MAKECOOKIE)
install-contrib-custom:
Modified: csw/mgar/pkg/pnp/trunk/checksums
===================================================================
--- csw/mgar/pkg/pnp/trunk/checksums 2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/checksums 2009-05-19 19:20:43 UTC (rev 4960)
@@ -1,10 +1,11 @@
9dbbf08191a258f6798c9516b3821ff0 download/pnp-0.4.14.tar.gz
216b8ed50919642c3fae2a6520724dd3 download/CSWpnp.gspec
-6e75bd501030cb04740160165f8b9ed8 download/CSWpnp.prototype
+cc9e90ad08302f4a60abcc273a8e4f20 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
+c10bfd9230f04d1c4c1e9479901f0db6 download/commands.cfg-sample.diff
+3e55b518ec5192557da59b17e806d0f1 download/nagios.cfg-sample.diff
Modified: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-19 19:20:43 UTC (rev 4960)
@@ -17,14 +17,15 @@
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 none /opt/csw/nagios/pnp/etc/commands.cfg-sample 0644 nagios nagios
+f none /opt/csw/nagios/pnp/etc/nagios.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
d none /opt/csw/nagios/pnp/share/perfdata 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var/spool 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var/spool/perfdata 0755 nagios nagios
+d none /var/opt/csw/pnp 0755 nagios nagios
+d none /var/opt/csw/pnp/spool 0755 nagios nagios
+d none /var/opt/csw/pnp/spool/perfdata 0755 nagios nagios
d none /opt/csw/nagios/share 0755 nagios nagios
d none /opt/csw/nagios/share/pnp 0755 nagios nagios
s none /opt/csw/nagios/pnp/share/html=/opt/csw/nagios/share/pnp
Added: csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff (rev 0)
+++ csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff 2009-05-19 19:20:43 UTC (rev 4960)
@@ -0,0 +1,53 @@
+diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/commands.cfg-sample pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample
+--- pnp-0.4.14.orig/sample-config/pnp/commands.cfg-sample 1970-01-01 01:00:00.000000000 +0100
++++ pnp-0.4.14/sample-config/pnp/commands.cfg-sample 2009-05-13 20:15:50.819746793 +0200
+@@ -0,0 +1,49 @@
++#
++# You can append these commands to the commands.cfg of your Nagios 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=/var/opt/csw/pnp/service-perfdata
++#}
++
++#define command{
++# command_name process-host-perfdata-file
++# command_line /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/var/opt/csw/pnp/host-perfdata
++# }
++
++#
++# bulk mode with npcd
++#
++
++#define command{
++# command_name process-service-perfdata-file
++# command_line /bin/mv /var/opt/csw/pnp/service-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/service-perfdata.$TIMET$
++# }
++
++#define command{
++# command_name process-host-perfdata-file
++# command_line /bin/mv /var/opt/csw/pnp/host-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/host-perfdata.$TIMET$
++# }
Added: csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff (rev 0)
+++ csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff 2009-05-19 19:20:43 UTC (rev 4960)
@@ -0,0 +1,42 @@
+diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/nagios.cfg-sample pnp-0.4.14/sample-config/pnp/nagios.cfg-sample
+--- pnp-0.4.14.orig/sample-config/pnp/nagios.cfg-sample 1970-01-01 01:00:00.000000000 +0100
++++ pnp-0.4.14/sample-config/pnp/nagios.cfg-sample 2009-05-19 20:46:35.753095929 +0200
+@@ -0,0 +1,38 @@
++#
++# You can copy and uncomment the lines which fits your environment
++# to your nagios.cfg
++#
++# Proper process commands you can find in commands.cfg-sample
++#
++
++#
++# Default Mode
++#
++
++#process_performance_data=1
++#enable_environment_macros = 1
++#service_perfdata_command=process-service-perfdata
++#host_perfdata_command=process-host-perfdata
++
++#
++# Bulk Mode
++#
++
++#process_performance_data=1
++#service_perfdata_file=/var/opt/csw/pnp/service-perfdata
++#service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$
++#service_perfdata_file_mode=a
++#service_perfdata_file_processing_interval=15
++#service_perfdata_file_processing_command=process-service-perfdata-file
++
++#host_perfdata_file=/var/opt/csw/pnp/host-perfdata
++#host_perfdata_file_template=DATATYPE::HOSTPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tHOSTPERFDATA::$HOSTPERFDATA$\tHOSTCHECKCOMMAND::$HOSTCHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$
++#host_perfdata_file_mode=a
++#host_perfdata_file_processing_interval=15
++#host_perfdata_file_processing_command=process-host-perfdata-file
++
++#
++# NPCD with Bulk Mode
++#
++
++# You need to change your nagios.cfg identically as with the Bulk Mode
Deleted: csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff 2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff 2009-05-19 19:20:43 UTC (rev 4960)
@@ -1,53 +0,0 @@
-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