git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add links for length of query for nodescanhistory view
[monitor.git]
/
monitor-server.init
diff --git
a/monitor-server.init
b/monitor-server.init
index
cc7e143
..
265a803
100644
(file)
--- a/
monitor-server.init
+++ b/
monitor-server.init
@@
-13,6
+13,7
@@
# Source function library and configuration
. /etc/plc.d/functions
# Source function library and configuration
. /etc/plc.d/functions
+. /etc/plc.d/monitor.functions
. /etc/planetlab/plc_config
local_config=/etc/planetlab/configs/site.xml
. /etc/planetlab/plc_config
local_config=/etc/planetlab/configs/site.xml
@@
-60,21
+61,16
@@
EOF
if [ ! -f ${MONITOR_CONFIG} ] ; then
cat <<EOF > ${MONITOR_CONFIG}
[monitorconfig]
if [ ! -f ${MONITOR_CONFIG} ] ; then
cat <<EOF > ${MONITOR_CONFIG}
[monitorconfig]
-RT_DB_HOST=rt.planet-lab.org
-RT_DB_USER=
-RT_DB_PASSWORD=
-RT_DB_NAME=
-
# RT Web user account
# RT Web user account
-RT_WEB_SERVER=http
s://rt.planet-lab.org
/
-RT_WEB_TOOLS_PATH=
-RT_WEB_USER=
-RT_WEB_PASSWORD=
+RT_WEB_SERVER=http
://${PLC_RT_HOST}
/
+RT_WEB_TOOLS_PATH=
/usr/bin/
+RT_WEB_USER=
${PLC_RT_WEB_USER}
+RT_WEB_PASSWORD=
${PLC_RT_WEB_PASSWORD}
RT_WEB_DEBUG=0
RT_WEB_DEBUG=0
-RT_QUEUE=
+RT_QUEUE=
${PLC_MONITOR_RT_QUEUE}
# PLC admin account
# PLC admin account
-API_SERVER=https://${PLC_
BOOT_HOS
T}/PLCAPI/
+API_SERVER=https://${PLC_
API_HOST}:${PLC_API_POR
T}/PLCAPI/
API_AUTH_USER=${PLC_MONITOR_EMAIL}
API_AUTH_PASSWORD=${PLC_MONITOR_DBPASSWORD}
API_AUTH_USER=${PLC_MONITOR_EMAIL}
API_AUTH_PASSWORD=${PLC_MONITOR_DBPASSWORD}
@@
-91,16
+87,19
@@
PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
PLC_NAME=${PLC_NAME}
# used for debug mode
PLC_NAME=${PLC_NAME}
# used for debug mode
-email=
-
+email=${PLC_MONITOR_CC_EMAIL}
# all messages will appear to be from this address
from_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}
# a separate address for support messages
support_email=${PLC_MAIL_SUPPORT_ADDRESS}
-
# mailing list copied on all out-going messages
# mailing list copied on all out-going messages
-cc_email=
+cc_email=${PLC_MONITOR_CC_EMAIL}
+
+# these are reserved values
+RT_DB_HOST=${PLC_RT_HOST}
+RT_DB_USER=
+RT_DB_PASSWORD=
+RT_DB_NAME=
[monitordatabase]
monitor_dburi=postgres://${MONITOR_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
[monitordatabase]
monitor_dburi=postgres://${MONITOR_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
@@
-112,6
+111,7
@@
cachetime=60
[commandline]
cachecalls=True
embedded=False
[commandline]
cachecalls=True
embedded=False
+zabbix_enabled=False
echo=False
debug=False
echo=False
debug=False
@@
-171,6
+171,8
@@
function start_tg_server ()
{
stop_tg_server
pushd ${MONITORPATH}/web/MonitorWeb/
{
stop_tg_server
pushd ${MONITORPATH}/web/MonitorWeb/
+ mkdir -p /var/log/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
}
./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
popd
}