Move nodes from services since in other operational commands we don't

make this distinction
(cherry picked from commit cfdcb8f015619b90212a991bfd8a6d80d9695b2b)

36 files changed, 2 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 8999c97..c0b7428 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ bin_SCRIPTS	+= scripts/vyatta-op-cmd-wrapper
 bin_SCRIPTS += scripts/vyatta-ping
 bin_SCRIPTS += scripts/vyatta-traceroute
 bin_SCRIPTS += scripts/vyatta-monitor
+bin_SCRIPTS += scripts/vyatta-monitor-cleanup
 bin_SCRIPTS += scripts/vyatta-monitor-background
 bin_SCRIPTS += scripts/vyatta-monitor-background-stop
 
diff --git a/templates/monitor/service/conntrack-sync/background/node.def b/templates/monitor/conntrack-sync/background/node.def
index a413705..a413705 100644
--- a/templates/monitor/service/conntrack-sync/background/node.def
+++ b/templates/monitor/conntrack-sync/background/node.def
diff --git a/templates/monitor/service/conntrack-sync/background/start/node.def b/templates/monitor/conntrack-sync/background/start/node.def
index 0b39330..0b39330 100644
--- a/templates/monitor/service/conntrack-sync/background/start/node.def
+++ b/templates/monitor/conntrack-sync/background/start/node.def
diff --git a/templates/monitor/service/conntrack-sync/background/stop/node.def b/templates/monitor/conntrack-sync/background/stop/node.def
index 4d5ef14..4d5ef14 100644
--- a/templates/monitor/service/conntrack-sync/background/stop/node.def
+++ b/templates/monitor/conntrack-sync/background/stop/node.def
diff --git a/templates/monitor/service/conntrack-sync/node.def b/templates/monitor/conntrack-sync/node.def
index 5429504..5429504 100644
--- a/templates/monitor/service/conntrack-sync/node.def
+++ b/templates/monitor/conntrack-sync/node.def
diff --git a/templates/monitor/service/dhcp/background/node.def b/templates/monitor/dhcp/background/node.def
index 0428873..0428873 100644
--- a/templates/monitor/service/dhcp/background/node.def
+++ b/templates/monitor/dhcp/background/node.def
diff --git a/templates/monitor/service/dhcp/background/start/node.def b/templates/monitor/dhcp/background/start/node.def
index bf03182..bf03182 100644
--- a/templates/monitor/service/dhcp/background/start/node.def
+++ b/templates/monitor/dhcp/background/start/node.def
diff --git a/templates/monitor/service/dhcp/background/stop/node.def b/templates/monitor/dhcp/background/stop/node.def
index e712003..e712003 100644
--- a/templates/monitor/service/dhcp/background/stop/node.def
+++ b/templates/monitor/dhcp/background/stop/node.def
diff --git a/templates/monitor/service/dhcp/node.def b/templates/monitor/dhcp/node.def
index 28bf115..28bf115 100644
--- a/templates/monitor/service/dhcp/node.def
+++ b/templates/monitor/dhcp/node.def
diff --git a/templates/monitor/service/dns/dynamic/background/node.def b/templates/monitor/dns/dynamic/background/node.def
index a94f088..a94f088 100644
--- a/templates/monitor/service/dns/dynamic/background/node.def
+++ b/templates/monitor/dns/dynamic/background/node.def
diff --git a/templates/monitor/service/dns/dynamic/background/start/node.def b/templates/monitor/dns/dynamic/background/start/node.def
index 6dca4c3..6dca4c3 100644
--- a/templates/monitor/service/dns/dynamic/background/start/node.def
+++ b/templates/monitor/dns/dynamic/background/start/node.def
diff --git a/templates/monitor/service/dns/dynamic/background/stop/node.def b/templates/monitor/dns/dynamic/background/stop/node.def
index e6f0392..e6f0392 100644
--- a/templates/monitor/service/dns/dynamic/background/stop/node.def
+++ b/templates/monitor/dns/dynamic/background/stop/node.def
diff --git a/templates/monitor/service/dns/dynamic/node.def b/templates/monitor/dns/dynamic/node.def
index c17bae2..c17bae2 100644
--- a/templates/monitor/service/dns/dynamic/node.def
+++ b/templates/monitor/dns/dynamic/node.def
diff --git a/templates/monitor/service/dns/forwarding/background/node.def b/templates/monitor/dns/forwarding/background/node.def
index 553f770..553f770 100644
--- a/templates/monitor/service/dns/forwarding/background/node.def
+++ b/templates/monitor/dns/forwarding/background/node.def
diff --git a/templates/monitor/service/dns/forwarding/background/start/node.def b/templates/monitor/dns/forwarding/background/start/node.def
index da7e1b0..da7e1b0 100644
--- a/templates/monitor/service/dns/forwarding/background/start/node.def
+++ b/templates/monitor/dns/forwarding/background/start/node.def
diff --git a/templates/monitor/service/dns/forwarding/background/stop/node.def b/templates/monitor/dns/forwarding/background/stop/node.def
index f4adba9..f4adba9 100644
--- a/templates/monitor/service/dns/forwarding/background/stop/node.def
+++ b/templates/monitor/dns/forwarding/background/stop/node.def
diff --git a/templates/monitor/service/dns/forwarding/node.def b/templates/monitor/dns/forwarding/node.def
index 1deec08..1deec08 100644
--- a/templates/monitor/service/dns/forwarding/node.def
+++ b/templates/monitor/dns/forwarding/node.def
diff --git a/templates/monitor/service/dns/node.def b/templates/monitor/dns/node.def
index 0584393..0584393 100644
--- a/templates/monitor/service/dns/node.def
+++ b/templates/monitor/dns/node.def
diff --git a/templates/monitor/service/https/background/node.def b/templates/monitor/https/background/node.def
index 1f4371b..1f4371b 100644
--- a/templates/monitor/service/https/background/node.def
+++ b/templates/monitor/https/background/node.def
diff --git a/templates/monitor/service/https/background/start/node.def b/templates/monitor/https/background/start/node.def
index ae87d88..ae87d88 100644
--- a/templates/monitor/service/https/background/start/node.def
+++ b/templates/monitor/https/background/start/node.def
diff --git a/templates/monitor/service/https/background/stop/node.def b/templates/monitor/https/background/stop/node.def
index ec3ab8c..ec3ab8c 100644
--- a/templates/monitor/service/https/background/stop/node.def
+++ b/templates/monitor/https/background/stop/node.def
diff --git a/templates/monitor/service/https/node.def b/templates/monitor/https/node.def
index e619b43..e619b43 100644
--- a/templates/monitor/service/https/node.def
+++ b/templates/monitor/https/node.def
diff --git a/templates/monitor/interface/node.def b/templates/monitor/interface/node.def
new file mode 100644
index 0000000..9adbd67
--- /dev/null
+++ b/templates/monitor/interface/node.def
@@ -0,0 +1 @@
+help: Monitor interfaces
diff --git a/templates/monitor/service/lldp/background/node.def b/templates/monitor/lldp/background/node.def
index d7a8b9b..d7a8b9b 100644
--- a/templates/monitor/service/lldp/background/node.def
+++ b/templates/monitor/lldp/background/node.def
diff --git a/templates/monitor/service/lldp/background/start/node.def b/templates/monitor/lldp/background/start/node.def
index ac9eadd..ac9eadd 100644
--- a/templates/monitor/service/lldp/background/start/node.def
+++ b/templates/monitor/lldp/background/start/node.def
diff --git a/templates/monitor/service/lldp/background/stop/node.def b/templates/monitor/lldp/background/stop/node.def
index 82468fd..82468fd 100644
--- a/templates/monitor/service/lldp/background/stop/node.def
+++ b/templates/monitor/lldp/background/stop/node.def
diff --git a/templates/monitor/service/lldp/node.def b/templates/monitor/lldp/node.def
index 655b04c..655b04c 100644
--- a/templates/monitor/service/lldp/node.def
+++ b/templates/monitor/lldp/node.def
diff --git a/templates/monitor/service/node.def b/templates/monitor/service/node.def
deleted file mode 100644
index d9e3bcb..0000000
--- a/templates/monitor/service/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a service
diff --git a/templates/monitor/service/snmp/background/node.def b/templates/monitor/snmp/background/node.def
index 3e4dedd..3e4dedd 100644
--- a/templates/monitor/service/snmp/background/node.def
+++ b/templates/monitor/snmp/background/node.def
diff --git a/templates/monitor/service/snmp/background/start/node.def b/templates/monitor/snmp/background/start/node.def
index 9534dc7..9534dc7 100644
--- a/templates/monitor/service/snmp/background/start/node.def
+++ b/templates/monitor/snmp/background/start/node.def
diff --git a/templates/monitor/service/snmp/background/stop/node.def b/templates/monitor/snmp/background/stop/node.def
index c0b97ed..c0b97ed 100644
--- a/templates/monitor/service/snmp/background/stop/node.def
+++ b/templates/monitor/snmp/background/stop/node.def
diff --git a/templates/monitor/service/snmp/node.def b/templates/monitor/snmp/node.def
index d847eb8..d847eb8 100644
--- a/templates/monitor/service/snmp/node.def
+++ b/templates/monitor/snmp/node.def
diff --git a/templates/monitor/service/webproxy/background/node.def b/templates/monitor/webproxy/background/node.def
index 8f82ad5..8f82ad5 100644
--- a/templates/monitor/service/webproxy/background/node.def
+++ b/templates/monitor/webproxy/background/node.def
diff --git a/templates/monitor/service/webproxy/background/start/node.def b/templates/monitor/webproxy/background/start/node.def
index a7f381b..a7f381b 100644
--- a/templates/monitor/service/webproxy/background/start/node.def
+++ b/templates/monitor/webproxy/background/start/node.def
diff --git a/templates/monitor/service/webproxy/background/stop/node.def b/templates/monitor/webproxy/background/stop/node.def
index 6e26ba9..6e26ba9 100644
--- a/templates/monitor/service/webproxy/background/stop/node.def
+++ b/templates/monitor/webproxy/background/stop/node.def
diff --git a/templates/monitor/service/webproxy/node.def b/templates/monitor/webproxy/node.def
index 8966c38..8966c38 100644
--- a/templates/monitor/service/webproxy/node.def
+++ b/templates/monitor/webproxy/node.def