export PGPORT=$PLC_DB_PORT
-MONITOR_DB_USER="monitoruser"
-MONITOR_DB_NAME="monitor"
+MONITOR_DB_USER=$PLC_MONITOR_DBUSER
+MONITOR_DB_NAME=$PLC_MONITOR_DBNAME
WROTE_PG_CONFIG=
done
}
-function check_monitor_schema_and_data()
+function check_monitor_schema_and_data_init()
{
- # 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()"
- $MONITORPATH/init-bootman-sequence.py
+ # from monitor.functions
+ check_monitor_schema_and_data
+
+ $MONITORPATH/config.d/init-bootman-sequence.py
}
function check_monitor_conf ()
PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
PLC_NAME=${PLC_NAME}
-# used for debug mode
-email=${PLC_MONITOR_CC_EMAIL}
+email=${PLC_MONITOR_EMAIL}
# all messages will appear to be from this address
from_email=${PLC_MONITOR_EMAIL}
# a separate address for support messages
support_email=${PLC_MAIL_SUPPORT_ADDRESS}
# mailing list copied on all out-going messages
cc_email=${PLC_MONITOR_CC_EMAIL}
+exception_email=${PLC_MONITOR_CC_EMAIL}
# these are reserved values
RT_DB_HOST=${PLC_RT_HOST}
RT_DB_NAME=
[monitordatabase]
-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}
+monitor_dburi=postgres://${MONITOR_DB_USER}:${PLC_MONITOR_DBPASSWORD}@${PLC_MONITOR_DBHOST}:5432/${MONITOR_DB_NAME}
cachetime=60
{
stop_tg_server
pushd ${MONITORPATH}/web/MonitorWeb/
- mkdir -p /var/log/monitor/monitorweb/
+ mkdir -p /var/lib/monitor/monitorweb/
cp /var/log/monitorweb.log /var/lib/monitor/monitorweb/`date +%Y-%m-%d-%H-%M`-monitorweb.log
./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
popd
dialog "$MESSAGE"
fi
- check_monitor_schema_and_data
+ check_monitor_schema_and_data_init
# create /etc/httpd/conf.d/monitorweb.conf
create_httpd_conf