T5411: remove old background monitor implementation

Old Vyatta had a possibility to issue log entries to the users console based
on a service.

Examples:

* monitor dhcp background start | stop
* monitor lldp background start | stop
* monitor openvpn background start | stop

Somehow they not seem to work properly anymore (we are not certain if they
ever did work properly)

The maintainers decided to drop the op-mode CLI nodes from vyatta-op package in
order to get rid of all the legacy code.

In a subsequent task we might wan't to re-add this capability under the more
"industry standard" command terminal monitor.

89 files changed, 0 insertions, 165 deletions

diff --git a/templates/monitor/cluster/background/node.def b/templates/monitor/cluster/background/node.def
deleted file mode 100644
index b57e636..0000000
--- a/templates/monitor/cluster/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor cluster service in the background
diff --git a/templates/monitor/cluster/background/start/node.def b/templates/monitor/cluster/background/start/node.def
deleted file mode 100644
index 3d6f577..0000000
--- a/templates/monitor/cluster/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for cluster service
-run: ${vyatta_bindir}/vyatta-monitor-background Cluster heartbeat cl_status mach_down ha_log
diff --git a/templates/monitor/cluster/background/stop/node.def b/templates/monitor/cluster/background/stop/node.def
deleted file mode 100644
index 07b16f4..0000000
--- a/templates/monitor/cluster/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for cluster service
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Cluster
diff --git a/templates/monitor/cluster/node.def b/templates/monitor/cluster/node.def
deleted file mode 100644
index c4703bc..0000000
--- a/templates/monitor/cluster/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor clustering service
-run: ${vyatta_bindir}/vyatta-monitor Cluster heartbeat cl_status mach_down ha_log
diff --git a/templates/monitor/conntrack-sync/background/node.def b/templates/monitor/conntrack-sync/background/node.def
deleted file mode 100644
index a413705..0000000
--- a/templates/monitor/conntrack-sync/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor conntrack-sync in the background
diff --git a/templates/monitor/conntrack-sync/background/start/node.def b/templates/monitor/conntrack-sync/background/start/node.def
deleted file mode 100644
index 0b39330..0000000
--- a/templates/monitor/conntrack-sync/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of conntrack-sync
-run: ${vyatta_bindir}/vyatta-monitor-background Conntrack-Sync conntrackd
diff --git a/templates/monitor/conntrack-sync/background/stop/node.def b/templates/monitor/conntrack-sync/background/stop/node.def
deleted file mode 100644
index 4d5ef14..0000000
--- a/templates/monitor/conntrack-sync/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of conntrack-sync
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Conntrack-Sync
diff --git a/templates/monitor/conntrack-sync/node.def b/templates/monitor/conntrack-sync/node.def
deleted file mode 100644
index 5429504..0000000
--- a/templates/monitor/conntrack-sync/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor conntrack-sync
-run: ${vyatta_bindir}/vyatta-monitor Conntrack-Sync conntrackd
diff --git a/templates/monitor/content-inspection/background/node.def b/templates/monitor/content-inspection/background/node.def
deleted file mode 100644
index 7632343..0000000
--- a/templates/monitor/content-inspection/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor Content-Inspection in the background
diff --git a/templates/monitor/content-inspection/background/start/node.def b/templates/monitor/content-inspection/background/start/node.def
deleted file mode 100644
index 7f7c1e1..0000000
--- a/templates/monitor/content-inspection/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of Content-Inspection
-run: ${vyatta_bindir}/vyatta-monitor-background Content-Inspection snort
diff --git a/templates/monitor/content-inspection/background/stop/node.def b/templates/monitor/content-inspection/background/stop/node.def
deleted file mode 100644
index d77a1fb..0000000
--- a/templates/monitor/content-inspection/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of Content-Inspection
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Content-Inspection
diff --git a/templates/monitor/content-inspection/node.def b/templates/monitor/content-inspection/node.def
deleted file mode 100644
index 35c8e97..0000000
--- a/templates/monitor/content-inspection/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Content-Inspection
-run: ${vyatta_bindir}/vyatta-monitor Content-Inspection snort
diff --git a/templates/monitor/dhcp/background/node.def b/templates/monitor/dhcp/background/node.def
deleted file mode 100644
index 0428873..0000000
--- a/templates/monitor/dhcp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor DHCP in the background
diff --git a/templates/monitor/dhcp/background/start/node.def b/templates/monitor/dhcp/background/start/node.def
deleted file mode 100644
index bf03182..0000000
--- a/templates/monitor/dhcp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of DHCP
-run: ${vyatta_bindir}/vyatta-monitor-background DHCP dhcpd
diff --git a/templates/monitor/dhcp/background/stop/node.def b/templates/monitor/dhcp/background/stop/node.def
deleted file mode 100644
index e712003..0000000
--- a/templates/monitor/dhcp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of DHCP
-run: ${vyatta_bindir}/vyatta-monitor-background-stop DHCP
diff --git a/templates/monitor/dhcp/node.def b/templates/monitor/dhcp/node.def
deleted file mode 100644
index 28bf115..0000000
--- a/templates/monitor/dhcp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Dynamic Host Control Protocol (DHCP)
-run: ${vyatta_bindir}/vyatta-monitor DHCP dhcpd
diff --git a/templates/monitor/dns/dynamic/background/node.def b/templates/monitor/dns/dynamic/background/node.def
deleted file mode 100644
index a94f088..0000000
--- a/templates/monitor/dns/dynamic/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor Dynamic DNS in the background
diff --git a/templates/monitor/dns/dynamic/background/start/node.def b/templates/monitor/dns/dynamic/background/start/node.def
deleted file mode 100644
index 6dca4c3..0000000
--- a/templates/monitor/dns/dynamic/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of Dynamic DNS
-run: ${vyatta_bindir}/vyatta-monitor-background Dynamic-DNS ddclient
diff --git a/templates/monitor/dns/dynamic/background/stop/node.def b/templates/monitor/dns/dynamic/background/stop/node.def
deleted file mode 100644
index e6f0392..0000000
--- a/templates/monitor/dns/dynamic/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of Dynamic DNS
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Dynamic-DNS
diff --git a/templates/monitor/dns/dynamic/node.def b/templates/monitor/dns/dynamic/node.def
deleted file mode 100644
index c17bae2..0000000
--- a/templates/monitor/dns/dynamic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Dynamic DNS
-run: ${vyatta_bindir}/vyatta-monitor Dynamic-DNS ddclient
diff --git a/templates/monitor/dns/forwarding/background/node.def b/templates/monitor/dns/forwarding/background/node.def
deleted file mode 100644
index 553f770..0000000
--- a/templates/monitor/dns/forwarding/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor DNS Forwarding in the background
diff --git a/templates/monitor/dns/forwarding/background/start/node.def b/templates/monitor/dns/forwarding/background/start/node.def
deleted file mode 100644
index da7e1b0..0000000
--- a/templates/monitor/dns/forwarding/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background forwarding of DNS Forwarding
-run: ${vyatta_bindir}/vyatta-monitor-background DNS-Forward dnsmasq
diff --git a/templates/monitor/dns/forwarding/background/stop/node.def b/templates/monitor/dns/forwarding/background/stop/node.def
deleted file mode 100644
index f4adba9..0000000
--- a/templates/monitor/dns/forwarding/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background forwarding of DNS Forwarding
-run: ${vyatta_bindir}/vyatta-monitor-background-stop DNS-Forward
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/background/node.def b/templates/monitor/firewall/ipv6-name/node.tag/background/node.def
deleted file mode 100644
index 31c4a84..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor the specified firewall in the background
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/background/start/node.def b/templates/monitor/firewall/ipv6-name/node.tag/background/start/node.def
deleted file mode 100644
index 0008aee..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of a specified firewall
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor-background Firewall-ipv6-$4 "\[$4-[0-9]*-[A,D,R]\]"
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/background/stop/node.def b/templates/monitor/firewall/ipv6-name/node.tag/background/stop/node.def
deleted file mode 100644
index b104d5f..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of a specified firewall
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Firewall-ipv6-$4
diff --git a/templates/monitor/firewall/name/node.tag/background/node.def b/templates/monitor/firewall/name/node.tag/background/node.def
deleted file mode 100644
index 31c4a84..0000000
--- a/templates/monitor/firewall/name/node.tag/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor the specified firewall in the background
diff --git a/templates/monitor/firewall/name/node.tag/background/start/node.def b/templates/monitor/firewall/name/node.tag/background/start/node.def
deleted file mode 100644
index 35beb23..0000000
--- a/templates/monitor/firewall/name/node.tag/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of a specified firewall
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor-background Firewall-$4 "\[$4-[0-9]*-[A,D,R]\]"
diff --git a/templates/monitor/firewall/name/node.tag/background/stop/node.def b/templates/monitor/firewall/name/node.tag/background/stop/node.def
deleted file mode 100644
index f3a7052..0000000
--- a/templates/monitor/firewall/name/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of a specified firewall
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Firewall-$4
diff --git a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/node.def b/templates/monitor/firewall/name/node.tag/rule/node.tag/background/node.def
deleted file mode 100644
index 2a9a698..0000000
--- a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a rule in a specified firewall in the background
diff --git a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/start/node.def b/templates/monitor/firewall/name/node.tag/rule/node.tag/background/start/node.def
deleted file mode 100644
index 3210a14..0000000
--- a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of the specified firewall
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "firewall name $4" $6; \
-     ${vyatta_bindir}/vyatta-monitor-background Firewall-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/stop/node.def b/templates/monitor/firewall/name/node.tag/rule/node.tag/background/stop/node.def
deleted file mode 100644
index 0cd5455..0000000
--- a/templates/monitor/firewall/name/node.tag/rule/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of a rule in the specified firewall
-run: ${vyatta_bindir}/vyatta-monitor-background-stop Firewall-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/https/background/node.def b/templates/monitor/https/background/node.def
deleted file mode 100644
index 1f4371b..0000000
--- a/templates/monitor/https/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor HTTPS in the background
diff --git a/templates/monitor/https/background/start/node.def b/templates/monitor/https/background/start/node.def
deleted file mode 100644
index ae87d88..0000000
--- a/templates/monitor/https/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of the HTTPS service
-run: ${vyatta_bindir}/vyatta-monitor-background HTTPS lighttpd chunker webgui
diff --git a/templates/monitor/https/background/stop/node.def b/templates/monitor/https/background/stop/node.def
deleted file mode 100644
index ec3ab8c..0000000
--- a/templates/monitor/https/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of the HTTPS service
-run: ${vyatta_bindir}/vyatta-monitor-background-stop HTTPS
diff --git a/templates/monitor/https/node.def b/templates/monitor/https/node.def
deleted file mode 100644
index e619b43..0000000
--- a/templates/monitor/https/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor the Secure Hypertext Transfer Protocol (HTTPS) service
-run: ${vyatta_bindir}/vyatta-monitor HTTPS lighttpd chunker webgui
diff --git a/templates/monitor/lldp/background/node.def b/templates/monitor/lldp/background/node.def
deleted file mode 100644
index d7a8b9b..0000000
--- a/templates/monitor/lldp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor LLDP in the background
diff --git a/templates/monitor/lldp/background/start/node.def b/templates/monitor/lldp/background/start/node.def
deleted file mode 100644
index ac9eadd..0000000
--- a/templates/monitor/lldp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of the LLDP daemon
-run: ${vyatta_bindir}/vyatta-monitor-background LLDP lldpd
diff --git a/templates/monitor/lldp/background/stop/node.def b/templates/monitor/lldp/background/stop/node.def
deleted file mode 100644
index 82468fd..0000000
--- a/templates/monitor/lldp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of the LLDP daemon
-run: ${vyatta_bindir}/vyatta-monitor-background-stop LLDP
diff --git a/templates/monitor/lldp/node.def b/templates/monitor/lldp/node.def
deleted file mode 100644
index 655b04c..0000000
--- a/templates/monitor/lldp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Link Layer Discovery Protocol (LLDP) daemon
-run: ${vyatta_bindir}/vyatta-monitor LLDP lldpd
diff --git a/templates/monitor/nat/destination/background/node.def b/templates/monitor/nat/destination/background/node.def
deleted file mode 100644
index 9c60d84..0000000
--- a/templates/monitor/nat/destination/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor destination NAT in the background
diff --git a/templates/monitor/nat/destination/background/start/node.def b/templates/monitor/nat/destination/background/start/node.def
deleted file mode 100644
index 8f1f0eb..0000000
--- a/templates/monitor/nat/destination/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background destination NAT monitoring
-run:  echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-      ${vyatta_bindir}/vyatta-monitor-background NAT-DEST "\[NAT-DST-[0-9]*.*\]"
diff --git a/templates/monitor/nat/destination/background/stop/node.def b/templates/monitor/nat/destination/background/stop/node.def
deleted file mode 100644
index a3e13ff..0000000
--- a/templates/monitor/nat/destination/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background destination NAT monitoring
-run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-DEST
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/node.def b/templates/monitor/nat/destination/rule/node.tag/background/node.def
deleted file mode 100644
index c862d82..0000000
--- a/templates/monitor/nat/destination/rule/node.tag/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a specified destination NAT rule in the background
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/start/node.def b/templates/monitor/nat/destination/rule/node.tag/background/start/node.def
deleted file mode 100644
index ad06778..0000000
--- a/templates/monitor/nat/destination/rule/node.tag/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of a specified destination NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat destination" $5; \
-     ${vyatta_bindir}/vyatta-monitor-background NAT-DEST-RULE-$5 "\[NAT-DST-$5.*\]"
diff --git a/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def b/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
deleted file mode 100644
index bdd727a..0000000
--- a/templates/monitor/nat/destination/rule/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of a specified destination NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-DEST-RULE-$5
diff --git a/templates/monitor/nat/source/background/node.def b/templates/monitor/nat/source/background/node.def
deleted file mode 100644
index a28968f..0000000
--- a/templates/monitor/nat/source/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor source NAT in the background
diff --git a/templates/monitor/nat/source/background/start/node.def b/templates/monitor/nat/source/background/start/node.def
deleted file mode 100644
index d7999bb..0000000
--- a/templates/monitor/nat/source/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of source NAT
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE "\[NAT-SRC-[0-9]*.*\]"
diff --git a/templates/monitor/nat/source/background/stop/node.def b/templates/monitor/nat/source/background/stop/node.def
deleted file mode 100644
index fc02c10..0000000
--- a/templates/monitor/nat/source/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of source NAT
-run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-SOURCE
diff --git a/templates/monitor/nat/source/rule/node.tag/background/node.def b/templates/monitor/nat/source/rule/node.tag/background/node.def
deleted file mode 100644
index f1139e2..0000000
--- a/templates/monitor/nat/source/rule/node.tag/background/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor a specified source NAT rule in the background
-
diff --git a/templates/monitor/nat/source/rule/node.tag/background/start/node.def b/templates/monitor/nat/source/rule/node.tag/background/start/node.def
deleted file mode 100644
index ca751c6..0000000
--- a/templates/monitor/nat/source/rule/node.tag/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background monitoring of a specified source NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat source" $5; \
-     ${vyatta_bindir}/vyatta-monitor-background NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5.*\]"
diff --git a/templates/monitor/nat/source/rule/node.tag/background/stop/node.def b/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
deleted file mode 100644
index 241f47b..0000000
--- a/templates/monitor/nat/source/rule/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of a specified source NAT rule
-run: ${vyatta_bindir}/vyatta-monitor-background-stop NAT-SOURCE-RULE-$5
diff --git a/templates/monitor/node.def b/templates/monitor/node.def
deleted file mode 100644
index 6bcdb34..0000000
--- a/templates/monitor/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor system information
diff --git a/templates/monitor/openvpn/background/node.def b/templates/monitor/openvpn/background/node.def
deleted file mode 100644
index eda5b6a..0000000
--- a/templates/monitor/openvpn/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor OpenVPN in the background
diff --git a/templates/monitor/openvpn/background/start/node.def b/templates/monitor/openvpn/background/start/node.def
deleted file mode 100644
index 2ecc003..0000000
--- a/templates/monitor/openvpn/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of OpenVPN
-run: ${vyatta_bindir}/vyatta-monitor-background OpenVPN openvpn
diff --git a/templates/monitor/openvpn/background/stop/node.def b/templates/monitor/openvpn/background/stop/node.def
deleted file mode 100644
index 17e8950..0000000
--- a/templates/monitor/openvpn/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of OpenVPN
-run: ${vyatta_bindir}/vyatta-monitor-background-stop OpenVPN
diff --git a/templates/monitor/openvpn/interface/node.def b/templates/monitor/openvpn/interface/node.def
deleted file mode 100644
index 36d2c2e..0000000
--- a/templates/monitor/openvpn/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor specified OpenVPN interface process
diff --git a/templates/monitor/openvpn/interface/node.tag/background/node.def b/templates/monitor/openvpn/interface/node.tag/background/node.def
deleted file mode 100644
index eda5b6a..0000000
--- a/templates/monitor/openvpn/interface/node.tag/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor OpenVPN in the background
diff --git a/templates/monitor/openvpn/interface/node.tag/background/start/node.def b/templates/monitor/openvpn/interface/node.tag/background/start/node.def
deleted file mode 100644
index 5b7b31e..0000000
--- a/templates/monitor/openvpn/interface/node.tag/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring of OpenVPN
-run: ${vyatta_bindir}/vyatta-monitor-background OpenVPN-$4 openvpn-$4
diff --git a/templates/monitor/openvpn/interface/node.tag/background/stop/node.def b/templates/monitor/openvpn/interface/node.tag/background/stop/node.def
deleted file mode 100644
index af785b3..0000000
--- a/templates/monitor/openvpn/interface/node.tag/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring of OpenVPN
-run: ${vyatta_bindir}/vyatta-monitor-background-stop OpenVPN-$4
diff --git a/templates/monitor/openvpn/interface/node.tag/node.def b/templates/monitor/openvpn/interface/node.tag/node.def
deleted file mode 100644
index 661be54..0000000
--- a/templates/monitor/openvpn/interface/node.tag/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Montior specified OpenVPN interface process
-allowed: local -a array ;
-         array=( /sys/class/net/vtun* ) ;
-         echo  -n "<vtunX>" ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-monitor OpenVPN-$4 openvpn-$4
diff --git a/templates/monitor/openvpn/node.def b/templates/monitor/openvpn/node.def
deleted file mode 100644
index 9b03241..0000000
--- a/templates/monitor/openvpn/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor OpenVPN
-run: ${vyatta_bindir}/vyatta-monitor OpenVPN openvpn
diff --git a/templates/monitor/snmp/background/node.def b/templates/monitor/snmp/background/node.def
deleted file mode 100644
index 3e4dedd..0000000
--- a/templates/monitor/snmp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor SNMP in the background
diff --git a/templates/monitor/snmp/background/start/node.def b/templates/monitor/snmp/background/start/node.def
deleted file mode 100644
index 9534dc7..0000000
--- a/templates/monitor/snmp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for SNMP
-run: ${vyatta_bindir}/vyatta-monitor-background SNMP snmpd
diff --git a/templates/monitor/snmp/background/stop/node.def b/templates/monitor/snmp/background/stop/node.def
deleted file mode 100644
index c0b97ed..0000000
--- a/templates/monitor/snmp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for SNMP
-run: ${vyatta_bindir}/vyatta-monitor-background-stop SNMP 
diff --git a/templates/monitor/snmp/node.def b/templates/monitor/snmp/node.def
deleted file mode 100644
index d847eb8..0000000
--- a/templates/monitor/snmp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Simple Network Management Protocol (SNMP) daemon
-run: ${vyatta_bindir}/vyatta-monitor SNMP snmpd
diff --git a/templates/monitor/stop-all/node.def b/templates/monitor/stop-all/node.def
deleted file mode 100644
index 6f1b12e..0000000
--- a/templates/monitor/stop-all/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop all current background monitoring processes
-run: ${vyatta_bindir}/vyatta-monitor-cleanup LOGOUT
diff --git a/templates/monitor/vpn/all/background/node.def b/templates/monitor/vpn/all/background/node.def
deleted file mode 100644
index b4eece2..0000000
--- a/templates/monitor/vpn/all/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor VPN in the background
diff --git a/templates/monitor/vpn/all/background/start/node.def b/templates/monitor/vpn/all/background/start/node.def
deleted file mode 100644
index ac100e8..0000000
--- a/templates/monitor/vpn/all/background/start/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background VPN monitoring
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-ALL" pluto pptp l2tp ppp
-
diff --git a/templates/monitor/vpn/all/background/stop/node.def b/templates/monitor/vpn/all/background/stop/node.def
deleted file mode 100644
index 8d735cd..0000000
--- a/templates/monitor/vpn/all/background/stop/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Start background VPN monitoring
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-ALL"
-
diff --git a/templates/monitor/vpn/all/node.def b/templates/monitor/vpn/all/node.def
deleted file mode 100644
index ab5d53f..0000000
--- a/templates/monitor/vpn/all/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor VPN 
-run: ${vyatta_bindir}/vyatta-monitor 'VPN-ALL' pluto ipsec charon pptp l2tp ppp
-
diff --git a/templates/monitor/vpn/ipsec/background/node.def b/templates/monitor/vpn/ipsec/background/node.def
deleted file mode 100644
index f32e862..0000000
--- a/templates/monitor/vpn/ipsec/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor IPSec in the background
diff --git a/templates/monitor/vpn/ipsec/background/start/node.def b/templates/monitor/vpn/ipsec/background/start/node.def
deleted file mode 100644
index 7ba2631..0000000
--- a/templates/monitor/vpn/ipsec/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for IPSec VPN
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/ipsec/background/stop/node.def b/templates/monitor/vpn/ipsec/background/stop/node.def
deleted file mode 100644
index d6ea71c..0000000
--- a/templates/monitor/vpn/ipsec/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for IPSec VPN
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-IPSEC" pluto
diff --git a/templates/monitor/vpn/ipsec/node.def b/templates/monitor/vpn/ipsec/node.def
deleted file mode 100644
index c56c44c..0000000
--- a/templates/monitor/vpn/ipsec/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor IPSec VPN 
-run: ${vyatta_bindir}/vyatta-monitor "VPN-IPSEC" ipsec charon
diff --git a/templates/monitor/vpn/l2tp/background/node.def b/templates/monitor/vpn/l2tp/background/node.def
deleted file mode 100644
index d9b7697..0000000
--- a/templates/monitor/vpn/l2tp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor L2TP in the background
diff --git a/templates/monitor/vpn/l2tp/background/start/node.def b/templates/monitor/vpn/l2tp/background/start/node.def
deleted file mode 100644
index a43440e..0000000
--- a/templates/monitor/vpn/l2tp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for L2TP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/l2tp/background/stop/node.def b/templates/monitor/vpn/l2tp/background/stop/node.def
deleted file mode 100644
index 2173baf..0000000
--- a/templates/monitor/vpn/l2tp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for L2TP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-L2TP:" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/l2tp/node.def b/templates/monitor/vpn/l2tp/node.def
deleted file mode 100644
index 2ede83c..0000000
--- a/templates/monitor/vpn/l2tp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor L2TP VPN 
-run: ${vyatta_bindir}/vyatta-monitor "VPN-L2TP" l2tp ppp remote-access-aaa-win remote-access-zzz-mac
diff --git a/templates/monitor/vpn/node.def b/templates/monitor/vpn/node.def
deleted file mode 100644
index 671edea..0000000
--- a/templates/monitor/vpn/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor VPN
diff --git a/templates/monitor/vpn/pptp/background/node.def b/templates/monitor/vpn/pptp/background/node.def
deleted file mode 100644
index 1eafbed..0000000
--- a/templates/monitor/vpn/pptp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor PPTP in the background
diff --git a/templates/monitor/vpn/pptp/background/start/node.def b/templates/monitor/vpn/pptp/background/start/node.def
deleted file mode 100644
index 7659282..0000000
--- a/templates/monitor/vpn/pptp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for PPTP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vpn/pptp/background/stop/node.def b/templates/monitor/vpn/pptp/background/stop/node.def
deleted file mode 100644
index d1879e4..0000000
--- a/templates/monitor/vpn/pptp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for PPTP VPN 
-run: ${vyatta_bindir}/vyatta-monitor-background-stop "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vpn/pptp/node.def b/templates/monitor/vpn/pptp/node.def
deleted file mode 100644
index c8eb043..0000000
--- a/templates/monitor/vpn/pptp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor PPTP VPN 
-run: ${vyatta_bindir}/vyatta-monitor "VPN-PPTP" pptp ppp 
diff --git a/templates/monitor/vrrp/background/node.def b/templates/monitor/vrrp/background/node.def
deleted file mode 100644
index 2ec6eff..0000000
--- a/templates/monitor/vrrp/background/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor VRRP in the background
diff --git a/templates/monitor/vrrp/background/start/node.def b/templates/monitor/vrrp/background/start/node.def
deleted file mode 100644
index de6cfe5..0000000
--- a/templates/monitor/vrrp/background/start/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Start background monitoring for VRRP
-run: ${vyatta_bindir}/vyatta-monitor-background VRRP Keepalived_vrrp
diff --git a/templates/monitor/vrrp/background/stop/node.def b/templates/monitor/vrrp/background/stop/node.def
deleted file mode 100644
index 714a05e..0000000
--- a/templates/monitor/vrrp/background/stop/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Stop background monitoring for VRRP
-run: ${vyatta_bindir}/vyatta-monitor-background-stop VRRP
diff --git a/templates/monitor/vrrp/node.def b/templates/monitor/vrrp/node.def
deleted file mode 100644
index a8e0900..0000000
--- a/templates/monitor/vrrp/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Monitor Virtual Router Redundancy Protocol (VRRP)
-run: ${vyatta_bindir}/vyatta-monitor VRRP Keepalived_vrrp
diff --git a/templates/show/system/node.def b/templates/show/system/node.def
deleted file mode 100644
index 4e7ed7a..0000000
--- a/templates/show/system/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show system information