summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-09-15 16:51:05 -0700
committerJohn Southworth <john.southworth@vyatta.com>2011-10-27 17:11:29 -0500
commitb04673afd899d2032200799a9d9b0c72901ad262 (patch)
treecdc31bc0d25a189341aa31facfa678120650d7e5 /templates
parent5abab7cc94b1eb8784a34c5efd0a1a685979630d (diff)
downloadvyatta-op-b04673afd899d2032200799a9d9b0c72901ad262.tar.gz
vyatta-op-b04673afd899d2032200799a9d9b0c72901ad262.zip
More monitor interface traffic commands
(cherry picked from commit 3358412ae5e8d7ba94aedeb78080d2509d82239f)
Diffstat (limited to 'templates')
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/node.def4
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.def1
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.def1
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/node.def4
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.def1
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def2
-rw-r--r--templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/node.def2
84 files changed, 150 insertions, 18 deletions
diff --git a/templates/monitor/interfaces/bonding/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/node.def
index 61ad641..f1ea258 100644
--- a/templates/monitor/interfaces/bonding/node.tag/node.def
+++ b/templates/monitor/interfaces/bonding/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified bonding interface
+help: Monitor specified bonding interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..79d2994
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..90ab82a
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..b9888ff
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..79d2994
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..72de272
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..0939fee
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..8b77d3a
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..dbb9188
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
index e186876..247c1d9 100644
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified bonding interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..8b77d3a
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..372d39e
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..bc5997b
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified bonding interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/bridge/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/node.def
index 8f86b7c..cd1695a 100644
--- a/templates/monitor/interfaces/bridge/node.tag/node.def
+++ b/templates/monitor/interfaces/bridge/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified bridge interface
+help: Monitor specified bridge interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bridge
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..68f59a7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..c06ffe1
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..da75a0d
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..68f59a7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..c1685ab
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..ebd1372
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..f9a5aa7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..4d22914
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
index db42c6d..f416289 100644
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified bridge interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..f9a5aa7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..549b26f
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..2fd4776
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/ethernet/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/node.def
index 23616b5..e76b5ab 100644
--- a/templates/monitor/interfaces/ethernet/node.tag/node.def
+++ b/templates/monitor/interfaces/ethernet/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified ethernet interface
+help: Monitor specified ethernet interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..b8da469
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..53340e6
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..4127943
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..b8da469
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..f45d4d2
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..8d81c5e
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..8a12510
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..ca69cbf
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
index 359330f..f74073a 100644
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified ethernet interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..8a12510
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..acf6cca
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..55b6b99
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/loopback/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/node.def
index b82e0c5..d8e0e3b 100644
--- a/templates/monitor/interfaces/loopback/node.tag/node.def
+++ b/templates/monitor/interfaces/loopback/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified loopback interface
+help: Monitor specified loopback interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show loopback
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..8400ea6
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified loopback interface
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..76d8f57
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..4137e13
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..8400ea6
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified loopback interface
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..b9ec0c8
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..fe5015e
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..5e7a229
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified loopback interface
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..a6fd177
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
index 013fc84..9f6554f 100644
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on loopback interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..5e7a229
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified loopback interface
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..2a69477
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..3ac318c
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified loopback interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
index 459219b..b538150 100644
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified pseudo-ethernet interface
+help: Monitor specified pseudo-ethernet interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show pseudo-ethernet
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..1981911
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..9b80e96
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..7e304a2
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..1981911
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..b64818d
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..63c645f
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..5302dd7
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..fded0bf
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
index 8f0fc18..173dee1 100644
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified pseudo ethernet interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..5302dd7
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..2b78797
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..9202afb
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified pseudo-ethernet interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/tunnel/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/node.def
index 777ddb3..49c7bb2 100644
--- a/templates/monitor/interfaces/tunnel/node.tag/node.def
+++ b/templates/monitor/interfaces/tunnel/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified tunnel interface
+help: Monitor specified tunnel interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show tunnel
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..c3f1bc0
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..bc82151
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..3f87096
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..c3f1bc0
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..28c770a
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..7c29236
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..f10ee36
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..4863693
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
index 2f290eb..cc2eb27 100644
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified tunnel interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..f10ee36
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..e06ac36
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..d300bce
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified tunnel interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited