summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Tyni <ntyni@iki.fi>2005-09-13 13:17:39 +0200
committerNiko Tyni <ntyni@iki.fi>2005-09-13 13:17:39 +0200
commit97b64b61cd4b395b612620e721b55f9cc61bd610 (patch)
tree917b51b90c375da686b30944a74e9ed9667f7122
parent954c1303bf9aa057100cd61f89e4797f6cf8d7c6 (diff)
downloadsmokeping-97b64b61cd4b395b612620e721b55f9cc61bd610.tar.gz
smokeping-97b64b61cd4b395b612620e721b55f9cc61bd610.tar.xz
* lib/Smokeping.pm (trunk,2.0),
CHANGE (trunk,2.0): + made some alert docs in smokeping_config visible
-rw-r--r--CHANGES2
-rw-r--r--lib/Smokeping.pm8
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,
+ to => { _doc => <<DOC,
Either an email address to send alerts to, or the name of a program to
execute when an alert matches. To call a program, the first character of the
B<to> 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,
+ edgetrigger => { _doc => <<DOC,
The alert notifications and/or the programs executed are normally triggered every
time the alert matches. If this variable is set to 'yes', they will be triggered
only when the alert's state is changed, ie. when it's raised and when it's cleared.
@@ -2274,7 +2274,7 @@ DOC
_vars => [ 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',
},