From b04673afd899d2032200799a9d9b0c72901ad262 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Thu, 15 Sep 2011 16:51:05 -0700
Subject: More monitor interface traffic commands (cherry picked from commit
 3358412ae5e8d7ba94aedeb78080d2509d82239f)

---
 templates/monitor/interfaces/bridge/node.tag/node.def                 | 4 +++-
 .../monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def | 1 +
 .../bridge/node.tag/traffic/detail/filter/node.tag/node.def           | 2 ++
 templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def  | 2 ++
 .../bridge/node.tag/traffic/detail/unlimited/filter/node.def          | 1 +
 .../bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def | 2 ++
 .../interfaces/bridge/node.tag/traffic/detail/unlimited/node.def      | 2 ++
 templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def  | 1 +
 .../interfaces/bridge/node.tag/traffic/filter/node.tag/node.def       | 2 ++
 templates/monitor/interfaces/bridge/node.tag/traffic/node.def         | 4 ++--
 templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def    | 2 ++
 .../interfaces/bridge/node.tag/traffic/unlimited/filter/node.def      | 1 +
 .../bridge/node.tag/traffic/unlimited/filter/node.tag/node.def        | 2 ++
 .../monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def     | 2 ++
 14 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
 create mode 100644 templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def

(limited to 'templates/monitor/interfaces/bridge')

diff --git a/templates/monitor/interfaces/bridge/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/node.def
index 8f86b7c..cd1695a 100644
--- a/templates/monitor/interfaces/bridge/node.tag/node.def
+++ b/templates/monitor/interfaces/bridge/node.tag/node.def
@@ -1 +1,3 @@
-help: Monitor a specified bridge interface
+help: Monitor specified bridge interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bridge
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=""
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
new file mode 100644
index 0000000..68f59a7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
new file mode 100644
index 0000000..c06ffe1
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
new file mode 100644
index 0000000..da75a0d
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
new file mode 100644
index 0000000..68f59a7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..c1685ab
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited --filter "${@:9}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
new file mode 100644
index 0000000..ebd1372
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/detail/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor detailed traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --detail --unlimited
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
new file mode 100644
index 0000000..f9a5aa7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
new file mode 100644
index 0000000..4d22914
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --filter "${@:7}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
index db42c6d..f416289 100644
--- a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Monitor captured traffic on specified bridge interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
+help: Montior captured traffic on specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
new file mode 100644
index 0000000..bd747b5
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/save/node.def
@@ -0,0 +1,2 @@
+help: Save monitored traffic to a file
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --save "${@:7}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
new file mode 100644
index 0000000..f9a5aa7
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.def
@@ -0,0 +1 @@
+help: Monitor filtered traffic for the specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
new file mode 100644
index 0000000..549b26f
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/filter/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Monitor filtered traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited --filter "${@:8}"
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def
new file mode 100644
index 0000000..2fd4776
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/unlimited/node.def
@@ -0,0 +1,2 @@
+help: Monitor traffic for the specified bridge interface
+run: ${vyatta_bindir}/vyatta-tshark.pl --intf $4 --unlimited
-- 
cgit v1.2.3