summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-10-10 18:31:10 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-10-27 17:11:30 -0500
commit35dc8040e0d238b69d8bd8bd9f3001afbf618a31 (patch)
tree690e938e2ef67bcad8348622fefde7786473dbd5
parent099eebc479b832634bd8311de0676a9ca9233b99 (diff)
downloadvyatta-op-35dc8040e0d238b69d8bd8bd9f3001afbf618a31.tar.gz
vyatta-op-35dc8040e0d238b69d8bd8bd9f3001afbf618a31.zip
Fix up completion for 'show log firewall'
(cherry picked from commit 0a4cd2fd80169cff0b485f233f41270f5a381f11)
-rw-r--r--templates/show/log/firewall/ipv6-name/node.tag/node.def2
-rw-r--r--templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def4
-rw-r--r--templates/show/log/firewall/name/node.tag/node.def2
-rw-r--r--templates/show/log/firewall/name/node.tag/rule/node.tag/node.def4
4 files changed, 6 insertions, 6 deletions
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 0be0d86..26a8a88 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[@]}"
+ echo "${ARR[@]//\'/}"
run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
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 6034aa7..8a04c9b 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[3]} rule)
- echo "${ARR[@]}"
+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]\]"
diff --git a/templates/show/log/firewall/name/node.tag/node.def b/templates/show/log/firewall/name/node.tag/node.def
index 40d7d03..8de2a42 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[@]}"
+ echo "${ARR[@]//\'/}"
run: cat $(printf "%s\n" /var/log/messages* | sort -nr ) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
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 bac7f64..41d4a12 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[3]} rule)
- echo "${ARR[@]}"
+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]\]"