function check_user_and_db()
{
+ CREATED=
# confirm user is present or create it
- user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $ZABBIX_DB_NAME )
+ user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $ZABBIX_DB_USER )
if [ -z $user_present ] ; then
- createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $ZABBIX_DB_NAME -U postgres
+ createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $ZABBIX_DB_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 $ZABBIX_DB_NAME )
if [ -z $db_present ] ; then
- createdb --owner=$ZABBIX_DB_NAME $ZABBIX_DB_NAME -U postgres
+ createdb --owner=$ZABBIX_DB_USER $ZABBIX_DB_NAME -U postgres
+ CREATED="true"
fi
# Create/update the unprivileged database user and password
# 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
- psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_NAME WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
service plc reload
+ CREATED="true"
+ fi
+ if [ -n "$CREATED" ] ; then
+ psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
fi
}
MESSAGE=$"Bootstrap Monitoring"
dialog "$MESSAGE"
- check_user_and_db
- check_schema_and_data
-
+ #### SETUP ACCESS to this user and database
mkdir -p /var/lib/pgsql/data/pg_hba.conf.d
ZABCONF=/var/lib/pgsql/data/pg_hba.conf.d/zabbix.conf
if [ ! -f $ZABCONF ] ; then
echo "host $ZABBIX_DB_NAME $ZABBIX_DB_USER $PLC_MONITOR_IP/32 password" >> $ZAB
fi
+ # NOTE: restart db to enable access by users granted above.
+ service plc restart posgresql
+
+ check_user_and_db
+ check_schema_and_data
+
# UPDATE /etc/zabbix/*.conf
ZABBIXCFG=/etc/zabbix
TMP_FILE=`mktemp /tmp/zbxtmpXXXXXX`
#from setuptools import setup, find_packages
packages=['monitor', 'monitor.database', 'monitor.database.zabbixapi',
- 'monitor.database.infovacuum', 'monitor.database.infovacuum.model', 'monitor.pcu',
+ 'monitor.database.infovacuum', 'monitor.pcu',
'monitor.sources', 'monitor.util', 'monitor.wrapper' ]
#packages = find_packages(exclude=('Rpyc', 'www', 'ssh', 'pyssh',
sed -e "s#AlertScriptsPath=/home/zabbix/bin/#AlertScriptsPath=%{zabbix_bindir}/#g" \
-e "s#PidFile=/var/tmp/zabbix_server.pid#PidFile=%{zabbix_piddir}/zabbix_server.pid#g" \
-e "s#LogFile=/tmp/zabbix_server.log#LogFile=%{zabbix_logdir}/zabbix_server.log#g" \
+ -e "s|#DBPassword|DBPassword|g" \
%{zabbix_confdir}/zabbix_server.conf > $TMP_FILE
cat $TMP_FILE > %{zabbix_confdir}/zabbix_server.conf
mkdir -p %{_sysconfdir}/zabbix