Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12776,12784,12787-12788,12795,12797,12799-12800,12806,12810,12814,12816-12817,12822-12823,12827,12833,12838,12841,12843-12846,12848,12851-12853,12856,12858,12860,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12776,12784,12787-12788,12795,12797,12799-12800,12806,12810,12814,12816-12817,12822-12823,12827,12833,12838,12841,12843-12846,12848,12851-12853,12856,12858,12860-12861,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/opsview-core/import/opspacks_source/application-opsview-common/info
===================================================================
--- trunk/opsview-core/import/opspacks_source/application-opsview-common/info 2013-08-15 20:14:04 UTC (rev 13304)
+++ trunk/opsview-core/import/opspacks_source/application-opsview-common/info 2013-08-15 20:15:33 UTC (rev 13305)
@@ -1,5 +1,5 @@
NAME=com.opsview.opspack.application_opsview_common
-VERSION=1.0
+VERSION=1.1
ALIAS=Application - Opsview Common
DEPENDENCIES=
OPSVIEW_MIN_VERSION=
Copied: trunk/opsview-core/import/opspacks_source/application-opsview-common/plugins/check_opsview_cronjobs (from rev 12861, branches/enterprise/DEV-professional/opsview-core/import/opspacks_source/application-opsview-common/plugins/check_opsview_cronjobs)
===================================================================
--- trunk/opsview-core/import/opspacks_source/application-opsview-common/plugins/check_opsview_cronjobs (rev 0)
+++ trunk/opsview-core/import/opspacks_source/application-opsview-common/plugins/check_opsview_cronjobs 2013-08-15 20:15:33 UTC (rev 13305)
@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+#
+#
+# SYNTAX:
+# check_opsview_cronjobs [hours]
+#
+# DESCRIPTION:
+#
+# AUTHORS:
+# Copyright (C) 2003-2013 Opsview Limited. All rights reserved
+#
+# This file is part of Opsview
+#
+#
+
+use strict;
+use FindBin qw($Bin);
+use lib "$Bin/../lib", "$Bin/../etc", "$Bin/../perl/lib";
+use Nagios::Plugin;
+
+my $VERSION = "0.01";
+
+my $np = Nagios::Plugin->new(
+ usage =>
+ "Usage: %s [-h|--help] [-w, --warning=<hours>] [-c, --critical=<hours>]\n Checks time since last successful run of opsview_cronjobs",
+ shortname => "CRONJOBS",
+ version => $VERSION,
+);
+
+my $warn_default = 24;
+$np->add_arg(
+ spec => "warning|w=i",
+ help => qq{-w, --warn=INTEGER
+ Maximum number of hours to allow since a successful housekeeping cronjob run, outside of
+ which a warning will be generated (default: $warn_default)},
+ default => $warn_default,
+);
+
+my $critical_default = 48;
+$np->add_arg(
+ spec => "critical|c=i",
+ help => qq{-c, --critical=INTEGER
+ Maximum number of hours to allow since a successful housekeeping cronjob run, outside of
+ which a critical alert will be generated (default: $critical_default)},
+ default => $critical_default,
+);
+
+$np->getopts;
+
+my $mtime = (stat('/usr/local/nagios/var/opsview_cronjobs.stat'))[9];
+
+# Die unless we've retrieved a time
+unless (defined $mtime) {
+ $np->nagios_exit(
+ return_code => 2,
+ message => 'Housekeeping cronjob has never been successfully run'
+ );
+}
+
+# We've retrieved a time, work out how long ago
+my $time = time();
+my $time_difference = $time - $mtime;
+my $hour_difference = $time_difference / ( 60 * 60 );
+
+# We know how long it's been, has it been too long?
+if ( $hour_difference <= $np->opts->warning ) {
+ $np->nagios_exit(
+ return_code => 0,
+ message =>
+ sprintf( 'Housekeeping cronjob last successfully ran %i hours ago',
+ $hour_difference ),
+ );
+}
+
+# Yes, too long - alert with warning or critical
+$np->nagios_exit(
+ return_code => $hour_difference < $np->opts->critical ? 1 : 2,
+ message =>
+ sprintf( 'Housekeeping cronjob has not successfully run for %i hours',
+ $hour_difference ),
+);
