From 083fc448c6c9d0af337731e6ab39e0bab0e2ed25 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 13 Sep 2011 16:30:28 -0500
Subject: Add background monitoring for NAT (cherry picked from commit
 8a1c2a082a43dedd4cb29872f663e98d3c797877)

---
 templates/monitor/nat/background/node.def                              | 1 +
 templates/monitor/nat/background/start/node.def                        | 2 ++
 templates/monitor/nat/background/stop/node.def                         | 3 +++
 templates/monitor/nat/destination/background/node.def                  | 1 +
 templates/monitor/nat/destination/background/start/node.def            | 2 ++
 templates/monitor/nat/destination/background/stop/node.def             | 2 ++
 templates/monitor/nat/destination/node.def                             | 2 +-
 templates/monitor/nat/destination/rule/node.def                        | 2 +-
 templates/monitor/nat/destination/rule/node.tag/background/node.def    | 1 +
 .../monitor/nat/destination/rule/node.tag/background/start/node.def    | 2 ++
 .../monitor/nat/destination/rule/node.tag/background/stop/node.def     | 2 ++
 templates/monitor/nat/destination/rule/node.tag/node.def               | 2 +-
 templates/monitor/nat/masquerade/background/node.def                   | 1 +
 templates/monitor/nat/masquerade/background/start/node.def             | 2 ++
 templates/monitor/nat/masquerade/background/stop/node.def              | 2 ++
 templates/monitor/nat/masquerade/node.def                              | 2 +-
 templates/monitor/nat/masquerade/rule/node.def                         | 2 +-
 templates/monitor/nat/masquerade/rule/node.tag/background/node.def     | 2 ++
 .../monitor/nat/masquerade/rule/node.tag/background/start/node.def     | 2 ++
 .../monitor/nat/masquerade/rule/node.tag/background/stop/node.def      | 2 ++
 templates/monitor/nat/masquerade/rule/node.tag/node.def                | 2 +-
 templates/monitor/nat/node.def                                         | 1 +
 templates/monitor/nat/source/background/node.def                       | 1 +
 templates/monitor/nat/source/background/start/node.def                 | 2 ++
 templates/monitor/nat/source/background/stop/node.def                  | 2 ++
 templates/monitor/nat/source/node.def                                  | 2 +-
 templates/monitor/nat/source/rule/node.def                             | 2 +-
 templates/monitor/nat/source/rule/node.tag/background/node.def         | 2 ++
 templates/monitor/nat/source/rule/node.tag/background/start/node.def   | 2 ++
 templates/monitor/nat/source/rule/node.tag/background/stop/node.def    | 2 ++
 templates/monitor/nat/source/rule/node.tag/node.def                    | 2 +-
 31 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 templates/monitor/nat/background/node.def
 create mode 100644 templates/monitor/nat/background/start/node.def
 create mode 100644 templates/monitor/nat/background/stop/node.def
 create mode 100644 templates/monitor/nat/destination/background/node.def
 create mode 100644 templates/monitor/nat/destination/background/start/node.def
 create mode 100644 templates/monitor/nat/destination/background/stop/node.def
 create mode 100644 templates/monitor/nat/destination/rule/node.tag/background/node.def
 create mode 100644 templates/monitor/nat/destination/rule/node.tag/background/start/node.def
 create mode 100644 templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
 create mode 100644 templates/monitor/nat/masquerade/background/node.def
 create mode 100644 templates/monitor/nat/masquerade/background/start/node.def
 create mode 100644 templates/monitor/nat/masquerade/background/stop/node.def
 create mode 100644 templates/monitor/nat/masquerade/rule/node.tag/background/node.def
 create mode 100644 templates/monitor/nat/masquerade/rule/node.tag/background/start/node.def
 create mode 100644 templates/monitor/nat/masquerade/rule/node.tag/background/stop/node.def
 create mode 100644 templates/monitor/nat/source/background/node.def
 create mode 100644 templates/monitor/nat/source/background/start/node.def
 create mode 100644 templates/monitor/nat/source/background/stop/node.def
 create mode 100644 templates/monitor/nat/source/rule/node.tag/background/node.def
 create mode 100644 templates/monitor/nat/source/rule/node.tag/background/start/node.def
 create mode 100644 templates/monitor/nat/source/rule/node.tag/background/stop/node.def

