Title: [opsview] [11789] Support plugin.d directory.
- Revision
- 11789
- Author
- pknight
- Date
- 2013-03-14 16:07:16 +0000 (Thu, 14 Mar 2013)
Log Message
Support plugin.d directory. Brought in from Commercial.
Modified Paths
Modified: trunk/opsview-core/bin/create_opspack
===================================================================
--- trunk/opsview-core/bin/create_opspack 2013-03-14 15:27:18 UTC (rev 11788)
+++ trunk/opsview-core/bin/create_opspack 2013-03-14 16:07:16 UTC (rev 11789)
@@ -472,7 +472,7 @@
open F, ">", "$norm_hosttemplate_dir/info"
or my_die( "Cannot open $norm_hosttemplate_dir/info for writing" );
print F <<"EOF";
-NAME=com.example.monitorpack.$norm_hosttemplate_name
+NAME=com.example.opspack.$norm_hosttemplate_name
VERSION=1.0
ALIAS=$hosttemplate_name
DEPENDENCIES=
@@ -492,7 +492,7 @@
mpack: clean
mkdir ${PACKNAME}
cp info config.json ${PACKNAME}
- tar --exclude=.svn -cf - plugins | tar -C ${PACKNAME} -xf -
+ tar --exclude=.svn -cf - plugins plugin.d | tar -C ${PACKNAME} -xf -
tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
clean:
Modified: trunk/opsview-core/filelist
===================================================================
--- trunk/opsview-core/filelist 2013-03-14 15:27:18 UTC (rev 11788)
+++ trunk/opsview-core/filelist 2013-03-14 16:07:16 UTC (rev 11789)
@@ -206,6 +206,7 @@
d nagios:nagios 0755 /usr/local/nagios/libexec
d nagios:nagios 0755 /usr/local/nagios/libexec/eventhandlers
d nagios:nagios 0755 /usr/local/nagios/libexec/notifications
+d nagios:nagios 0755 /usr/local/nagios/libexec/plugins.d
Modified: trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-03-14 15:27:18 UTC (rev 11788)
+++ trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-03-14 16:07:16 UTC (rev 11789)
@@ -231,6 +231,16 @@
}
}
+ # Move 'plugin.d' dir.
+ if ( -d "$packdir/plugin.d" ) {
+ $logger->info( "Installing extra files" );
+ my $dest = "/usr/local/nagios/libexec/plugins.d/$packdir";
+ rmtree($dest) if -d $dest;
+ move( "$packdir/plugin.d", $dest ) or do {
+ $logger->logdie( "Did not move $packdir/plugin.d into $dest: $!" );
+ };
+ }
+
# If errors and ! force, log and return
if (@errors) {
if ($force) {
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
