X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=6817b6ad1d66f5d0f36addbee4cd13d805b36d2a;hb=6481ba179a2fa6ab22cbed7f37a8104b152f77b3;hp=30cd6e2714c45978f75d37ba5a41e831ec7f3126;hpb=da62714c855a89f1b50d21844fa8f1e709850ebb;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index 30cd6e2..6817b6a 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -77,7 +77,7 @@ function check_user_and_db()
     fi
 
     # Create/update the unprivileged database user and password
-    if [ -z "$PLC_MONITOR_DBPASSWORD" ] ; then
+    if [[ -z "$PLC_MONITOR_DBPASSWORD" || "$PLC_MONITOR_DBPASSWORD" = "None" ]] ; then
         # Zabbix doesn't like plain uuidgen passwords
         PLC_MONITOR_DBPASSWORD=$( uuidgen | md5sum - | awk '{print $1}' )
         plc-config --category=plc_monitor --variable=dbpassword --value="$PLC_MONITOR_DBPASSWORD" --save=$local_config $local_config
@@ -98,8 +98,8 @@ function if_present_load ()
 }
 function check_monitor_schema_and_data() 
 {
-	# NOTE: call create_all() to setup the database from the infovacuum model.
-	python -c "from monitor.database.infovacuum import *; from elixir import create_all; create_all()"
+	# NOTE: call create_all() to setup the database from the info model.
+	python -c "from monitor.database.info.model import *; from elixir import create_all; create_all()"
 }
 
 function check_zabbix_schema_and_data() 
@@ -192,10 +192,14 @@ API_AUTH_PASSWORD=${PLC_MONITOR_DBPASSWORD}
 MONITOR_SCRIPT_ROOT=${MONITORPATH}
 MONITOR_DATA_ROOT=/var/lib/monitor
 MONITOR_ARCHIVE_ROOT=/var/lib/monitor/archive-pdb
+MONITOR_BOOTMANAGER_LOG=/var/www/html/monitorlog
 
 MONITOR_HOSTNAME=${PLC_MONITOR_HOST}
 MONITOR_IP=${PLC_MONITOR_IP}
 
+PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
+PLC_NAME=${PLC_NAME}
+
 # used for debug mode
 email=
 
@@ -209,7 +213,7 @@ support_email=${PLC_MAIL_SUPPORT_ADDRESS}
 cc_email=
 
 [monitordatabase]
-monitor_dburi=postgres://${MONITOR_DB_NAME}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
+monitor_dburi=postgres://${MONITOR_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
 zabbix_dburi=postgres://${ZABBIX_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${ZABBIX_DB_NAME}
 
 cachetime=60
@@ -217,6 +221,7 @@ cachetime=60
 # Evaluated as true or false
 [commandline]
 cachecalls=True
+embedded=False
 
 echo=False
 debug=False
@@ -231,6 +236,63 @@ EOF
 	fi
 }
 
+function create_httpd_conf ()
+{
+	MONITOR_HTTP_CONF=/etc/httpd/conf.d/monitorweb.conf
+
+	if [ ! -f ${MONITOR_HTTP_CONF} ] ; then
+		# note: we need to either start this script before httpd, or always
+		# restart httpd, since there's no way to know beyond file's existence
+		# whether the values have changed or not.
+		WROTE_HTTP_CONFIG="true"
+	fi
+
+	# TODO: support HTTPS as well as port 80.  currently not specifying port
+	# 		80 breaks https for other content on the myplc.
+	# TODO: make proxy port configurable.
+
+	cat <<EOF > ${MONITOR_HTTP_CONF}
+
+# NOTE: I've tried other means of redirection, including mod_rewrite, but did
+# 	not have any success.  The means below is not idea, b/c it does not keep
+# 	non-ssl session as non-ssl.  But it works.
+
+# NOTE: redirect path without trailing '/' to path with.  Favor SSL.
+Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
+
+# NOTE: this directive strips '/monitor/' from the requested path and pastes
+#       the remaining part to the end of the ProxyPass url below.  All TG urls
+#       should be relative to their current position, or the absolute path
+#       that includes /monitor/ at the beginning.  
+# TODO: make location configurable.
+<Location '/monitor/'>
+    #LogLevel debug
+    #Errorlog /var/log/httpd/monitorwebapp-error_log
+    #Customlog /var/log/httpd/monitorwebapp-access_log common
+
+    ProxyPass http://127.0.0.1:8082/
+    ProxyPassReverse http://127.0.0.1:8082/
+</Location>
+
+EOF
+}
+
+function start_tg_server ()
+{
+	stop_tg_server
+	pushd ${MONITORPATH}/web/MonitorWeb/
+	./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
+	popd
+}
+
+function stop_tg_server ()
+{
+        pid=$( cat /var/run/monitorweb.pid )
+        if [ -n "$pid" ] ; then
+                kill $pid
+        fi
+}
+
 function check_zab_server ()
 {
 	ZABBIXCFG=/etc/zabbix
@@ -241,6 +303,7 @@ function check_zab_server ()
 		    -e "s#DBName=.*#DBName=$ZABBIX_DB_NAME#g" \
 		    -e "s#DBUser=.*#DBUser=$ZABBIX_DB_USER#g" \
 		    -e "s#DBPassword=.*#DBPassword=$PLC_MONITOR_DBPASSWORD#g" \
+		    -e "s#.*ExternalScripts=.*#ExternalScripts=${MONITORPATH}/zabbix#g" \
 		    ${ZABBIXCFG}/zabbix_server.conf > $TMP_FILE
 		cat $TMP_FILE > ${ZABBIXCFG}/zabbix_server.conf
 	fi
@@ -293,36 +356,60 @@ fi
 
 case "$1" in
 	start)
