From c127764c495e058ad85b5a311f06b23521e42499 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil.baturin@vyatta.com>
Date: Wed, 4 Jan 2012 04:49:57 +0700
Subject: Fix NAT monitor rule log prefix.

---
 templates/monitor/nat/destination/background/start/node.def             | 2 +-
 templates/monitor/nat/destination/node.def                              | 2 +-
 .../monitor/nat/destination/rule/node.tag/background/start/node.def     | 2 +-
 templates/monitor/nat/source/background/start/node.def                  | 2 +-
 templates/monitor/nat/source/node.def                                   | 2 +-
 templates/monitor/nat/source/rule/node.tag/background/start/node.def    | 2 +-
 templates/monitor/nat/source/rule/node.tag/node.def                     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/monitor/nat/destination/background/start/node.def b/templates/monitor/nat/destination/background/start/node.def
index 599c54c..5feaf6b 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-DST-[0-9]*-*\]"
+run:  ${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 df2893b..3dc3e61 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-DST-[0-9]*-*\]"
+run: ${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 710f4a7..955eebb 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-DST-$5-*\]"
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-DST-$5.*\]"
diff --git a/templates/monitor/nat/source/background/start/node.def b/templates/monitor/nat/source/background/start/node.def
index 962c766..7b3a275 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-SRC-[0-9]*-*\]"
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE "\[NAT-SRC-[0-9]*.*\]"
diff --git a/templates/monitor/nat/source/node.def b/templates/monitor/nat/source/node.def
index c69dc9c..48b2bb9 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-SRC-[0-9]*-*\]"
+run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-SRC-[0-9]*.*\]"
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 6cca0ce..9f83cb4 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-SRC-$5-*\]"
+run: ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5.*\]"
diff --git a/templates/monitor/nat/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def
index 5abfdd2..e291421 100644
--- a/templates/monitor/nat/source/rule/node.tag/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/node.def
@@ -2,4 +2,4 @@ help: Monitor a specified source NAT rule
 allowed: local -a ARR
   eval "ARR=($(cli-shell-api listEffectiveNodes nat source rule))"
   echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5-*\]"
+run: ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5.*\]"
-- 
cgit v1.2.3


From 23b2ab962e655ba8f73a2598fab9ad8f987b8870 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil.baturin@vyatta.com>
Date: Wed, 4 Jan 2012 04:50:47 +0700
Subject: 0.13.225

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc3b886..0e52f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.225) unstable; urgency=low
+
+  * Fix NAT monitor rule log prefix.
+
+ -- Daniil Baturin <daniil.baturin@vyatta.com>  Wed, 04 Jan 2012 04:50:46 +0700
+
 vyatta-op (0.13.224) unstable; urgency=low
 
   * Update NAT monitor templates.
-- 
cgit v1.2.3