From 6446c756bc4f0874cc547d802d3a1aef25aebaed Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Thu, 2 Feb 2012 11:16:47 -0800
Subject: Improve firewall log matches

---
 templates/show/log/firewall/ipv6-name/node.tag/node.def               | 2 +-
 templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def | 2 +-
 templates/show/log/firewall/name/node.tag/node.def                    | 2 +-
 templates/show/log/firewall/name/node.tag/rule/node.tag/node.def      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates/show')

diff --git a/templates/show/log/firewall/ipv6-name/node.tag/node.def b/templates/show/log/firewall/ipv6-name/node.tag/node.def
index 26a8a88..072e210 100644
--- a/templates/show/log/firewall/ipv6-name/node.tag/node.def
+++ b/templates/show/log/firewall/ipv6-name/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for a specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name)
           echo "${ARR[@]//\'/}"
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | egrep "\[$5-[0-9]+|default-[ADR]\]"
 
diff --git a/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
index 8a04c9b..aaab229 100644
--- a/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
+++ b/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Show log for a rule in the specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name ${COMP_WORDS[4]} rule)
           echo "${ARR[@]//\'/}"
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[A,D,R]\]"
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[ADR]\]"
diff --git a/templates/show/log/firewall/name/node.tag/node.def b/templates/show/log/firewall/name/node.tag/node.def
index 8de2a42..4e71fa0 100644
--- a/templates/show/log/firewall/name/node.tag/node.def
+++ b/templates/show/log/firewall/name/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for a specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall name)
           echo "${ARR[@]//\'/}"
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr ) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr ) | egrep "\[$5-[0-9]+|default-[ADR]\]"
 
diff --git a/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def b/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
index 41d4a12..68fd119 100644
--- a/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
+++ b/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for a rule in the specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall name ${COMP_WORDS[4]} rule)
           echo "${ARR[@]//\'/}"
-run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[A,D,R]\]"
+run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | egrep "\[$5-$7-[ADR]\]"
 
-- 
cgit v1.2.3