-		MESSAGE=$"Bootstrap Monitoring"
+		MESSAGE=$"Bootstrap Monitoring (please wait...)"
 		dialog "$MESSAGE"
 
 		# DATABASE acces, creation, and data loading
 		check_pg_hba $MONITOR_DB_NAME $MONITOR_DB_USER
 		check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER
-		check_monitor_schema_and_data
+		# WRITE default /etc/monitor.conf
+		check_monitor_conf
 
-		check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
-		check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
+		#check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
+		#check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
 
 		if [ -n "$WROTE_PG_CONFIG" ] ; then
 			# NOTE: restart db to enable access by users granted above.
 			service plc restart postgresql
+			service plc restart httpd
+			MESSAGE=$"Bootstrap Monitoring 2 (please wait...)"
+			dialog "$MESSAGE"
 		fi
 
-		check_zabbix_schema_and_data
-		check_zabbix_templates_and_import
+		check_monitor_schema_and_data
+
+		#check_zabbix_schema_and_data
+		#check_zabbix_templates_and_import
 
-		# WRITE default /etc/monitor.conf
-		check_monitor_conf
+
+		# create /etc/httpd/conf.d/monitorweb.conf
+		create_httpd_conf
+		if [ -n "$WROTE_HTTP_CONFIG" ] ; then
+			# NOTE: restart web server to enable access web cfg
+			service plc restart httpd
+			MESSAGE=$"Bootstrap Monitoring 3 (please wait...)"
+			dialog "$MESSAGE"
+		fi
+		start_tg_server
 
 		# START zabbix services.  SETUP default config files.
-		check_zab_server
-		check_zab_agentd
-		check_zab_webconfig
+		#check_zab_server
+		#check_zab_agentd
+		#check_zab_webconfig
 
 		result "$MESSAGE"
 	;;
 
+	restartweb)
+		MESSAGE=$"Restarting monitor web app..."
+		dialog "$MESSAGE"
+
+		stop_tg_server
+		start_tg_server
+		
+		result "$MESSAGE"
+	;;
+
 	sync)
 		MESSAGE=$"Syncing PLC db with Zabbix DB"
 		dialog "$MESSAGE"
@@ -330,7 +417,8 @@ case "$1" in
 		# turn off zabbix server, etc. before writing to the db.
 		service plc stop monitor 
 
-		$MONITORPATH/zabbix/zabbixsync.py --setupglobal &> /var/log/monitor-server
+		$MONITORPATH/zabbix/zabbixsync.py --setupids &> /var/log/monitor-server
+		$MONITORPATH/zabbix/zabbixsync.py --setupglobal 2>&1 >> /var/log/monitor-server
 		# import any templates
 		check_zabbix_templates_and_import
 
@@ -339,12 +427,26 @@ case "$1" in
 		result "$MESSAGE"
 	;;
 
+	delete)
+		MESSAGE=$"Deleting databases..."
+		dialog "$MESSAGE"
+
+		#dropdb -U postgres $ZABBIX_DB_NAME
+		#dropuser -U postgres $ZABBIX_DB_USER
+
+		dropdb -U postgres $MONITOR_DB_NAME
+		dropuser -U postgres $MONITOR_DB_USER
+
+		result "$MESSAGE"
+	;;
+
 	stop)
 		MESSAGE=$"Stopping Monitor"
 		dialog "$MESSAGE"
 
-		service zabbix_server stop
-		service zabbix_agentd stop
+		stop_tg_server
+		#service zabbix_server stop
+		#service zabbix_agentd stop
 		# TODO: is there anything to stop?
 		result "$MESSAGE"
 	;;