Update NAT monitor templates.

22 files changed, 44 insertions, 29 deletions

diff --git a/templates/monitor/nat/destination/background/node.def b/templates/monitor/nat/destination/background/node.def
index 745b70b..9c60d84 100644
--- a/templates/monitor/nat/destination/background/node.def
+++ b/templates/monitor/nat/destination/background/node.def
@@ -1 +1 @@
-help: Monitor Destination NAT in the background
+help: Monitor destination NAT in the background
diff --git a/templates/monitor/nat/destination/background/start/node.def b/templates/monitor/nat/destination/background/start/node.def
index a3a310c..599c54c 100644
--- a/templates/monitor/nat/destination/background/start/node.def
+++ b/templates/monitor/nat/destination/background/start/node.def
@@ -1,2 +1,2 @@
-help: Start background Destination NAT monitoring
-run:  ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-[0-9]*-DNAT\]"
+help: Start background destination NAT monitoring
+run:  ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-DST-[0-9]*-*\]"
diff --git a/templates/monitor/nat/destination/background/stop/node.def b/templates/monitor/nat/destination/background/stop/node.def
index a139d6c..a3e13ff 100644
--- a/templates/monitor/nat/destination/background/stop/node.def
+++ b/templates/monitor/nat/destination/background/stop/node.def
@@ -1,2 +1,2 @@
-help: Stop background Destination NAT monitoring
+help: Stop background destination NAT monitoring
 run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-DEST
diff --git a/templates/monitor/nat/destination/node.def b/templates/monitor/nat/destination/node.def
index 8c24cb4..df2893b 100644
--- a/templates/monitor/nat/destination/node.def
+++ b/templates/monitor/nat/destination/node.def
@@ -1,2 +1,2 @@
-help: Monitor Destination NAT
-run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-[0-9]*-DNAT\]"
+help: Monitor destination NAT
+run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-DST-[0-9]*-*\]"
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/node.def b/templates/monitor/nat/destination/rule/node.tag/background/node.def
index 7f64872..c862d82 100644
--- a/templates/monitor/nat/destination/rule/node.tag/background/node.def
+++ b/templates/monitor/nat/destination/rule/node.tag/background/node.def
@@ -1 +1 @@
-help: Monitor a specified Destination NAT rule in the background
+help: Monitor a specified destination NAT rule in the background
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 6dc8430..710f4a7 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,2 @@
-help: Start background monitoring of a specified Destination NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-$5-DNAT\]"
+help: Start background monitoring of a specified destination NAT rule
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-DST-$5-*\]"
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def b/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
index fb9016f..bdd727a 100644
--- a/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
+++ b/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
@@ -1,2 +1,2 @@
-help: Stop background monitoring of a specified Destination NAT rule
+help: Stop background monitoring of a specified destination NAT rule
 run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-DEST-RULE-$5
diff --git a/templates/monitor/nat/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def
index d99860b..8be31fc 100644
--- a/templates/monitor/nat/destination/rule/node.tag/node.def
+++ b/templates/monitor/nat/destination/rule/node.tag/node.def
@@ -1,5 +1,5 @@
-help: Monitor a specified Destination NAT rule
+help: Monitor a specified destination NAT rule
 allowed: local -a ARR 
-         eval "ARR=($(cli-shell-api listEffectiveNodes service nat rule))"
+         eval "ARR=($(cli-shell-api listEffectiveNodes nat destination rule))"
          echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-$5-DNAT\]"
+run: ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-DST-$5-*\]"
diff --git a/templates/monitor/nat/destination/translations/detail/node.def b/templates/monitor/nat/destination/translations/detail/node.def
new file mode 100644
index 0000000..d700d9f
--- /dev/null
+++ b/templates/monitor/nat/destination/translations/detail/node.def
@@ -0,0 +1,4 @@
+help: Show active destination NAT translations events verbose
+run: LESSOPEN=cat
+     echo Type control-C to quit 
+     sudo /usr/sbin/conntrack -E -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=destination --verbose
diff --git a/templates/monitor/nat/destination/translations/node.def b/templates/monitor/nat/destination/translations/node.def
new file mode 100644
index 0000000..d6ad6f5
--- /dev/null
+++ b/templates/monitor/nat/destination/translations/node.def
@@ -0,0 +1,4 @@
+help: Monitor active destination NAT translations events
+run: LESSOPEN=cat
+     echo Type control-C to quit 
+     sudo /usr/sbin/conntrack -E -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=destination
diff --git a/templates/monitor/nat/node.def b/templates/monitor/nat/node.def
index b2bd21f..11a8e3d 100644
--- a/templates/monitor/nat/node.def
+++ b/templates/monitor/nat/node.def
@@ -1,2 +1 @@
-help: Monitor Network Address Translation (NAT)
-run: ${vyatta_bindir}/vyatta-monitor NAT "\[NAT-[0-9]*-*\]"
+help: Monitor network address translation (NAT)
diff --git a/templates/monitor/nat/source/background/node.def b/templates/monitor/nat/source/background/node.def
index 37d5ea4..a28968f 100644
--- a/templates/monitor/nat/source/background/node.def
+++ b/templates/monitor/nat/source/background/node.def
@@ -1 +1 @@
-help: Monitor Source NAT in the background
+help: Monitor source NAT in the background
diff --git a/templates/monitor/nat/source/background/start/node.def b/templates/monitor/nat/source/background/start/node.def
index e68ceb4..962c766 100644
--- a/templates/monitor/nat/source/background/start/node.def
+++ b/templates/monitor/nat/source/background/start/node.def
@@ -1,2 +1,2 @@
-help: Start background monitoring of Source NAT
-run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE "\[NAT-[0-9]*-SNAT\]"
+help: Start background monitoring of source NAT
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE "\[NAT-SRC-[0-9]*-*\]"
diff --git a/templates/monitor/nat/source/background/stop/node.def b/templates/monitor/nat/source/background/stop/node.def
index bfecd57..fc02c10 100644
--- a/templates/monitor/nat/source/background/stop/node.def
+++ b/templates/monitor/nat/source/background/stop/node.def
@@ -1,2 +1,2 @@
-help: Stop background monitoring of Source NAT
+help: Stop background monitoring of source NAT
 run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-SOURCE
