Use node generation scripts in build

For the nodes that the generation scripts generate, delete the checked
in node files.

160 files changed, 6 insertions, 324 deletions

diff --git a/Makefile.am b/Makefile.am
index 0205f74..9c39def 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,11 @@ bin_sudo_users_SCRIPTS     += scripts/vyatta-clear-conntrack
 
 all-local:
 	./gen-unpriv-commands.sh
+	./gen-monitor-interface-templates.sh
+	./gen-monitor-vif-interface-templates.sh
+
+clean-local:
+	$(RM) -r generated-templates
 
 cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
 	cpio -0pd
@@ -69,6 +74,7 @@ cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
 install-exec-hook:
 	mkdir -p $(DESTDIR)$(opdir)
 	cd templates; $(cpiop) $(DESTDIR)$(opdir)
+	cd generated-templates && $(cpiop) $(DESTDIR)$(opdir)
 	mkdir -p $(DESTDIR)$(etc_shell_leveldir)
 	cd etc/shell/level; $(cpiop) $(DESTDIR)$(etc_shell_leveldir)
 	mkdir -p $(DESTDIR)/etc/
diff --git a/templates/monitor/interfaces/bonding/node.tag/flow/node.def b/templates/monitor/interfaces/bonding/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/bonding/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/node.def
deleted file mode 100644
index a52d23e..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor specified bonding interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding
-run: bmon -p $4
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
deleted file mode 100644
index 79d2994..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 99a61fc..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index b9888ff..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 79d2994..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 738e157..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 0939fee..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8b77d3a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 1fad477..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 247c1d9..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8b77d3a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 7a4551d..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index bc5997b..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified bonding interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/flow/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/flow/node.def
deleted file mode 100644
index 8631626..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4.$6
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def
deleted file mode 100644
index 4ca53db..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor specified bonding interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding --vif ${COMP_WORDS[COMP_CWORD-2]}
-run: bmon -p $4.$6
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.def
deleted file mode 100644
index 79d2994..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def
deleted file mode 100644
index de18ed5..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --filter "${@:10}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/node.def
deleted file mode 100644
index 1830e6a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified bonding interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def
deleted file mode 100644
index 79d2994..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
deleted file mode 100644
index e54f6ee..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --unlimited --filter "${@:11}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/node.def
deleted file mode 100644
index 4b0a795..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified bonding interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --unlimited
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.def
deleted file mode 100644
index 8b77d3a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.tag/node.def
deleted file mode 100644
index d842c5f..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --filter "${@:9}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def
deleted file mode 100644
index a4c952a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Montior captured traffic on specified bonding interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.def
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index e822a9b..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Save monitored traffic to a file
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --save "${@:9}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.def
deleted file mode 100644
index 8b77d3a..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def
deleted file mode 100644
index 4d17652..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bonding interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --unlimited --filter "${@:10}"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/node.def
deleted file mode 100644
index 7ca46e4..0000000
--- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified bonding interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --unlimited
diff --git a/templates/monitor/interfaces/bridge/node.tag/flow/node.def b/templates/monitor/interfaces/bridge/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/bridge/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/node.def
deleted file mode 100644
index 317283f..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified bridge interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bridge
-run: bmon -p $4
-
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
deleted file mode 100644
index 68f59a7..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ec25f16..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bridge interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index da75a0d..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 68f59a7..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index e3a0ed0..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified bridge interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index ebd1372..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index f9a5aa7..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index edbe01f..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bridge interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index f416289..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index f9a5aa7..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4727a9b..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified bridge interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 2fd4776..0000000
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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/flow/node.def b/templates/monitor/interfaces/ethernet/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/ethernet/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/node.def
deleted file mode 100644
index 1953e99..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified ethernet interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet
-run: bmon -p $4
-
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
deleted file mode 100644
index b8da469..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index f54eced..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 4127943..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b8da469..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 600fc01..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 8d81c5e..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8a12510..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index bf86f7b..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index f74073a..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8a12510..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index fdd5f99..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 55b6b99..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified ethernet interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/flow/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/flow/node.def
deleted file mode 100644
index 8631626..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4.$6
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def
deleted file mode 100644
index 43cd0b0..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor specified ethernet interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet --vif ${COMP_WORDS[COMP_CWORD-2]}
-run: bmon -p $4.$6
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.def
deleted file mode 100644
index b8da469..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def
deleted file mode 100644
index a282093..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --filter "${@:10}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/node.def
deleted file mode 100644
index 36622fe..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified ethernet interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def
deleted file mode 100644
index b8da469..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
deleted file mode 100644
index d740ff0..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --unlimited --filter "${@:11}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/node.def
deleted file mode 100644
index aafe57a..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified ethernet interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --detail --unlimited
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.def
deleted file mode 100644
index 8a12510..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.tag/node.def
deleted file mode 100644
index 399e79b..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --filter "${@:9}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def
deleted file mode 100644
index 919a2b2..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Montior captured traffic on specified ethernet interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.def
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index e822a9b..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Save monitored traffic to a file
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --save "${@:9}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.def
deleted file mode 100644
index 8a12510..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def
deleted file mode 100644
index 6388a07..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified ethernet interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --unlimited --filter "${@:10}"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/node.def
deleted file mode 100644
index 2a4f5bc..0000000
--- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified ethernet interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4.$6 --unlimited
diff --git a/templates/monitor/interfaces/loopback/node.tag/flow/node.def b/templates/monitor/interfaces/loopback/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/loopback/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/node.def
deleted file mode 100644
index 98cada3..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor specified loopback interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show loopback
-
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
deleted file mode 100644
index 8400ea6..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ceb1c5d..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified loopback interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 4137e13..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 8400ea6..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 13bbeb9..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified loopback interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index fe5015e..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5e7a229..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d0f5042..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified loopback interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 9f6554f..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5e7a229..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 53c619f..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified loopback interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 3ac318c..0000000
--- a/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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/flow/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
deleted file mode 100644
index b58a595..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified pseudo-ethernet interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show pseudo-ethernet
-run: bmon -p $4
-
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
deleted file mode 100644
index 1981911..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 999d083..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 7e304a2..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 1981911..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 2180745..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified pseudo-ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 63c645f..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5302dd7..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6c57951..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified pseudo-ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 173dee1..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 5302dd7..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 136a518..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified pseudo-ethernet interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 9202afb..0000000
--- a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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/flow/node.def b/templates/monitor/interfaces/tunnel/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/tunnel/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/node.def
deleted file mode 100644
index 00cd040..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified tunnel interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show tunnel
-run: bmon -p $4
-
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
deleted file mode 100644
index c3f1bc0..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 116d15c..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified tunnel interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 3f87096..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index c3f1bc0..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 46bea63..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified tunnel interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index 7c29236..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index f10ee36..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 8edb024..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified tunnel interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index cc2eb27..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index f10ee36..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0f7bf2b..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified tunnel interface
-allowed: echo -e '<pcap-filter>'
-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
deleted file mode 100644
index d300bce..0000000
--- a/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified tunnel interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/vrrp/node.tag/flow/node.def b/templates/monitor/interfaces/vrrp/node.tag/flow/node.def
deleted file mode 100644
index 2dd7cfd..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/flow/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor flows on specified interface
-run: sudo /usr/sbin/iftop -i $4
diff --git a/templates/monitor/interfaces/vrrp/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/node.def
deleted file mode 100644
index 94c75d9..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified vrrp interface
-allowed: ${vyatta_bindir}/vyatta-show-interfaces.pl --vrrp --action=allowed
-run: bmon -p $4
-
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.def
deleted file mode 100644
index 089543a..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vrrp interface
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.tag/node.def
deleted file mode 100644
index cf49146..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vrrp interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/node.def
deleted file mode 100644
index c67d39c..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified vrrp interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.def
deleted file mode 100644
index 089543a..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vrrp interface
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
deleted file mode 100644
index d3c180d..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vrrp interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/node.def
deleted file mode 100644
index 8805b9e..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified vrrp interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.def
deleted file mode 100644
index 4e5f1c2..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified vrrp interface
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.tag/node.def
deleted file mode 100644
index 99bbb91..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified vrrp interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/node.def
deleted file mode 100644
index 8bee8fe..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Montior captured traffic on specified vrrp interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.def
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Save monitored traffic to a file
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.def
deleted file mode 100644
index 4e5f1c2..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified vrrp interface
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.tag/node.def
deleted file mode 100644
index 25fc797..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified vrrp interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/node.def
deleted file mode 100644
index 6002c6a..0000000
--- a/templates/monitor/interfaces/vrrp/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified vrrp interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
diff --git a/templates/monitor/interfaces/vti/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/node.def
deleted file mode 100644
index 7244589..0000000
--- a/templates/monitor/interfaces/vti/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor specified vti interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show vti
-run: bmon -p $4
-
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.def
deleted file mode 100644
index a6a9444..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vti interface
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.tag/node.def
deleted file mode 100644
index 63742c3..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vti interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/node.def
deleted file mode 100644
index b759e3d..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified vti interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.def
deleted file mode 100644
index a6a9444..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vti interface
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
deleted file mode 100644
index f54a40b..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor detailed filtered traffic for the specified vti interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/node.def
deleted file mode 100644
index 1158b46..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/detail/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor detailed traffic for the specified vti interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.def
deleted file mode 100644
index 4ee8e39..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified vti interface
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.tag/node.def
deleted file mode 100644
index c88e0e6..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified vti interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/node.def
deleted file mode 100644
index e38107c..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Montior captured traffic on specified vti interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/save/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/save/node.def
deleted file mode 100644
index 402f47c..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/save/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Save monitored traffic to a file
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/save/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/save/node.tag/node.def
deleted file mode 100644
index bd747b5..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/save/node.tag/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Save monitored traffic to a file
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.def
deleted file mode 100644
index 4ee8e39..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor filtered traffic for the specified vti interface
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.tag/node.def
deleted file mode 100644
index 9346ce2..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/filter/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor filtered traffic for the specified vti interface
-allowed: echo -e '<pcap-filter>'
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/node.def
deleted file mode 100644
index c4a9143..0000000
--- a/templates/monitor/interfaces/vti/node.tag/traffic/unlimited/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor traffic for the specified vti interface
-run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited