diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-09-12 12:30:24 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-27 17:11:29 -0500 |
| commit | 3de34f9578e04f849f809329f7128a99e8010990 (patch) | |
| tree | 68517fc749fc5d06d329b70d45e24013222c76e3 /templates | |
| parent | 5ffdcf0fce813c75443dad86a2537d3fe6036c66 (diff) | |
| download | vyatta-op-3de34f9578e04f849f809329f7128a99e8010990.tar.gz vyatta-op-3de34f9578e04f849f809329f7128a99e8010990.zip | |
Forground monitoring for nat
(cherry picked from commit f2b1229509cedbc5d201afb83a73dd142f98ddda)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/monitor/dns/node.def | 2 | ||||
| -rw-r--r-- | templates/monitor/nat/destination/node.def | 2 | ||||
| -rw-r--r-- | templates/monitor/nat/destination/rule/node.tag/node.def | 1 | ||||
| -rw-r--r-- | templates/monitor/nat/masquerade/node.def | 2 | ||||
| -rw-r--r-- | templates/monitor/nat/masquerade/rule/node.tag/node.def | 2 | ||||
| -rw-r--r-- | templates/monitor/nat/node.def | 3 | ||||
| -rw-r--r-- | templates/monitor/nat/source/node.def | 2 | ||||
| -rw-r--r-- | templates/monitor/nat/source/rule/node.tag/node.def | 1 | ||||
| -rw-r--r-- | templates/monitor/nat/translations/detail/node.def | 4 | ||||
| -rw-r--r-- | templates/monitor/nat/translations/node.def | 4 |
10 files changed, 16 insertions, 7 deletions
diff --git a/templates/monitor/dns/node.def b/templates/monitor/dns/node.def index 0584393..dc1a836 100644 --- a/templates/monitor/dns/node.def +++ b/templates/monitor/dns/node.def @@ -1 +1 @@ -help: Monitor a Domain Name Service daemon +help: Monitor a Domain Name Service (DNS) daemon diff --git a/templates/monitor/nat/destination/node.def b/templates/monitor/nat/destination/node.def index b04248c..2e122b0 100644 --- a/templates/monitor/nat/destination/node.def +++ b/templates/monitor/nat/destination/node.def @@ -1,2 +1,2 @@ help: Monitor Destination NAT logs -run: "Monitor Destination nat +run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-[0-9]*-DNAT\]" diff --git a/templates/monitor/nat/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def index 5a349c9..5733d14 100644 --- a/templates/monitor/nat/destination/rule/node.tag/node.def +++ b/templates/monitor/nat/destination/rule/node.tag/node.def @@ -1,2 +1,3 @@ help: Monitor Destination NAT logs for the specified rule allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" +run: ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-$5-DNAT\]" diff --git a/templates/monitor/nat/masquerade/node.def b/templates/monitor/nat/masquerade/node.def index 80e942b..2749d7c 100644 --- a/templates/monitor/nat/masquerade/node.def +++ b/templates/monitor/nat/masquerade/node.def @@ -1,2 +1,2 @@ help: Monitor Masquerade NAT logs -run: "Monitor all Masquerade nat rules" +run: ${vyatta_bindir}/vyatta-monitor NAT-MASQ "\[NAT-[0-9]*-MASQ\]" diff --git a/templates/monitor/nat/masquerade/rule/node.tag/node.def b/templates/monitor/nat/masquerade/rule/node.tag/node.def index bc77a5b..3920027 100644 --- a/templates/monitor/nat/masquerade/rule/node.tag/node.def +++ b/templates/monitor/nat/masquerade/rule/node.tag/node.def @@ -1,3 +1,3 @@ help: Monitor Masquerade NAT logs for a specified rule allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" -run: echo "Monitor [NAT-$4-$6]" +run: ${vyatta_bindir}/vyatta-monitor NAT-MASQ-RULE-$5 "\[NAT-$5-MASQ\]" diff --git a/templates/monitor/nat/node.def b/templates/monitor/nat/node.def index 936fe6b..6ef84c4 100644 --- a/templates/monitor/nat/node.def +++ b/templates/monitor/nat/node.def @@ -1,2 +1 @@ -help: Monitor Network Address Translation (NAT) logs -run: echo "Monitor nat" +help: Monitor Network Address Translation (NAT) diff --git a/templates/monitor/nat/source/node.def b/templates/monitor/nat/source/node.def index 2dd604f..5397fb8 100644 --- a/templates/monitor/nat/source/node.def +++ b/templates/monitor/nat/source/node.def @@ -1,2 +1,2 @@ help: Monitor Source NAT logs -run: "Monitor all source nat rules" +run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-[0-9]*-SNAT\]" diff --git a/templates/monitor/nat/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def index 660eef9..cbc9264 100644 --- a/templates/monitor/nat/source/rule/node.tag/node.def +++ b/templates/monitor/nat/source/rule/node.tag/node.def @@ -1,2 +1,3 @@ help: Monitor Source NAT logs for a specified rule allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" +run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-$5-SNAT\]" diff --git a/templates/monitor/nat/translations/detail/node.def b/templates/monitor/nat/translations/detail/node.def new file mode 100644 index 0000000..19d0c7a --- /dev/null +++ b/templates/monitor/nat/translations/detail/node.def @@ -0,0 +1,4 @@ +help: Show active NAT translations events verbose +run: LESSOPEN=cat + echo Type control-C to quit + sudo /usr/sbin/conntrack -E -n -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --verbose diff --git a/templates/monitor/nat/translations/node.def b/templates/monitor/nat/translations/node.def new file mode 100644 index 0000000..c31c77f --- /dev/null +++ b/templates/monitor/nat/translations/node.def @@ -0,0 +1,4 @@ +help: Monitor active NAT translations events +run: LESSOPEN=cat + echo Type control-C to quit + sudo /usr/sbin/conntrack -E -n -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe |