8 files changed, 1 insertions, 30 deletions
diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def
index 2c6587a..da81433 100644
--- a/templates/show/monitoring/node.def
+++ b/templates/show/monitoring/node.def
@@ -1,12 +1,2 @@
 help: Show currently monitored services
-run: echo "------------------------------"
-     echo "Background monitoring sessions"
-     echo "------------------------------"
-     ${vyatta_bindir}/vyatta-monitor-list
-     echo
-     echo "------------------------------"
-     echo "  Protocol monitoring status"
-     echo "------------------------------"
-     for proto in bgp ospf rip ospfv3 ripng; do 
-       show monitoring protocols $proto
-     done
+run: vtysh -c "show debugging"
diff --git a/templates/show/monitoring/protocols/bgp/node.def b/templates/show/monitoring/protocols/bgp/node.def
deleted file mode 100644
index c49f095..0000000
--- a/templates/show/monitoring/protocols/bgp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show Border Gateway Protocol (BGP) debugging flags
-run: vtysh -c "show debugging bgp"
diff --git a/templates/show/monitoring/protocols/node.def b/templates/show/monitoring/protocols/node.def
deleted file mode 100644
index c57e348..0000000
--- a/templates/show/monitoring/protocols/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show route protocol debugging flags
-
diff --git a/templates/show/monitoring/protocols/ospf/node.def b/templates/show/monitoring/protocols/ospf/node.def
deleted file mode 100644
index 68b7738..0000000
--- a/templates/show/monitoring/protocols/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show Open Shortest Path First (OSPF) protocol debugging flags
-run: vtysh -c "show debugging ospf"
diff --git a/templates/show/monitoring/protocols/ospfv3/node.def b/templates/show/monitoring/protocols/ospfv3/node.def
deleted file mode 100644
index fcf9a12..0000000
--- a/templates/show/monitoring/protocols/ospfv3/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 Open Shortest Path First (OSPFv3) protocol debugging flags
-run: vtysh -c "show debugging ospf6"
diff --git a/templates/show/monitoring/protocols/rib/node.def b/templates/show/monitoring/protocols/rib/node.def
deleted file mode 100644
index cf5b3c7..0000000
--- a/templates/show/monitoring/protocols/rib/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show Routing Information Base (RIB) debugging flags
-run: vtysh -c "show debugging zebra"
diff --git a/templates/show/monitoring/protocols/rip/node.def b/templates/show/monitoring/protocols/rip/node.def
deleted file mode 100644
index 7474745..0000000
--- a/templates/show/monitoring/protocols/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show Routing Information Protocol (RIP) debugging flags
-run: vtysh -c "show debugging rip"
diff --git a/templates/show/monitoring/protocols/ripng/node.def b/templates/show/monitoring/protocols/ripng/node.def
deleted file mode 100644
index f19892b..0000000
--- a/templates/show/monitoring/protocols/ripng/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show RIPNG protocol debugging flags
-run: if [ ! -e "/usr/sbin/zebra" ]
-     then
-         vtysh -c "show debugging ipv6 rip"
-     else
-         vtysh -c "show debugging ripng"
-     fi