From 97b64b61cd4b395b612620e721b55f9cc61bd610 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Tue, 13 Sep 2005 11:17:39 +0000 Subject: * lib/Smokeping.pm (trunk,2.0), CHANGE (trunk,2.0): + made some alert docs in smokeping_config visible --- CHANGES | 2 ++ lib/Smokeping.pm | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 0afe2bd..f5b1a5b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +* made some alert docs in smokeping_config visible --niko + 2005/9/13 -- released version 20050913_trunk * optionally only send alerts when the state changes ('edgetrigger') diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 87225d8..d416733 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -2240,7 +2240,7 @@ DOC _sections => [ '/[^\s,]+/' ], _vars => [ qw(to from edgetrigger) ], _mandatory => [ qw(to from)], - to => { doc => < { _doc => < value must be a pipe symbol "|". The program will the be called @@ -2252,11 +2252,11 @@ DOC _re => '(\|.+|.+@\S+|snpp:)', _re_error => 'put an email address or the name of a program here', }, - from => { doc => 'who should alerts appear to be coming from ?', + from => { _doc => 'who should alerts appear to be coming from ?', _re => '.+@\S+', _re_error => 'put an email address here', }, - edgetrigger => { doc => < { _doc => < [ qw(type pattern comment to edgetrigger) ], _inherited => [ qw(edgetrigger) ], _mandatory => [ qw(type pattern comment) ], - to => { doc => 'Similar to the "to" parameter on the top-level except that it will only be used IN ADDITION to the value of the toplevel parameter. Same rules apply.', + to => { _doc => 'Similar to the "to" parameter on the top-level except that it will only be used IN ADDITION to the value of the toplevel parameter. Same rules apply.', _re => '(\|.+|.+@\S+|snpp:)', _re_error => 'put an email address or the name of a program here', }, -- cgit v1.2.3-24-g4f1b