T5411: remove all remaining monitor background code

27 files changed, 2 insertions, 86 deletions

diff --git a/Makefile.am b/Makefile.am
index f8daadf..caaffc7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,17 +20,12 @@ interp_DATA += functions/interpreter/vyatta-image-complete
 bin_SCRIPTS	 = scripts/vyatta-show-interfaces
 bin_SCRIPTS	+= scripts/vyatta-show-interfaces.pl
 bin_SCRIPTS	+= scripts/vyatta-show-dmi
-bin_SCRIPTS     += scripts/show-dhcp-leases.pl
-bin_SCRIPTS     += scripts/vyatta-boot-image.pl
+bin_SCRIPTS += scripts/show-dhcp-leases.pl
+bin_SCRIPTS += scripts/vyatta-boot-image.pl
 bin_SCRIPTS	+= scripts/rename-image.pl
 bin_SCRIPTS	+= scripts/show-image-storage.pl
 bin_SCRIPTS	+= scripts/tech-support-archive
 bin_SCRIPTS	+= scripts/vyatta-op-cmd-wrapper
-bin_SCRIPTS += scripts/vyatta-monitor
-bin_SCRIPTS += scripts/vyatta-monitor-cleanup
-bin_SCRIPTS += scripts/vyatta-monitor-background
-bin_SCRIPTS += scripts/vyatta-monitor-background-stop
-bin_SCRIPTS += scripts/vyatta-monitor-check-rule-log
 
 sbin_SCRIPTS     = scripts/vyatta-image-tools.pl
 sbin_SCRIPTS    += scripts/vyos-openvpn-remoteconfig.pl
@@ -51,5 +46,3 @@ install-exec-hook:
 	cd templates; $(cpiop) $(DESTDIR)$(opdir)
 	mkdir -p $(DESTDIR)$(etc_shell_leveldir)
 	cd etc/shell/level; $(cpiop) $(DESTDIR)$(etc_shell_leveldir)
-	mkdir -p $(DESTDIR)/etc/
-	cp etc/bash.bash_logout $(DESTDIR)/etc/
diff --git a/etc/bash.bash_logout b/etc/bash.bash_logout
deleted file mode 100644
index 2f31f3c..0000000
--- a/etc/bash.bash_logout
+++ /dev/null
@@ -1 +0,0 @@
-${vyatta_bindir}/vyatta-monitor-cleanup LOGOUT
diff --git a/templates/monitor/command/node.def b/templates/monitor/command/node.def
deleted file mode 100644
index 3e08ab7..0000000
--- a/templates/monitor/command/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor an operational mode command (refreshes every 2 seconds)
diff --git a/templates/monitor/command/node.tag/node.def b/templates/monitor/command/node.tag/node.def
deleted file mode 100644
index ed73d6b..0000000
--- a/templates/monitor/command/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor operational mode command
-allowed: echo '<operational-mode-command>'
-run: watch  /opt/vyatta/bin/vyatta-op-cmd-wrapper ${@:3}
diff --git a/templates/monitor/firewall/ipv6-name/node.def b/templates/monitor/firewall/ipv6-name/node.def
deleted file mode 100644
index dfe8524..0000000
--- a/templates/monitor/firewall/ipv6-name/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor the specifed ipv6 firewall
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/node.def b/templates/monitor/firewall/ipv6-name/node.tag/node.def
deleted file mode 100644
index 9c6bd57..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a specified firewall
-allowed: local -a ARR
-         eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall ipv6-name))"
-         echo ${ARR[@]}
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor Firewall-ipv6-$4 "\[$4-[0-9]*-[A,D,R]\]"
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.def
deleted file mode 100644
index d046d5b..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a rule in the specified firewall
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/background/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/background/node.def
deleted file mode 100644
index 2a9a698..0000000
--- a/templates/monitor/firewall/ipv6-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/ipv6-name/node.tag/rule/node.tag/background/start/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/background/start/node.def
deleted file mode 100644
index cfbdcd8..0000000
--- a/templates/monitor/firewall/ipv6-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 ipv6-name $4" $6; \
-     ${vyatta_bindir}/vyatta-monitor-background Firewall-ipv6-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/background/stop/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/background/stop/node.def
deleted file mode 100644
index a0c0600..0000000
--- a/templates/monitor/firewall/ipv6-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-ipv6-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def
deleted file mode 100644
index aff5063..0000000
--- a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a rule in the specified firewall
-allowed: local -a ARR
-         eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall ipv6-name ${COMP_WORDS[3]} rule))"
-         echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "firewall ipv6-name $4" $6; \
-     ${vyatta_bindir}/vyatta-monitor Firewall-ipv6-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/firewall/name/node.def b/templates/monitor/firewall/name/node.def
deleted file mode 100644
index a6fe869..0000000
--- a/templates/monitor/firewall/name/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor the specifed firewall
diff --git a/templates/monitor/firewall/name/node.tag/node.def b/templates/monitor/firewall/name/node.tag/node.def
deleted file mode 100644
index 9593cb8..0000000
--- a/templates/monitor/firewall/name/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a specified firewall
-allowed: local -a ARR
-         eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name))"
-         echo ${ARR[@]}
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-([0-9]*|default)-[A,D,R]\]"
diff --git a/templates/monitor/firewall/name/node.tag/rule/node.def b/templates/monitor/firewall/name/node.tag/rule/node.def
deleted file mode 100644
index d046d5b..0000000
--- a/templates/monitor/firewall/name/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a rule in the specified firewall
diff --git a/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def b/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def
deleted file mode 100644
index 554bf70..0000000
--- a/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a rule in the specified firewall
-allowed: local -a ARR
-         eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name ${COMP_WORDS[3]} rule))"
-         echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "firewall name $4" $6; \
-     ${vyatta_bindir}/vyatta-monitor Firewall-$4-rule-$6 "\[$4-$6-[A,D,R]\]"
diff --git a/templates/monitor/firewall/node.def b/templates/monitor/firewall/node.def
deleted file mode 100644
index 8584ad4..0000000
--- a/templates/monitor/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor Firewall
diff --git a/templates/monitor/nat/destination/node.def b/templates/monitor/nat/destination/node.def
deleted file mode 100644
index 7729cc8..0000000
--- a/templates/monitor/nat/destination/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor destination NAT
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor NAT-DEST "\[NAT-DST-[0-9]*.*\]"
diff --git a/templates/monitor/nat/destination/rule/node.def b/templates/monitor/nat/destination/rule/node.def
deleted file mode 100644
index b90312e..0000000
--- a/templates/monitor/nat/destination/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a specified Destination NAT rule
diff --git a/templates/monitor/nat/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def
deleted file mode 100644
index 1ada87b..0000000
--- a/templates/monitor/nat/destination/rule/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a specified destination NAT rule
-allowed: local -a ARR 
-         eval "ARR=($(cli-shell-api listEffectiveNodes nat destination rule))"
-         echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat destination" $5; \
-     ${vyatta_bindir}/vyatta-monitor NAT-DEST-RULE-$5 "\[NAT-DST-$5-*\]"
diff --git a/templates/monitor/nat/destination/translations/detail/node.def b/templates/monitor/nat/destination/translations/detail/node.def
deleted file mode 100644
index d700d9f..0000000
--- a/templates/monitor/nat/destination/translations/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active destination NAT translations events verbose
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=destination --verbose
diff --git a/templates/monitor/nat/destination/translations/node.def b/templates/monitor/nat/destination/translations/node.def
deleted file mode 100644
index f1f593d..0000000
--- a/templates/monitor/nat/destination/translations/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor active destination NAT translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack --dst-nat --event
diff --git a/templates/monitor/nat/node.def b/templates/monitor/nat/node.def
deleted file mode 100644
index 11a8e3d..0000000
--- a/templates/monitor/nat/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor network address translation (NAT)
diff --git a/templates/monitor/nat/source/node.def b/templates/monitor/nat/source/node.def
deleted file mode 100644
index 486743c..0000000
--- a/templates/monitor/nat/source/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor source NAT
-run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \
-     ${vyatta_bindir}/vyatta-monitor NAT-SOURCE "\[NAT-SRC-[0-9]*.*\]"
diff --git a/templates/monitor/nat/source/rule/node.def b/templates/monitor/nat/source/rule/node.def
deleted file mode 100644
index 8526965..0000000
--- a/templates/monitor/nat/source/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor a specified source NAT rule
diff --git a/templates/monitor/nat/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def
deleted file mode 100644
index 98e2cfa..0000000
--- a/templates/monitor/nat/source/rule/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Monitor a specified source NAT rule
-allowed: local -a ARR
-  eval "ARR=($(cli-shell-api listEffectiveNodes nat source rule))"
-  echo ${ARR[@]}
-run: ${vyatta_bindir}/vyatta-monitor-check-rule-log "nat source" $5; \
-     ${vyatta_bindir}/vyatta-monitor NAT-SOURCE-RULE-$5 "\[NAT-SRC-$5.*\]"
diff --git a/templates/monitor/nat/source/translations/detail/node.def b/templates/monitor/nat/source/translations/detail/node.def
deleted file mode 100644
index e6e6f02..0000000
--- a/templates/monitor/nat/source/translations/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active source NAT translations events verbose
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -n -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --type=source --verbose
diff --git a/templates/monitor/nat/source/translations/node.def b/templates/monitor/nat/source/translations/node.def
deleted file mode 100644
index e458848..0000000
--- a/templates/monitor/nat/source/translations/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Monitor active source NAT translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit
-     sudo /usr/sbin/conntrack --src-nat --event