From 34fe3d2a20e9b8ce1dceaed3942dcc9fe19a6297 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil.baturin@vyatta.com>
Date: Wed, 4 Jan 2012 02:09:06 +0700
Subject: Update NAT monitor templates.

---
 templates/monitor/nat/source/background/node.def                    | 2 +-
 templates/monitor/nat/source/background/start/node.def              | 4 ++--
 templates/monitor/nat/source/background/stop/node.def               | 2 +-
 templates/monitor/nat/source/node.def                               | 4 ++--
 templates/monitor/nat/source/rule/node.def                          | 2 +-
 templates/monitor/nat/source/rule/node.tag/background/node.def      | 2 +-
 .../monitor/nat/source/rule/node.tag/background/start/node.def      | 4 ++--
 templates/monitor/nat/source/rule/node.tag/background/stop/node.def | 2 +-
 templates/monitor/nat/source/rule/node.tag/node.def                 | 6 +++---
 templates/monitor/nat/source/translations/detail/node.def           | 4 ++++
 templates/monitor/nat/source/translations/node.def                  | 4 ++++
 11 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 templates/monitor/nat/source/translations/detail/node.def
 create mode 100644 templates/monitor/nat/source/translations/node.def

(limited to 'templates/monitor/nat/source')

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
-- 
cgit v1.2.3