[Mon-commit] mon CREDITS,1.1.1.1,1.1.1.1.2.1 INSTALL,1.1.1.1,1.1.1.1.2.1 README,1.1.1.1.2.1,1.1.1.1.
Brought to you by:
trockij
Menu
▾
▴
[Mon-commit] mon CREDITS,1.1.1.1,1.1.1.1.2.1 INSTALL,1.1.1.1,1.1.1.1.2.1 README,1.1.1.1.2.1,1.1.1.1.2.2 mon,1.4.2.1,1.4.2.2
|
From: Jim T. <tr...@us...> - 2004-06-17 20:29:04
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10597 Modified Files: Tag: mon-1-0-0pre1 CREDITS INSTALL README mon Log Message: added 'alertevery strict' code and docs, updated the README and INSTALL to mention CVS, updated CREDITS Index: README =================================================================== RCS file: /cvsroot/mon/mon/README,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 *** README 12 Jun 2004 18:17:57 -0000 1.1.1.1.2.1 --- README 17 Jun 2004 20:28:54 -0000 1.1.1.1.2.2 *************** *** 55,59 **** ------------ ! The latest version of mon is available from kernel.org in pub/software/admin/mon/. Please choose a mirror from --- 55,59 ---- ------------ ! The latest release of mon is available from kernel.org in pub/software/admin/mon/. Please choose a mirror from *************** *** 65,68 **** --- 65,81 ---- + CVS + --- + + CVS trees of both the development trunk and stable release branches are + available from anonymous CVS access on sourceforge.net. To check out the latest + stable branch, do the following: + + $ cvs -d:pserver:ano...@cv...:/cvsroot/mon login + $ cvs -z3 -d:pserver:ano...@cv...:/cvsroot/mon co -r mon-1-0-0pre1 mon + + The "development" branch may be checked out by omitting the "-r mon-1-0-0pre1". + + INSTALLATION ------------ Index: CREDITS =================================================================== RCS file: /cvsroot/mon/mon/CREDITS,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** CREDITS 9 Jun 2004 05:18:03 -0000 1.1.1.1 --- CREDITS 17 Jun 2004 20:28:49 -0000 1.1.1.1.2.1 *************** *** 8,11 **** --- 8,21 ---- Lots of ideas, inital testing under Solaris, and http.monitor code. + David Nolan + vit...@cm... + Many bug fixes and feature additions. David probably runs the largest + mon installation in existence. + + Ed Ravin + er...@pa... + Bug fixes, many enhancements to monitors, feature additions, and fixes + for BSD-isms. + Martin J. Laubach mj...@em... Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** mon 12 Jun 2004 18:17:57 -0000 1.4.2.1 --- mon 17 Jun 2004 20:28:54 -0000 1.4.2.2 *************** *** 587,591 **** # # only alert once every "alertevery" seconds, unless ! # output from monitor is different # my ($prevsumm) = split("\n", $sref->{"_failure_output"}); --- 587,591 ---- # # only alert once every "alertevery" seconds, unless ! # output from monitor is different or if strict alertevery # my ($prevsumm) = split("\n", $sref->{"_failure_output"}); *************** *** 595,598 **** --- 595,599 ---- ($tmnow - $pref->{"_last_alert"} < $pref->{"alertevery"}) && ( + ($pref->{"_alertevery_strict"}) || ($pref->{"_observe_detail"} && $sref->{"_failure_output"} eq $output) || (!$pref->{"_observe_detail"} && $prevsumm eq $summary) *************** *** 1274,1282 **** elsif ($var eq "alertevery") { ! my $observe_detail = 0; if ($args =~ /(\S+) \s+ observe_detail \s*$/ix) { ! $observe_detail = 1; $args = $1; } --- 1275,1284 ---- elsif ($var eq "alertevery") { ! $pref->{"_observe_detail"} = 0; ! $pref->{"_alertevery_strict"} = 0; if ($args =~ /(\S+) \s+ observe_detail \s*$/ix) { ! $pref->{"_observe_detail"} = 1; $args = $1; } *************** *** 1290,1300 **** } if (!($args = dhmstos ($args))) { close (CFG); ! return "cf error: invalid time interval '$args' (syntax: alertevery {positive number}{smhd}), line $line_num"; } $pref->{"alertevery"} = $args; - $pref->{"_observe_detail"} = $observe_detail; next; } --- 1292,1310 ---- } + # + # strict + # + elsif ($args =~ /(\S+) \s+ strict \s*$/ix) + { + $args = $1; + $pref->{"_alertevery_strict"} = 1; + } + if (!($args = dhmstos ($args))) { close (CFG); ! return "cf error: invalid time interval '$args' (syntax: alertevery {positive number}{smhd} [ strict | observe_detail ]), line $line_num"; } $pref->{"alertevery"} = $args; next; } *************** *** 2942,2946 **** foreach my $period (keys %{$sref->{"periods"}}) { ! $sref->{"periods"}->{$period}->{"_last_alert"} = 0; $sref->{"periods"}->{$period}->{"_1stfailtime"} = 0; $sref->{"periods"}->{$period}->{"_alert_sent"} = 0; --- 2952,2963 ---- foreach my $period (keys %{$sref->{"periods"}}) { ! # ! # "alertevery strict" should not reset _last_alert ! # ! if (!$sref->{"periods"}->{$period}->{"_alertevery_strict"}) ! { ! $sref->{"periods"}->{$period}->{"_last_alert"} = 0; ! } ! $sref->{"periods"}->{$period}->{"_1stfailtime"} = 0; $sref->{"periods"}->{$period}->{"_alert_sent"} = 0; Index: INSTALL =================================================================== RCS file: /cvsroot/mon/mon/INSTALL,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** INSTALL 9 Jun 2004 05:18:03 -0000 1.1.1.1 --- INSTALL 17 Jun 2004 20:28:54 -0000 1.1.1.1.2.1 *************** *** 94,97 **** --- 94,104 ---- /pub/software/admin/mon directory. + If you are using a CVS release of the mon server, you will want + to be sure to match it with the corresponding version from the + "monperl" module. At this time, branch "mon-1-0-0pre1" of the + mon CVS module matches the "monperl-1-0-0pre1" branch of the + monperl CVS module. See http://sourceforge.net/projects/mon/ for + information on CVS access. + 2. MON SERVER INSTALLATION |