diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2008-03-19 22:40:22 +0100 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2008-03-19 22:40:22 +0100 |
| commit | 4a2ee52a92ce7a2f4f62ff039bddeaaa7080309c (patch) | |
| tree | 658c95d81a9aeed6ae9fd5afe777a8b433e82f3f /lib/Smokeping.pm | |
| parent | b6edbe8a83658ca1b35e502e6353e9b3d3762073 (diff) | |
| download | smokeping-4a2ee52a92ce7a2f4f62ff039bddeaaa7080309c.tar.gz smokeping-4a2ee52a92ce7a2f4f62ff039bddeaaa7080309c.tar.xz | |
added nikos fixes for nomasterpoll
Diffstat (limited to 'lib/Smokeping.pm')
| -rw-r--r-- | lib/Smokeping.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 62021e2..1e90636 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -416,7 +416,7 @@ sub add_targets ($$$$){ if (ref $tree->{$prop} eq 'HASH'){ add_targets $cfg, $probes, $tree->{$prop}, "$name/$prop"; } - if ($prop eq 'host' and ( not $tree->{nomasterpoll} or $tree->{nomasterpoll} eq 'no') and check_filter($cfg,$name) and $tree->{$prop} !~ m|^/| ) { + if ($prop eq 'host' and ( check_filter($cfg,$name) and $tree->{$prop} !~ m|^/| )) { if($tree->{host} =~ /^DYNAMIC/) { $probeobj->add($tree,$name); } else { @@ -2055,8 +2055,8 @@ DOC nomasterpoll=> { _doc => <<DOC, Use this in a master/slave setup where the master must not poll a particular -target. The master will now skip this entry in its polling cycle. and from -search results. Note that if you set the hide property on a non leaf entry +target. The master will now skip this entry in its polling cycle. +Note that if you set the hide property on a non leaf entry all subordinate entries will also disapear in the menu structure. You can still access them via direct link or via an alternate hierarchy. @@ -2066,7 +2066,6 @@ contain any graphs. DOC _re => '(yes|no)', - _re_error => 'Only set this if you want to hide', _default => 'no', }, |