diff options
author | John Southworth <john.southworth@vyatta.com> | 2011-09-19 12:19:51 -0500 |
---|---|---|
committer | John Southworth <john.southworth@vyatta.com> | 2011-10-27 17:11:30 -0500 |
commit | b4bb5be6432e67f97a88fe2a1918cf2b0e21546f (patch) | |
tree | 6a3aae557180a99afd615a5458b694a9ca64befe /templates/monitor | |
parent | 20b1db02bc1cf35aab1fd275fb6f51e121e9f21d (diff) | |
download | vyatta-op-b4bb5be6432e67f97a88fe2a1918cf2b0e21546f.tar.gz vyatta-op-b4bb5be6432e67f97a88fe2a1918cf2b0e21546f.zip |
Fix filter completion
(cherry picked from commit 865874dbe3466f3188b4ebe6556fa00beefa6354)
Diffstat (limited to 'templates/monitor')
36 files changed, 36 insertions, 0 deletions
diff --git a/templates/monitor/interfaces/bonding/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/node.def index 1144059..f1ea258 100644 --- a/templates/monitor/interfaces/bonding/node.tag/node.def +++ b/templates/monitor/interfaces/bonding/node.tag/node.def @@ -1,2 +1,3 @@ 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.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/filter/node.tag/node.def index 90ab82a..99a61fc 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index 72de272..738e157 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/filter/node.tag/node.def index dbb9188..1fad477 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/unlimited/filter/node.tag/node.def index 372d39e..7a4551d 100644 --- 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 @@ -1,2 +1,3 @@ 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/vif/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def index 89ac434..7ea18ad 100644 --- a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def +++ b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def @@ -1,2 +1,3 @@ help: Monitor specified bonding interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding --vif ${COMP_WORDS[COMP_CWORD-2]} +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="." 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 index 092e885..de18ed5 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index 5327bcd..e54f6ee 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/filter/node.tag/node.def index 31d1ce6..d842c5f 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def index b8e22f7..4d17652 100644 --- 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 @@ -1,2 +1,3 @@ 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/bridge/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def index c06ffe1..ec25f16 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index c1685ab..e3a0ed0 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def index 4d22914..edbe01f 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def index 549b26f..4727a9b 100644 --- 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 @@ -1,2 +1,3 @@ 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/ethernet/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/node.def index 78761fd..e76b5ab 100644 --- a/templates/monitor/interfaces/ethernet/node.tag/node.def +++ b/templates/monitor/interfaces/ethernet/node.tag/node.def @@ -1,2 +1,3 @@ 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.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/filter/node.tag/node.def index 53340e6..f54eced 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index f45d4d2..600fc01 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/filter/node.tag/node.def index ca69cbf..bf86f7b 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def index acf6cca..fdd5f99 100644 --- 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 @@ -1,2 +1,3 @@ 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/vif/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def index b353293..6e13231 100644 --- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def +++ b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def @@ -1,2 +1,3 @@ help: Monitor specified ethernet interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet --vif ${COMP_WORDS[COMP_CWORD-2]} +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="." 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 index 9f9dbe1..a282093 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index 51ecec7..d740ff0 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/filter/node.tag/node.def index 9cd78ca..399e79b 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/unlimited/filter/node.tag/node.def index d6f26d3..6388a07 100644 --- 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 @@ -1,2 +1,3 @@ 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/loopback/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/filter/node.tag/node.def index 76d8f57..ceb1c5d 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index b9ec0c8..13bbeb9 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/filter/node.tag/node.def index a6fd177..d0f5042 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/unlimited/filter/node.tag/node.def index 2a69477..53c619f 100644 --- 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 @@ -1,2 +1,3 @@ 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/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 index 9b80e96..999d083 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index b64818d..2180745 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/filter/node.tag/node.def index fded0bf..6c57951 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/unlimited/filter/node.tag/node.def index 2b78797..136a518 100644 --- 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 @@ -1,2 +1,3 @@ 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/tunnel/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/filter/node.tag/node.def index bc82151..116d15c 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/detail/unlimited/filter/node.tag/node.def index 28c770a..46bea63 100644 --- 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 @@ -1,2 +1,3 @@ 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/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/filter/node.tag/node.def index 4863693..8edb024 100644 --- 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 @@ -1,2 +1,3 @@ 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/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/unlimited/filter/node.tag/node.def index e06ac36..0f7bf2b 100644 --- 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 @@ -1,2 +1,3 @@ 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}" |