update

defaults.inc

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.168-08122023'
+VERS='2.2.1-08132023'
 
 noheader=' update service dailytemp '
 
@@ -16,61 +16,63 @@ min_battvolt_sys=47
 #47
 
 FOLDER='/opt/idssys/powerwall'
-LOGFOLDER=${FOLDER}/logs
-LOGARCHIVE=${FOLDER}/logs/archive
-TMPFOLDER=${FOLDER}/.tmp
-[ ! -d ${LOGFOLDER} ] && mkdir ${LOGFOLDER}
-[ ! -d ${LOGARCHIVE} ] && mkdir ${LOGARCHIVE}
-[ ! -d ${TMPFOLDER} ] && mkdir ${TMPFOLDER}
+PW_LOGFOLDER=${PW_FOLDER}/logs
+PW_LOGARCHIVE=${PW_FOLDER}/logs/archive
+PW_TMPFOLDER=${PW_FOLDER}/.tmp
+[ ! -d ${PW_LOGFOLDER} ] && mkdir ${PW_LOGFOLDER}
+[ ! -d ${PW_LOGARCHIVE} ] && mkdir ${PW_LOGARCHIVE}
+[ ! -d ${PW_TMPFOLDER} ] && mkdir ${PW_TMPFOLDER}
 
-logfile=${LOGFOLDER}/logfile
-logpower=${LOGFOLDER}/log-power
-[ ! -f ${logfile} ] && touch ${logfile}
-[ ! -f ${logpower} ] && touch ${logpower}
+PW_LOGFILE=${PW_LOGFOLDER}/logfile
+PW_LOGPOWER=${PW_LOGFOLDER}/log-power
+[ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE}
+[ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER}
 
 
-declare -A TEMP_THRESHOLDS
-# TEMP_THRESHOLDS['ServerRoomTH']="72,74,76"
-TEMP_THRESHOLDS['ServerRoomTH']="83,88,95"
-TEMP_THRESHOLDS['RaspberryPI-CPU']="122,131,176"
-TEMP_THRESHOLDS['OctoPI-CPU']="122,131,176"
+declare -A PW_TEMP_THRESHOLDS
+# PW_TEMP_THRESHOLDS['ServerRoomTH']="72,74,76"
+PW_TEMP_THRESHOLDS['ServerRoomTH']="83,88,95"
+PW_TEMP_THRESHOLDS['RaspberryPI-CPU']="122,131,176"
+PW_TEMP_THRESHOLDS['OctoPI-CPU']="122,131,176"
 
 
-declare -A SENSOR_TYPE
-SENSOR_TYPE['ServerRoomTH']='mqtt'
-SENSOR_TYPE['RaspberryPI-CPU']='system'
-SENSOR_TYPE['OctoPI-CPU']='remotesystem'
+declare -A PW_SENSOR_TYPE
+PW_SENSOR_TYPE['ServerRoomTH']='mqtt'
+PW_SENSOR_TYPE['RaspberryPI-CPU']='system'
+PW_SENSOR_TYPE['OctoPI-CPU']='remotesystem'
 
-declare -A REMOTE_SENSORS
-REMOTE_SENSORS['ServerRoomTH']='10.10.20.10'
-REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80'
+declare -A PW_REMOTE_SENSORS
+PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10'
+PW_REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80'
 
-declare -A SENSOR_ID
-SENSOR_ID['ServerRoomTH']='2'
-SENSOR_ID['RaspberryPI-CPU']='6'
-SENSOR_ID['OctoPI-CPU']='7'
+declare -A PW_SENSOR_ID
+PW_SENSOR_ID['ServerRoomTH']='2'
+PW_SENSOR_ID['RaspberryPI-CPU']='6'
+PW_SENSOR_ID['OctoPI-CPU']='7'
 
-declare -A POWERWALL_SERVICES
-POWERWALL_SERVICES['temp']='monitor-temp'
-POWERWALL_SERVICES['power']='monitor-power'
-# POWERWALL_SERVICES['powerlogger']='monitor-powerlogger'
+declare -A PW_POWERWALL_SERVICES
+PW_POWERWALL_SERVICES['temp']='monitor-temp'
+PW_POWERWALL_SERVICES['power']='monitor-power'
+# PW_POWERWALL_SERVICES['powerlogger']='monitor-powerlogger'
 
-declare -A ESXI_HOST_NAMES
-ESXI_HOST_NAMES['10.10.2.10']='ids-vms-scsi.scity.us'
-ESXI_HOST_NAMES['10.10.2.11']='ids-vms1.scity.us'
-ESXI_HOST_NAMES['10.10.2.12']='ids-vms2.scity.us'
-ESXI_HOST_NAMES['10.10.2.17']='ids-vms7.scity.us'
+declare -A PW_ESXI_HOST_NAMES
+PW_ESXI_HOST_NAMES['10.10.2.10']='ids-vms-scsi.scity.us'
+PW_ESXI_HOST_NAMES['10.10.2.11']='ids-vms1.scity.us'
+PW_ESXI_HOST_NAMES['10.10.2.12']='ids-vms2.scity.us'
+PW_ESXI_HOST_NAMES['10.10.2.17']='ids-vms7.scity.us'
+PW_ESXI_HOST_NAMES['10.2.1.18']='ids-vms-offsite.scity.us'
 
-
-MAINHOSTS=10.10.2.10,10.10.2.11,10.10.2.12
-SYSHOSTS=10.10.2.17
-ESXIHOSTS="${MAINHOSTS},${SYSHOSTS}"
-VCENTERHOST=10.10.1.30
+PW_VCENTERHOST=10.10.1.30
+PW_MAINHOSTS=10.10.2.10,10.10.2.11,10.10.2.12
+PW_SYSHOSTS=10.10.2.17
+PW_OFFSITEHOSTS=10.2.1.18
+PW_MAINSITE_HOSTS="${PW_MAINHOSTS},${PW_SYSHOSTS}"
+PW_ALL_HOSTS="${PW_MAINHOSTS},${PW_SYSHOSTS},${PW_OFFSITEHOSTS}"
 
 IFS=,
-ESXIHOSTS=(${ESXIHOSTS})
-MAINHOSTS=(${MAINHOSTS})
-SYSHOSTS=(${SYSHOSTS})
+PW_MAINSITE_HOSTS=(${PW_MAINSITE_HOSTS})
+PW_MAINHOSTS=(${PW_MAINHOSTS})
+PW_SYSHOSTS=(${PW_SYSHOSTS})
 unset IFS
 
 SENDNOTICE(){