Monitor modem

bin/mt_station_conf

@@ -109,6 +109,10 @@ def parse_args():
     group.add_argument("--log-file",
                        dest="log_file",
                        help="Log file name")
+    group.add_argument("--tc-timeout",
+                       dest="tc_timeout",
+                       type=int,
+                       help="Set tc_timeout value in seconds")
 
     options = parser.parse_args()
     if options.debug:
@@ -164,6 +168,13 @@ def main():
     if options.gps:
         data['station_conf']['gps'] = options.gps
         data['station_conf']['pps'] = "fuzzy" if options.fuzzy_pps else "gps"
+    if options.tc_timeout:
+        for key in data['station_conf'].keys():
+            if key.lower() == "tc_timeout":
+                data['station_conf'][key] = "%ds" % options.tc_timeout
+                break
+        else:
+            data['station.conf']["tc_timeout"] = "%ds" % options.tc_timeout
 
     print(json.dumps(data, indent=4))
 

roles/conduit/README.md

@@ -114,6 +114,26 @@ The following tags can be used to run a subset of the playbook.
 	<dd>Sets up an ssh tunnel back to a control host<dd>
 </dl>
 
+LED Status
+----------
+
+On Conduits (not Conduit APs), the LED indications are:
+
+| LED    | Meaning                                                                                              |
+|--------|------------------------------------------------------------------------------------------------------|
+| Status | Blinks twice a second when the OS is running                                                         |
+| LS     | Blicks every couple seconds when Cellular modem is connected                                         |
+| A      | We are trying to use PPP                                                                             |
+| B      | An SSH tunnel connection to the jump host is in Established state                                    |
+| C      | A packet forwarder is running and has the LoRa device open (does not work on I2C cards running mp) N |
+| D      | DNS resolution of google.com works                                                                   |
+
+The A-D LEDs are the ones on the right and have different lables on
+older Conduits (CD and one to 3 bars).
+
+The A-D LEDs reverse periodically to indicate that the check program
+is running.
+
 License
 -------
 
@@ -123,4 +143,3 @@ Author Information
 ------------------
 
 Jeffrey Honig <jch@honig.net>
-

roles/conduit/defaults/main.yml

@@ -90,6 +90,8 @@ ssh_tunnel_ssh_key: /etc/ssh/ssh_host_rsa_key
 ssh_tunnel_daemon: /usr/bin/autossh
 ssh_tunnel_ssh_port: 22
 ssh_tunnel_base_port: 0
+ssh_tunnel_first_poll: 120
+ssh_tunnel_poll: 60
 
 # Static Nameserver defaults
 resolv_conf_static: /var/config/network/resolv.conf-static
@@ -176,11 +178,16 @@ monit_pktfwd_stop: '"/etc/init.d/{{ monit_pktfwd_initscript }} stop"'
 monit_pktfwd_restart: '"/etc/init.d/{{ monit_pktfwd_initscript }} restart"'
 monit_pktfwd_reboot: 'exec "/sbin/reboot"'
 
+# Monit loadavg
+monit_loadavg_1m: 2
+monit_loadavg_5m: 4
+monit_memory_usage: 30%
+
 # Monitor space on /
 monit_root_test: "usage > 50%"
 
 # Monitor space on /var/config
-monit_config_test: "usage > 15%"
+monit_config_test: "usage > 20%"
 
 # Monitor space on /var/volatile
 monit_volatile_test: "usage > 75%"

roles/conduit/files/conduit_leds.initd

@@ -27,7 +27,7 @@ fi
 [ -x ${DAEMON} ] || exit 0
 
 is_running() {
-    pgrep -F ${PIDFILE} > /dev/null
+    pgrep -F ${PIDFILE} > /dev/null 2>&1
 }
 
 start() {
@@ -40,22 +40,56 @@ stop() {
 
 case "$1" in
     start)
-	is_running || start
+	if is_running; then
+	    echo "${NAME} is already running: $(pgrep -F ${PIDFILE} -a)" >&2
+	    exit 1
+	fi
+	echo "Starting ${NAME}" >&2
+	start
 	;;
     stop)
-	stop
+	if is_running; then
+	    echo "Stopping ${NAME}" >&2
+	    stop
+	else
+	    echo "${NAME} is not running" >&2
+	fi
 	;;
     restart|reload)
-	nohup ${0} do_restart
-	;;
-    do_restart)
-	stop
+	if is_running; then
+	    echo "Stopping ${NAME}" >&2
+	    stop
+	else
+	    echo "${NAME} is not running" >&2
+	fi
+
+	# Wait for it to stop
+	tries=10
+	while is_running; do
+	    if [ "${tries}" -eq 0 ]; then
+		echo "${NAME} failed to stop" >&2
+		exit 1
+	    fi
+	    tries=$((tries - 1))
+	    sleep 1
+	done
+
+	echo "Starting ${NAME}" >&2
 	start
 	;;
     status)
-	is_running
+	if is_running; then
+	   echo "${NAME} is running with PID $(pgrep -F ${PIDFILE} -a)" >&2
+	else
+	    echo "${NAME} is not running" >&2
+	    exit 1
+	fi
 	;;
     *)
-	echo "Usage: $0 {start|stop|status|restart}"
+	echo "Usage: $0 {start|stop|status|restart}" >&2
+	exit 2
+	;;
 esac
+
+exit 0
 #=========================================