diff --git a/templates/monitor/nat/background/node.def b/templates/monitor/nat/background/node.def
new file mode 100644
index 0000000..01d5867
--- /dev/null
+++ b/templates/monitor/nat/background/node.def
@@ -0,0 +1 @@
+help: Monitor NAT in the background
diff --git a/templates/monitor/nat/background/start/node.def b/templates/monitor/nat/background/start/node.def
new file mode 100644
index 0000000..3ab4b79
--- /dev/null
+++ b/templates/monitor/nat/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background NAT monitoring
+run: ${vyatta_bindir}/vyatta-monitor-background NAT "\[NAT-[0-9]*-*\]"
diff --git a/templates/monitor/nat/background/stop/node.def b/templates/monitor/nat/background/stop/node.def
new file mode 100644
index 0000000..d84a03d
--- /dev/null
+++ b/templates/monitor/nat/background/stop/node.def
@@ -0,0 +1,3 @@
+help: Stop background NAT monitoring
+help: Stop background NAT monitoring
+run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT
diff --git a/templates/monitor/nat/destination/background/node.def b/templates/monitor/nat/destination/background/node.def
new file mode 100644
index 0000000..745b70b
--- /dev/null
+++ b/templates/monitor/nat/destination/background/node.def
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..a3a310c
--- /dev/null
+++ b/templates/monitor/nat/destination/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background Destination NAT monitoring
+run:  ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-[0-9]*-DNAT\]"
diff --git a/templates/monitor/nat/destination/background/stop/node.def b/templates/monitor/nat/destination/background/stop/node.def
new file mode 100644
index 0000000..a139d6c
--- /dev/null
+++ b/templates/monitor/nat/destination/background/stop/node.def
@@ -0,0 +1,2 @@
+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 2e122b0..8c24cb4 100644
--- a/templates/monitor/nat/destination/node.def
+++ b/templates/monitor/nat/destination/node.def
@@ -1,2 +1,2 @@
-help: Monitor Destination NAT logs
+help: Monitor Destination NAT
 run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-[0-9]*-DNAT\]"
diff --git a/templates/monitor/nat/destination/rule/node.def b/templates/monitor/nat/destination/rule/node.def
index f1243ee..b90312e 100644
--- a/templates/monitor/nat/destination/rule/node.def
+++ b/templates/monitor/nat/destination/rule/node.def
@@ -1 +1 @@
-help: Monitor Destination NAT logs for a specified rule
+help: Monitor a specified Destination NAT rule
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/node.def b/templates/monitor/nat/destination/rule/node.tag/background/node.def
new file mode 100644
index 0000000..7f64872
--- /dev/null
+++ b/templates/monitor/nat/destination/rule/node.tag/background/node.def
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..6dc8430
--- /dev/null
+++ b/templates/monitor/nat/destination/rule/node.tag/background/start/node.def
@@ -0,0 +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\]"
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
new file mode 100644
index 0000000..fb9016f
--- /dev/null
+++ b/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
@@ -0,0 +1,2 @@
+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 5733d14..84119f6 100644
--- a/templates/monitor/nat/destination/rule/node.tag/node.def
+++ b/templates/monitor/nat/destination/rule/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Monitor Destination NAT logs for the specified rule
+help: Monitor a specified Destination NAT 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/background/node.def b/templates/monitor/nat/masquerade/background/node.def
new file mode 100644
index 0000000..4f39dac
--- /dev/null
+++ b/templates/monitor/nat/masquerade/background/node.def
@@ -0,0 +1 @@
+help: Monitor Masquerade NAT in the background
diff --git a/templates/monitor/nat/masquerade/background/start/node.def b/templates/monitor/nat/masquerade/background/start/node.def
new file mode 100644
index 0000000..bbfbb98
--- /dev/null
+++ b/templates/monitor/nat/masquerade/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring of Masquerade NAT
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-MASQ "\[NAT-[0-9]*-MASQ\]"
diff --git a/templates/monitor/nat/masquerade/background/stop/node.def b/templates/monitor/nat/masquerade/background/stop/node.def
new file mode 100644
index 0000000..c0c22cd
--- /dev/null
+++ b/templates/monitor/nat/masquerade/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring of Masquerade NAT
+run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-MASQ
diff --git a/templates/monitor/nat/masquerade/node.def b/templates/monitor/nat/masquerade/node.def
index 2749d7c..39364b7 100644
--- a/templates/monitor/nat/masquerade/node.def
+++ b/templates/monitor/nat/masquerade/node.def
@@ -1,2 +1,2 @@
-help: Monitor Masquerade NAT logs
+help: Monitor Masquerade NAT
 run: ${vyatta_bindir}/vyatta-monitor NAT-MASQ "\[NAT-[0-9]*-MASQ\]"
