diff options
| author | Daniil Baturin <daniil@baturin.org> | 2013-12-21 08:35:36 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2013-12-21 08:35:36 +0100 |
| commit | 3c40c48584eda801686a829defd73736bff34ca8 (patch) | |
| tree | ad9fea4a3df42e0f0452ccfd448f8248044be514 /templates/monitor/nat/destination | |
| parent | 3444459922f0e2b2ebb6de859f7e72ca178e9902 (diff) | |
| download | vyatta-op-3c40c48584eda801686a829defd73736bff34ca8.tar.gz vyatta-op-3c40c48584eda801686a829defd73736bff34ca8.zip | |
Bug #95: Issue warnings on attempts to monitor rules with disabled logging.
Additionally notify when monitoring firewall/NAT instances that only
rules with logging enabled are monitored.
Diffstat (limited to 'templates/monitor/nat/destination')
4 files changed, 8 insertions, 4 deletions
diff --git a/templates/monitor/nat/destination/background/start/node.def b/templates/monitor/nat/destination/background/start/node.def index 5feaf6b..8f1f0eb 100644 --- a/templates/monitor/nat/destination/background/start/node.def +++ b/templates/monitor/nat/destination/background/start/node.def @@ -1,2 +1,3 @@ help: Start background destination NAT monitoring -run: ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-DST-[0-9]*.*\]" +run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \ + ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-DST-[0-9]*.*\]" diff --git a/templates/monitor/nat/destination/node.def b/templates/monitor/nat/destination/node.def index 3dc3e61..7729cc8 100644 --- a/templates/monitor/nat/destination/node.def +++ b/templates/monitor/nat/destination/node.def @@ -1,2 +1,3 @@ help: Monitor destination NAT -run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-DST-[0-9]*.*\]" +run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \ + ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-DST-[0-9]*.*\]" diff --git a/templates/monitor/nat/destination/rule/node.tag/background/start/node.def b/templates/monitor/nat/destination/rule/node.tag/background/start/node.def index 955eebb..ad06778 100644 --- a/templates/monitor/nat/destination/rule/node.tag/background/start/node.def +++ b/templates/monitor/nat/destination/rule/node.tag/background/start/node.def @@ -1,2 +1,3 @@ help: Start background monitoring of a specified destination NAT rule -run: ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-DST-$5.*\]" +run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat destination" $5; \ + ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-DST-$5.*\]" diff --git a/templates/monitor/nat/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def index 8be31fc..1ada87b 100644 --- a/templates/monitor/nat/destination/rule/node.tag/node.def +++ b/templates/monitor/nat/destination/rule/node.tag/node.def @@ -2,4 +2,5 @@ help: Monitor a specified destination NAT rule allowed: local -a ARR eval "ARR=($(cli-shell-api listEffectiveNodes nat destination rule))" echo ${ARR[@]} -run: ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-DST-$5-*\]" +run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat destination" $5; \ + ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-DST-$5-*\]" |