diff --git a/templates/monitor/nat/source/node.def b/templates/monitor/nat/source/node.def
index c21ef12..c69dc9c 100644
--- a/templates/monitor/nat/source/node.def
+++ b/templates/monitor/nat/source/node.def
@@ -1,2 +1,2 @@
-help: Monitor Source NAT
-run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-[0-9]*-SNAT\]"
+help: Monitor source NAT
+run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-SRC-[0-9]*-*\]"
diff --git a/templates/monitor/nat/source/rule/node.def b/templates/monitor/nat/source/rule/node.def
index 3ad3a15..8526965 100644
--- a/templates/monitor/nat/source/rule/node.def
+++ b/templates/monitor/nat/source/rule/node.def
@@ -1 +1 @@
-help: Monitor a specified Source NAT rule
+help: Monitor a specified source NAT rule
diff --git a/templates/monitor/nat/source/rule/node.tag/background/node.def b/templates/monitor/nat/source/rule/node.tag/background/node.def
index da44a1f..f1139e2 100644
--- a/templates/monitor/nat/source/rule/node.tag/background/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/background/node.def
@@ -1,2 +1,2 @@
-help: Monitor a specified Source NAT rule in the background
+help: Monitor a specified source NAT rule in the background
 
diff --git a/templates/monitor/nat/source/rule/node.tag/background/start/node.def b/templates/monitor/nat/source/rule/node.tag/background/start/node.def
index 8653493..6cca0ce 100644
--- a/templates/monitor/nat/source/rule/node.tag/background/start/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/background/start/node.def
@@ -1,2 +1,2 @@
-help: Start background monitoring of a specified Source NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE-RULE-$5 "\[NAT-$5-SNAT]\]"
+help: Start background monitoring of a specified source NAT rule
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5-*\]"
diff --git a/templates/monitor/nat/source/rule/node.tag/background/stop/node.def b/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
index 661752d..241f47b 100644
--- a/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
@@ -1,2 +1,2 @@
-help: Stop background monitoring of a specified Source NAT rule
+help: Stop background monitoring of a specified source NAT rule
 run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-SOURCE-RULE-$5
diff --git a/templates/monitor/nat/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def
index ec7d35e..5abfdd2 100644
--- a/templates/monitor/nat/source/rule/node.tag/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/node.def
@@ -1,5 +1,5 @@
-help: Monitor a specified Source NAT rule
+help: Monitor a specified source NAT rule
 allowed: local -a ARR
-  eval "ARR=($(cli-shell-api listEffectiveNodes service nat rule))"
+  eval "ARR=($(cli-shell-api listEffectiveNodes nat source rule))"
   echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-$5-SNAT\]"
+run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5-*\]"
diff --git a/templates/monitor/nat/source/translations/detail/node.def b/templates/monitor/nat/source/translations/detail/node.def
new file mode 100644
index 0000000..e6e6f02
--- /dev/null
+++ b/templates/monitor/nat/source/translations/detail/node.def
@@ -0,0 +1,4 @@
+help: Show active source NAT translations events verbose
+run: LESSOPEN=cat
+     echo Type control-C to quit 
+     sudo /usr/sbin/conntrack -E -n -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=source --verbose
diff --git a/templates/monitor/nat/source/translations/node.def b/templates/monitor/nat/source/translations/node.def
new file mode 100644
index 0000000..7ded6c1
--- /dev/null
+++ b/templates/monitor/nat/source/translations/node.def
@@ -0,0 +1,4 @@
+help: Monitor active source NAT translations events
+run: LESSOPEN=cat
+     echo Type control-C to quit 
+     sudo /usr/sbin/conntrack -E -n -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=source