VOL-3014 - configure multiple ofagent controllers

Also added
- an option to untaint the control nodes
- a "clean" command to wipe any port-forwards

Change-Id: I130eac14087bf865139c5daf4d2f9c3123fe5054
diff --git a/scripts/monitor.sh b/scripts/monitor.sh
index 24a5319..76f9650 100755
--- a/scripts/monitor.sh
+++ b/scripts/monitor.sh
@@ -23,6 +23,6 @@
 fi
 
 kubectl get --all-namespaces pods,svc && echo "" \
-    &&  kubectl  describe --all-namespaces  pods | grep Image: | grep voltha | sed -e "s/^ *//g" -e "s/: */: /g"  && echo "" \
+    &&  kubectl  describe --all-namespaces  pods | grep Image: | grep '\(voltha\|bbsim\)' | sed -e "s/^ *//g" -e "s/: */: /g"  && echo "" \
     && echo "DB SIZE: $($SCRIPTPATH/etcd-db-size.sh)" && echo "" \
     && echo "RSS SIZE: $(ps -eo rss,pid,$CMD_KEY | grep /usr/local/bin/etcd | grep -v grep | cut -d\  -f1 | numfmt --to=iec | tr '\n' ' ' )"