diff --git a/templates/monitor/nat/masquerade/rule/node.def b/templates/monitor/nat/masquerade/rule/node.def
index 543074f..7aa9219 100644
--- a/templates/monitor/nat/masquerade/rule/node.def
+++ b/templates/monitor/nat/masquerade/rule/node.def
@@ -1 +1 @@
-help: Monitor Masquerade NAT logs for a specified rule
+help: Monitor a specified Masquerade NAT rule
diff --git a/templates/monitor/nat/masquerade/rule/node.tag/background/node.def b/templates/monitor/nat/masquerade/rule/node.tag/background/node.def
new file mode 100644
index 0000000..f6b9640
--- /dev/null
+++ b/templates/monitor/nat/masquerade/rule/node.tag/background/node.def
@@ -0,0 +1,2 @@
+help: Monitor a specified Masquerade NAT rule in the background
+
diff --git a/templates/monitor/nat/masquerade/rule/node.tag/background/start/node.def b/templates/monitor/nat/masquerade/rule/node.tag/background/start/node.def
new file mode 100644
index 0000000..c203f80
--- /dev/null
+++ b/templates/monitor/nat/masquerade/rule/node.tag/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring of a specified Masquerade NAT rule
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-MASQ-RULE-$5 "\[NAT-$5-MASQ\]"
diff --git a/templates/monitor/nat/masquerade/rule/node.tag/background/stop/node.def b/templates/monitor/nat/masquerade/rule/node.tag/background/stop/node.def
new file mode 100644
index 0000000..2564ead
--- /dev/null
+++ b/templates/monitor/nat/masquerade/rule/node.tag/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring of a specified Masquerade NAT rule
+run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-MASQ-RULE-$5
diff --git a/templates/monitor/nat/masquerade/rule/node.tag/node.def b/templates/monitor/nat/masquerade/rule/node.tag/node.def
index 3920027..32fad6b 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
+help: Monitor a specified Masquerade NAT rule
 allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}"
 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 6ef84c4..967bc73 100644
--- a/templates/monitor/nat/node.def
+++ b/templates/monitor/nat/node.def
@@ -1 +1,2 @@
 help: Monitor Network Address Translation (NAT)
+run: ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-[0-9]*-*\]"
diff --git a/templates/monitor/nat/source/background/node.def b/templates/monitor/nat/source/background/node.def
new file mode 100644
index 0000000..37d5ea4
--- /dev/null
+++ b/templates/monitor/nat/source/background/node.def
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..e68ceb4
--- /dev/null
+++ b/templates/monitor/nat/source/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring of Source NAT
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE "\[NAT-[0-9]*-SNAT\]"
diff --git a/templates/monitor/nat/source/background/stop/node.def b/templates/monitor/nat/source/background/stop/node.def
new file mode 100644
index 0000000..bfecd57
--- /dev/null
+++ b/templates/monitor/nat/source/background/stop/node.def
@@ -0,0 +1,2 @@
+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 5397fb8..c21ef12 100644
--- a/templates/monitor/nat/source/node.def
+++ b/templates/monitor/nat/source/node.def
@@ -1,2 +1,2 @@
-help: Monitor Source NAT logs
+help: Monitor Source NAT
 run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-[0-9]*-SNAT\]"
diff --git a/templates/monitor/nat/source/rule/node.def b/templates/monitor/nat/source/rule/node.def
index b24d1bf..3ad3a15 100644
--- a/templates/monitor/nat/source/rule/node.def
+++ b/templates/monitor/nat/source/rule/node.def
@@ -1 +1 @@
-help: Monitor Source NAT logs for a specified 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
new file mode 100644
index 0000000..da44a1f
--- /dev/null
+++ b/templates/monitor/nat/source/rule/node.tag/background/node.def
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..8653493
--- /dev/null
+++ b/templates/monitor/nat/source/rule/node.tag/background/start/node.def
@@ -0,0 +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]\]"
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
new file mode 100644
index 0000000..661752d
--- /dev/null
+++ b/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
@@ -0,0 +1,2 @@
+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 cbc9264..d4c1793 100644
--- a/templates/monitor/nat/source/rule/node.tag/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Monitor Source NAT logs for a specified rule
+help: Monitor a specified Source NAT 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\]"
-- 
cgit v1.2.3