X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor-server.init;h=ee7c469b99d7e33a86b9e8c698c167aad1db1159;hp=3fb17283321a8ba29c47555692d185aef91e8f63;hb=ce9101bfa7720c131a982220f2905e4439b324fc;hpb=21f8190281cfb38c3e24dfba6c89420830435f1f diff --git a/monitor-server.init b/monitor-server.init index 3fb1728..ee7c469 100644 --- a/monitor-server.init +++ b/monitor-server.init @@ -13,6 +13,7 @@ # 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 @@ -30,9 +31,6 @@ pghba_conf=$PGDATA/pg_hba.conf export PGPORT=$PLC_DB_PORT -ZABBIX_DB_USER="zabbixuser" -ZABBIX_DB_NAME="zabbix" - MONITOR_DB_USER="monitoruser" MONITOR_DB_NAME="monitor" @@ -42,123 +40,16 @@ if [ -z "$PLC_MONITOR_IP" ] ; then PLC_MONITOR_IP=$( gethostbyname $PLC_MONITOR_HOST ) fi -function check_pg_hba () -{ - NAME=$1 - USER=$2 - #### SETUP ACCESS to this user and database - mkdir -p $PGDATA/pg_hba.conf.d - CONF=$PGDATA/pg_hba.conf.d/${NAME}.conf - if [ ! -f $CONF ] ; then - echo "host $NAME $USER 127.0.0.1/32 password" > $CONF - echo "host $NAME $USER $PLC_MONITOR_IP/32 password" >> $CONF - - WROTE_PG_CONFIG="true" - fi -} - -function check_user_and_db() -{ - CREATED= - NAME=$1 - USER=$2 - # confirm user is present or create it - user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $USER ) - if [ -z $user_present ] ; then - createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $USER -U postgres - CREATED="true" - fi - - # confirm database is present or create it - db_present=$( psql -U postgres -c "select * from pg_database;" -d template1 | grep $NAME ) - if [ -z $db_present ] ; then - createdb --owner=$USER $NAME -U postgres - CREATED="true" - fi - - # Create/update the unprivileged database user and password - 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 - service plc reload - CREATED="true" - fi - if [ -n "$CREATED" ] ; then - psql -d template1 -U postgres -c "ALTER USER $USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';" - fi -} - -function if_present_load () -{ - file=$1 - if [ -f $file ] ; then - psql -d $ZABBIX_DB_NAME -U $ZABBIX_DB_USER < $file - fi -} function check_monitor_schema_and_data() { # 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() -{ - schema_present=$( psql -U $ZABBIX_DB_USER $ZABBIX_DB_NAME -c "\d;" < /dev/null | grep hosts ) - if [ -z $schema_present ] ; then - echo "... initial import can take SEVERAL minutes. please wait ..." - if_present_load "/usr/local/zabbix/misc/create/schema/postgresql.sql" - if_present_load "/usr/local/zabbix/misc/create/data/data.sql" - if_present_load "/usr/local/zabbix/misc/create/data/images_pgsql.sql" - ## TODO: update ZABBIX Server entry, "update hosts set status=0, host='MyPLC Server' where hostid=10017" - fi -} - -function check_zabbix_templates_and_import () -{ - # LOG IN - COOKIE_FILE=/tmp/cookiejar.txt - rm -f ${COOKIE_FILE} - TEMPLATES_DIR=${MONITORPATH}/zabbix/templates - curl -s --cookie $COOKIE_FILE --cookie-jar $COOKIE_FILE \ - --form "enter=Enter" \ - --form "name=Admin" \ - --form "password=zabbix" \ - "http://${PLC_MONITOR_HOST}/zabbix/index.php?login=1" - - deleted=$( grep 'deleted' $COOKIE_FILE ) - if [ -n "$deleted" ] ; then - echo "Login to the zabbix web server failed!!!" - return 1 - fi - - for file in ${TEMPLATES_DIR}/*.xml ; do - # 0 - update , 1 - skip, 0 - add - echo "############### IMPORTING $file" >> /var/log/monitor.log - curl -s --cookie $COOKIE_FILE --cookie-jar $COOKIE_FILE \ - --form "config=1" \ - --form "import_file=@${file}" \ - --form "rules[host][exist]=0" \ - --form "rules[host][missed]=0" \ - --form "rules[template][exist]=0" \ - --form "rules[template][missed]=1" \ - --form "rules[item][exist]=0" \ - --form "rules[item][missed]=0" \ - --form "rules[trigger][exist]=0" \ - --form "rules[trigger][missed]=0" \ - --form "rules[graph][exist]=0" \ - --form "rules[graph][missed]=0" \ - --form "import=Import" \ - "http://${PLC_MONITOR_HOST}/zabbix/exp_imp.php" >> /var/log/monitor.log - done -} - - function check_monitor_conf () { MONITOR_CONFIG=/etc/monitor.conf - # Using plcsh add default, monitor user plcsh </dev/null AddPerson({'first_name' : 'Monitor', 'last_name' : 'Server', 'password' : '${PLC_MONITOR_DBPASSWORD}', 'email' : '${PLC_MONITOR_EMAIL}'}) @@ -192,11 +83,13 @@ 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= @@ -219,6 +112,7 @@ cachetime=60 # Evaluated as true or false [commandline] cachecalls=True +embedded=False echo=False debug=False @@ -255,7 +149,7 @@ function create_httpd_conf () # non-ssl session as non-ssl. But it works. # NOTE: redirect path without trailing '/' to path with. Favor SSL. -Redirect /monitor https://${MONITOR_HOSTNAME}:${PLC_WWW_SSL_PORT}/monitor/ +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 @@ -267,8 +161,8 @@ Redirect /monitor https://${MONITOR_HOSTNAME}:${PLC_WWW_SSL_PORT}/monitor/ #Errorlog /var/log/httpd/monitorwebapp-error_log #Customlog /var/log/httpd/monitorwebapp-access_log common - ProxyPass http://127.0.0.1:8080/ - ProxyPassReverse http://127.0.0.1:8080/ + ProxyPass http://127.0.0.1:8082/ + ProxyPassReverse http://127.0.0.1:8082/ EOF @@ -276,6 +170,7 @@ 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 @@ -289,63 +184,6 @@ function stop_tg_server () fi } -function check_zab_server () -{ - ZABBIXCFG=/etc/zabbix - TMP_FILE=`mktemp /tmp/zbxtmpXXXXXX` - - if [ -f ${ZABBIXCFG}/zabbix_server.conf ] ; then - sed -e "s/#DBHost=.*/DBHost=$PLC_MONITOR_HOST/g" \ - -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 - service zabbix_server start - rm -f $TMP_FILE - -} -function check_zab_agentd () -{ - ZABBIXCFG=/etc/zabbix - TMP_FILE=`mktemp /tmp/zbxtmpXXXXXX` - if [ -f ${ZABBIXCFG}/zabbix_agentd.conf ] ; then - HOST=`hostname` - sed -e "s#Server=.*#Server=$PLC_MONITOR_HOST#g" \ - -e "s#Hostname=.*#Hostname=$HOST#g" \ - ${ZABBIXCFG}/zabbix_agentd.conf > $TMP_FILE - cat $TMP_FILE > ${ZABBIXCFG}/zabbix_agentd.conf - fi - service zabbix_agentd start - rm -f $TMP_FILE -} -function check_zab_webconfig() -{ - # SETUP zabbix gui configuration - ZABBIX_WEB_CFG=/var/www/html/zabbix/conf/zabbix.conf.php - if [ ! -f $ZABBIX_WEB_CFG ] ; then - touch $ZABBIX_WEB_CFG - cat < $ZABBIX_WEB_CFG - -EOF - chmod 644 $ZABBIX_WEB_CFG - fi -} - if [ "$PLC_MONITOR_ENABLED" != "1" ] ; then exit 0 fi @@ -360,10 +198,6 @@ case "$1" in check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER # WRITE default /etc/monitor.conf check_monitor_conf - check_monitor_schema_and_data - - 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. @@ -373,9 +207,7 @@ case "$1" in dialog "$MESSAGE" fi - check_zabbix_schema_and_data - check_zabbix_templates_and_import - + check_monitor_schema_and_data # create /etc/httpd/conf.d/monitorweb.conf create_httpd_conf @@ -387,11 +219,6 @@ case "$1" in fi start_tg_server - # START zabbix services. SETUP default config files. - check_zab_server - check_zab_agentd - check_zab_webconfig - result "$MESSAGE" ;; @@ -405,19 +232,13 @@ case "$1" in result "$MESSAGE" ;; - sync) - MESSAGE=$"Syncing PLC db with Zabbix DB" + delete) + MESSAGE=$"Deleting databases..." dialog "$MESSAGE" - # turn off zabbix server, etc. before writing to the db. - service plc stop monitor - - $MONITORPATH/zabbix/zabbixsync.py --setupglobal &> /var/log/monitor-server - # import any templates - check_zabbix_templates_and_import + dropdb -U postgres $MONITOR_DB_NAME + dropuser -U postgres $MONITOR_DB_USER - service plc start monitor - result "$MESSAGE" ;; @@ -426,9 +247,8 @@ case "$1" in dialog "$MESSAGE" stop_tg_server - service zabbix_server stop - service zabbix_agentd stop - # TODO: is there anything to stop? + # todo: disable cron entry? + result "$MESSAGE" ;; esac