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
MONITOR_HOSTNAME=${PLC_MONITOR_HOST}
MONITOR_IP=${PLC_MONITOR_IP}
+PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
+
# used for debug mode
email=
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
# Evaluated as true or false
[commandline]
cachecalls=True
+embedded=False
echo=False
debug=False
WROTE_HTTP_CONFIG="true"
fi
- # TODO: make http port configurable.
+ # 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}
-NameVirtualHost *
-
-<VirtualHost *>
- ServerName ${PLC_MONITOR_HOST}
- ServerAdmin ${PLC_MONITOR_EMAIL}
- UseCanonicalName Off
- ServerSignature Off
-
- # NOTE: this appears to alter the global document root, for port 80...
- # not sure if it's possible to serve two different 'virtualhosts' from
- # the same port and same hostname with different document roots...
- #DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb
-
- #<Directory "${MONITORPATH}/web/MonitorWeb/monitorweb">
- # Options Indexes FollowSymLinks
- # AllowOverride None
- # Order allow,deny
- # Allow from all
- #</Directory>
-
- #LogLevel debug
- Errorlog /var/log/httpd/monitorwebapp-error_log
- Customlog /var/log/httpd/monitorwebapp-access_log common
-
- AddDefaultCharset utf-8
- #NOTE: This doesn't work as expected.
- # Load everything out of the DocumentRoot that is static
- # ProxyPass /monitor/static !
+# 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.
- ProxyPass /tg_js http://127.0.0.1:8080/tg_js
- ProxyPassReverse /tg_js http://127.0.0.1:8080/tg_js
+# NOTE: redirect path without trailing '/' to path with. Favor SSL.
+Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
- ProxyPass /monitor http://127.0.0.1:8080
- ProxyPassReverse /monitor http://127.0.0.1:8080
+# 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
- ProxyPreserveHost On
- ProxyRequests Off
+ ProxyPass http://127.0.0.1:8082/
+ ProxyPassReverse http://127.0.0.1:8082/
+</Location>
-</VirtualHost>
EOF
}
function start_tg_server ()
{
+ stop_tg_server
pushd ${MONITORPATH}/web/MonitorWeb/
- ./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log
+ ./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
-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" \
+ -e "s#.*ExternalScripts=.*#ExternalScripts=${MONITORPATH}/zabbix#g" \
${ZABBIXCFG}/zabbix_server.conf > $TMP_FILE
cat $TMP_FILE > ${ZABBIXCFG}/zabbix_server.conf
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"
;;
# 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
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"
;;
git://git.onelab.eu / monitor.git / blobdiff