kudos/check_health
2
1
Fork 0
Code Issues 7 Pull Requests Projects Releases 1 Wiki Activity

* Rewrite of HC_MSG handling

Browse Source 
* Added JSON display plugin
* Added dump_logs()
This commit is contained in:
Patrick Van der Veken
2018-05-20 21:39:39 +02:00
parent 9fa69576ad
commit 703abca8c3
28 changed files with 871 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/lib/core/display_csv.sh
+33 -10
View File
@@ -30,7 +30,7 @@
function display_csv
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2018-05-14" # YYYY-MM-DD
typeset _VERSION="2018-05-20" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
typeset _DISPLAY_SEP=";"
# ------------------------- CONFIGURATION ends here ---------------------------
@@ -53,24 +53,47 @@ typeset _ID_BIT=""
# parse $HC_MSG_VAR
if [[ -n "${HC_MSG_VAR}" ]]
then
printf "%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s\n" "Health Check" "STC" "Message" "FAIL ID" \
printf "%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s\n" "Health Check" "STC" "Message" "FAIL ID" \
"Current Value" "Expected Value"
print "${HC_MSG_VAR}" | while read _HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read _DISPLAY_MSG_STC _DISPLAY_MSG_TIME _DISPLAY_MSG_TEXT _DISPLAY_MSG_CUR_VAL _DISPLAY_MSG_EXP_VAL
do
# split fields (awk is required for multi-char delimiter)
_DISPLAY_MSG_STC=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $1'})
_DISPLAY_MSG_TIME=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $2'})
_DISPLAY_MSG_TEXT=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $3'})
_DISPLAY_MSG_CUR_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $4'})
_DISPLAY_MSG_EXP_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $5'})
# magically unquote if needed
if [[ -n "${_DISPLAY_MSG_TEXT}" ]]
then
data_contains_string "${_DISPLAY_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_TEXT=$(data_magic_unquote "${_DISPLAY_MSG_TEXT}")
fi
fi
if [[ -n "${_DISPLAY_MSG_CUR_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_CUR_VAL=$(data_magic_unquote "${_DISPLAY_MSG_CUR_VAL}")
fi
fi
if [[ -n "${_DISPLAY_MSG_EXP_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_EXP_VAL=$(data_magic_unquote "${_DISPLAY_MSG_EXP_VAL}")
fi
fi
if (( _DISPLAY_MSG_STC > 0 ))
then
_ID_BIT="${_DISPLAY_FAIL_ID}"
else
_ID_BIT=""
fi
# escape stuff
_DISPLAY_MSG_TEXT=$(data_escape_csv "${_DISPLAY_MSG_TEXT}")
_DISPLAY_MSG_CUR_VAL=$(data_escape_csv "${_DISPLAY_MSG_CUR_VAL}")
_DISPLAY_MSG_EXP_VAL=$(data_escape_csv "${_DISPLAY_MSG_EXP_VAL}")
printf "%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s${_DISPLAY_SEP}%s\n" \
"${_DISPLAY_HC}" \
"${_DISPLAY_MSG_STC}" \
sources/lib/core/display_json.sh
+113
View File
@@ -0,0 +1,113 @@
#!/usr/bin/env ksh
#******************************************************************************
# @(#) display_json.sh
#******************************************************************************
# @(#) Copyright (C) 2018 by KUDOS BVBA (info@kudos.be). All rights reserved.
#
# This program is a free software; you can redistribute it and/or modify
# it under the same terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
#******************************************************************************
#
# DOCUMENTATION (MAIN)
# -----------------------------------------------------------------------------
# @(#) MAIN: display_json
# DOES: display HC results in JSON format (semi-colon as separator)
# EXPECTS: 1=HC name [string], 2=HC FAIL_ID [string]
# RETURNS: 0
# REQUIRES: init_hc()
#
# -----------------------------------------------------------------------------
# DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
#******************************************************************************
# -----------------------------------------------------------------------------
function display_json
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2018-05-20" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
typeset _DISPLAY_SEP=";"
# ------------------------- CONFIGURATION ends here ---------------------------
# set defaults
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
init_hc "$0" "${_SUPPORTED_PLATFORMS}" "${_VERSION}"
typeset _DISPLAY_HC="$1"
typeset _DISPLAY_FAIL_ID="$2"
typeset _HC_MSG_ENTRY=""
typeset _DISPLAY_MSG_STC=""
typeset _DISPLAY_MSG_TIME=""
typeset _DISPLAY_MSG_TEXT=""
typeset _DISPLAY_MSG_CUR_VAL=""
typeset _DISPLAY_MSG_EXP_VAL=""
typeset _ID_BIT=""
# parse $HC_MSG_VAR
if [[ -n "${HC_MSG_VAR}" ]]
then
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read _DISPLAY_MSG_STC _DISPLAY_MSG_TIME _DISPLAY_MSG_TEXT _DISPLAY_MSG_CUR_VAL _DISPLAY_MSG_EXP_VAL
do
# magically unquote if needed
if [[ -n "${_DISPLAY_MSG_TEXT}" ]]
then
data_contains_string "${_DISPLAY_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_TEXT=$(data_magic_unquote "${_DISPLAY_MSG_TEXT}")
fi
fi
if [[ -n "${_DISPLAY_MSG_CUR_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_CUR_VAL=$(data_magic_unquote "${_DISPLAY_MSG_CUR_VAL}")
fi
fi
if [[ -n "${_DISPLAY_MSG_EXP_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_EXP_VAL=$(data_magic_unquote "${_DISPLAY_MSG_EXP_VAL}")
fi
fi
if (( _DISPLAY_MSG_STC > 0 ))
then
_ID_BIT="${_DISPLAY_FAIL_ID}"
else
_ID_BIT=""
fi
# escape stuff
_DISPLAY_MSG_TEXT=$(data_escape_json "${_DISPLAY_MSG_TEXT}")
_DISPLAY_MSG_CUR_VAL=$(data_escape_json "${_DISPLAY_MSG_CUR_VAL}")
_DISPLAY_MSG_EXP_VAL=$(data_escape_json "${_DISPLAY_MSG_EXP_VAL}")
printf '{"hc":"%s","stc":"%s","time":"%s","fail_id":"%s","text":"%s","current_value":"%s","expected_value":"%s"}\n' \
"${_DISPLAY_HC}" \
"${_DISPLAY_MSG_STC}" \
"${_DISPLAY_MSG_TIME}" \
"${_ID_BIT}" \
"${_DISPLAY_MSG_TEXT}" \
"${_DISPLAY_MSG_CUR_VAL}" \
"${_DISPLAY_MSG_EXP_VAL}"
done
else
ARG_LOG=0 ARG_VERBOSE=1 log "INFO: no HC results to display"
fi
return 0
}
#******************************************************************************
# END of script
#******************************************************************************
sources/lib/core/display_terse.sh
+27 -9
View File
@@ -30,7 +30,7 @@
function display_terse
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2018-05-14" # YYYY-MM-DD
typeset _VERSION="2018-05-20" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
# ------------------------- CONFIGURATION ends here ---------------------------
@@ -54,15 +54,33 @@ if [[ -n "${HC_MSG_VAR}" ]]
then
printf "%-30s\t%s\t%-16s\t%s\n" "HC" "STC" "FAIL ID" "Message"
print "${HC_MSG_VAR}" | while read _HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read _DISPLAY_MSG_STC _DISPLAY_MSG_TIME _DISPLAY_MSG_TEXT _DISPLAY_MSG_CUR_VAL _DISPLAY_MSG_EXP_VAL
do
# split fields (awk is required for multi-char delimiter)
_DISPLAY_MSG_STC=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $1'})
_DISPLAY_MSG_TIME=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $2'})
_DISPLAY_MSG_TEXT=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $3'})
_DISPLAY_MSG_CUR_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $4'})
_DISPLAY_MSG_EXP_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $5'})
# magically unquote if needed
if [[ -n "${_DISPLAY_MSG_TEXT}" ]]
then
data_contains_string "${_DISPLAY_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_TEXT=$(data_magic_unquote "${_DISPLAY_MSG_TEXT}")
fi
fi
if [[ -n "${_DISPLAY_MSG_CUR_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_CUR_VAL=$(data_magic_unquote "${_DISPLAY_MSG_CUR_VAL}")
fi
fi
if [[ -n "${_DISPLAY_MSG_EXP_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_EXP_VAL=$(data_magic_unquote "${_DISPLAY_MSG_EXP_VAL}")
fi
fi
if (( _DISPLAY_MSG_STC > 0 ))
then
_ID_BIT="${_DISPLAY_FAIL_ID}"
sources/lib/core/display_zenoss.sh
+27 -9
View File
@@ -32,7 +32,7 @@
function display_zenoss
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2018-05-14" # YYYY-MM-DD
typeset _VERSION="2018-05-20" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
# ------------------------- CONFIGURATION ends here ---------------------------
@@ -53,15 +53,33 @@ typeset _DISPLAY_MSG_EXP_VAL=""
# parse $HC_MSG_VAR
if [[ -n "${HC_MSG_VAR}" ]]
then
print "${HC_MSG_VAR}" | while read _HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read _DISPLAY_MSG_STC _DISPLAY_MSG_TIME _DISPLAY_MSG_TEXT _DISPLAY_MSG_CUR_VAL _DISPLAY_MSG_EXP_VAL
do
# split fields (awk is required for multi-char delimiter)
_DISPLAY_MSG_STC=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $1'})
_DISPLAY_MSG_TIME=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $2'})
_DISPLAY_MSG_TEXT=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $3'})
_DISPLAY_MSG_CUR_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $4'})
_DISPLAY_MSG_EXP_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $5'})
# magically unquote if needed
if [[ -n "${_DISPLAY_MSG_TEXT}" ]]
then
data_contains_string "${_DISPLAY_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_TEXT=$(data_magic_unquote "${_DISPLAY_MSG_TEXT}")
fi
fi
if [[ -n "${_DISPLAY_MSG_CUR_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_CUR_VAL=$(data_magic_unquote "${_DISPLAY_MSG_CUR_VAL}")
fi
fi
if [[ -n "${_DISPLAY_MSG_EXP_VAL}" ]]
then
data_contains_string "${_DISPLAY_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_DISPLAY_MSG_EXP_VAL=$(data_magic_unquote "${_DISPLAY_MSG_EXP_VAL}")
fi
fi
if (( _DISPLAY_MSG_STC > 0 ))
then
printf "NOK|data1=%s data2=%s data3=%s data4=\"%s\" data5=%s data6=%s\n" \
sources/lib/core/include_core.sh
+162 -49
View File
@@ -32,7 +32,7 @@
function archive_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset HC_NAME="$1"
typeset HC_NAME="${1}"
typeset ARCHIVE_FILE=""
typeset YEAR_MONTH=""
typeset LOG_COUNT=0
@@ -69,7 +69,7 @@ do
# compare with the sorted $HC_LOG
sort ${HC_LOG} >${TMP1_FILE}
comm -23 ${TMP1_FILE} ${ARCHIVE_FILE} 2>/dev/null >${TMP2_FILE}
if [[ -s ${TMP2_FILE} ]]
then
mv ${TMP2_FILE} ${HC_LOG} 2>/dev/null || {
@@ -123,7 +123,7 @@ function die
typeset NOW="$(date '+%d-%h-%Y %H:%M:%S')"
typeset LOG_LINE=""
if [[ -n "$1" ]]
if [[ -n "${1}" ]]
then
if (( ARG_LOG != 0 ))
then
@@ -158,6 +158,7 @@ typeset NOTIFY_OPTS=""
# init global flags for core plugins (no typeset!)
DO_DISPLAY_CSV=0
DO_DISPLAY_INIT=0
DO_DISPLAY_JSON=0
DO_DISPLAY_TERSE=0
DO_DISPLAY_ZENOSS=0
DO_DISPLAY_CUSTOM1=0
@@ -175,6 +176,7 @@ DO_NOTIFY_SMS=0
DO_REPORT_STD=0
HAS_DISPLAY_CSV=0
HAS_DISPLAY_INIT=0
HAS_DISPLAY_JSON=0
HAS_DISPLAY_TERSE=0
HAS_DISPLAY_ZENOSS=0
HAS_DISPLAY_CUSTOM1=0
@@ -205,6 +207,10 @@ do
HAS_DISPLAY_INIT=1
(( ARG_DEBUG != 0 )) && debug "display_init plugin is available"
;;
*display_json.sh)
HAS_DISPLAY_JSON=1
(( ARG_DEBUG != 0 )) && debug "display_json plugin is available"
;;
*display_terse.sh)
HAS_DISPLAY_TERSE=1
(( ARG_DEBUG != 0 )) && debug "display_terse plugin is available"
@@ -291,6 +297,15 @@ then
warn "init plugin for '--display' not present"
fi
;;
json) # json format
if (( HAS_DISPLAY_JSON == 1 ))
then
DO_DISPLAY_JSON=1
ARG_VERBOSE=0
else
warn "json plugin for '--display' not present"
fi
;;
terse) # terse format
if (( HAS_DISPLAY_TERSE == 1 ))
then
@@ -499,7 +514,7 @@ then
if (( ARG_LAST != 0 )) || (( ARG_TODAY != 0 ))
then
ARG_HISTORY=1
fi
fi
fi
if (( DO_REPORT_STD == 0 )) && (( ARG_LAST != 0 ))
then
@@ -525,6 +540,22 @@ fi
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: dump_logs()
# DOES: current STDOUT+STDERR log via log()
# EXPECTS: n/a
# RETURNS: 0
# REQUIRES: n/a
function dump_logs
{
log "=== STDOUT ==="
log "$(<${HC_STDOUT_LOG})"
log "=== STDERR ==="
log "$(<${HC_STDERR_LOG})"
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: exists_hc()
# DOES: check if a HC (function) exists in $FPATH
@@ -534,7 +565,7 @@ return 0
function exists_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset EXISTS_HC="$1"
typeset EXISTS_HC="${1}"
typeset FDIR=""
typeset EXISTS_RC=0
@@ -561,7 +592,7 @@ return ${EXISTS_RC}
function find_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset FIND_HC="$1"
typeset FIND_HC="${1}"
typeset FIND_PATH=""
typeset FDIR=""
@@ -582,7 +613,7 @@ return 0
function handle_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset HC_NAME="$1"
typeset HC_NAME="${1}"
typeset HC_STDOUT_LOG_SHORT=""
typeset HC_STDERR_LOG_SHORT=""
typeset HC_MSG_ENTRY=""
@@ -596,7 +627,7 @@ typeset ALL_MSG_STC=0
if [[ -s ${HC_MSG_FILE} ]]
then
# load messages file into memory
# load messages file into memory
# do not use array: max 1024 items in ksh88; regular variable is only 32-bit memory limited
HC_MSG_VAR=$(<${HC_MSG_FILE})
@@ -635,6 +666,15 @@ then
else
warn "display_init plugin is not available, cannot display_results!"
fi
elif (( DO_DISPLAY_JSON == 1 ))
then
if (( HAS_DISPLAY_JSON == 1 ))
then
# call plugin
display_json "${HC_NAME}" "${HC_FAIL_ID}"
else
warn "display_json plugin is not available, cannot display_results!"
fi
elif (( DO_DISPLAY_TERSE == 1 ))
then
if (( HAS_DISPLAY_TERSE == 1 ))
@@ -738,22 +778,40 @@ then
# default STDOUT
if (( ARG_VERBOSE != 0 ))
then
print "${HC_MSG_VAR}" | while read HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read ONE_MSG_STC ONE_MSG_TIME ONE_MSG_TEXT ONE_MSG_CUR_VAL ONE_MSG_EXP_VAL
do
# split fields (awk is required for mult-char delimiter)
ONE_MSG_STC=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $1'})
ONE_MSG_TIME=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $2'})
ONE_MSG_TEXT=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $3'})
ONE_MSG_CUR_VAL=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $4'})
ONE_MSG_EXP_VAL=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $5'})
printf "%s" "INFO: ${HC_NAME} [STC=${ONE_MSG_STC}]: ${ONE_MSG_TEXT}"
# magically unquote if needed
if [[ -n "${ONE_MSG_TEXT}" ]]
then
data_contains_string "${ONE_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_TEXT=$(data_magic_unquote "${ONE_MSG_TEXT}")
fi
fi
if [[ -n "${ONE_MSG_CUR_VAL}" ]]
then
data_contains_string "${ONE_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_CUR_VAL=$(data_magic_unquote "${ONE_MSG_CUR_VAL}")
fi
fi
if [[ -n "${ONE_MSG_EXP_VAL}" ]]
then
data_contains_string "${ONE_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_EXP_VAL=$(data_magic_unquote "${ONE_MSG_EXP_VAL}")
fi
fi
printf "%s" "INFO: ${HC_NAME} [STC=${ONE_MSG_STC}]: ${ONE_MSG_TEXT}"
if (( ONE_MSG_STC != 0 ))
then
printf " %s\n" "[FAIL_ID=${HC_FAIL_ID}]"
else
printf "\n"
fi
fi
done
fi
fi
@@ -763,15 +821,33 @@ fi
if (( ARG_LOG != 0 ))
then
# log routine (combined STC=0 or <>0)
print "${HC_MSG_VAR}" | while read HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read ONE_MSG_STC ONE_MSG_TIME ONE_MSG_TEXT ONE_MSG_CUR_VAL ONE_MSG_EXP_VAL
do
# split fields (awk is required for multi-char delimiter)
ONE_MSG_STC=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $1'})
ONE_MSG_TIME=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $2'})
ONE_MSG_TEXT=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $3'})
ONE_MSG_CUR_VAL=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $4'})
ONE_MSG_EXP_VAL=$(print "${HC_MSG_ENTRY}" | awk -F "${MSG_SEP}" '{ print $5'})
# magically unquote if needed
if [[ -n "${ONE_MSG_TEXT}" ]]
then
data_contains_string "${ONE_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_TEXT=$(data_magic_unquote "${ONE_MSG_TEXT}")
fi
fi
if [[ -n "${ONE_MSG_CUR_VAL}" ]]
then
data_contains_string "${ONE_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_CUR_VAL=$(data_magic_unquote "${ONE_MSG_CUR_VAL}")
fi
fi
if [[ -n "${ONE_MSG_EXP_VAL}" ]]
then
data_contains_string "${ONE_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
ONE_MSG_EXP_VAL=$(data_magic_unquote "${ONE_MSG_EXP_VAL}")
fi
fi
printf "%s${LOG_SEP}%s${LOG_SEP}%s${LOG_SEP}%s${LOG_SEP}" \
"${ONE_MSG_TIME}" \
"${HC_NAME}" \
@@ -794,20 +870,20 @@ then
then
# organize logs in sub-directories: YYYY/MM
mkdir -p "${EVENTS_DIR}/${DIR_PREFIX}/${HC_FAIL_ID}" >/dev/null 2>&1 || \
die "failed to create event directory at $1"
die "failed to create event directory at ${1}"
if [[ -f ${HC_STDOUT_LOG} ]]
then
# cut off the path and the .$$ part from the file location
HC_STDOUT_LOG_SHORT="${HC_STDOUT_LOG##*/}"
mv ${HC_STDOUT_LOG} "${EVENTS_DIR}/${DIR_PREFIX}/${HC_FAIL_ID}/${HC_STDOUT_LOG_SHORT%.*}" >/dev/null 2>&1 || \
die "failed to move ${HC_STDOUT_LOG} to event directory at $1"
die "failed to move ${HC_STDOUT_LOG} to event directory at ${1}"
fi
if [[ -f ${HC_STDERR_LOG} ]]
then
# cut off the path and the .$$ part from the file location
HC_STDERR_LOG_SHORT="${HC_STDERR_LOG##*/}"
mv ${HC_STDERR_LOG} "${EVENTS_DIR}/${DIR_PREFIX}/${HC_FAIL_ID}/${HC_STDERR_LOG_SHORT%.*}" >/dev/null 2>&1 || \
die "failed to move ${HC_STDERR_LOG} to event directory at $1"
die "failed to move ${HC_STDERR_LOG} to event directory at ${1}"
fi
fi
@@ -856,7 +932,7 @@ else
return ${HC_STC_RC}
fi
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: handle_timeout()
# DOES: kill long running background jobs
@@ -900,6 +976,13 @@ case "${REPORT_STYLE}" in
ARG_VERBOSE=0
fi
;;
json|JSON) # json format
if (( HAS_DISPLAY_JSON == 1 ))
then
DO_DISPLAY_JSON=1
ARG_VERBOSE=0
fi
;;
terse|TERSE) # terse format
if (( HAS_DISPLAY_TERSE == 1 ))
then
@@ -1008,8 +1091,8 @@ return 0
function init_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset HC_PLATFORMS="$2"
typeset HC_VERSION="$3"
typeset HC_PLATFORMS="${2}"
typeset HC_VERSION="${3}"
typeset HC_OK=0
# check platform (don't use a pattern comparison here (~! mksh/pdksh))
@@ -1020,10 +1103,10 @@ HC_OK=$(print "${HC_PLATFORMS}" | grep -c "${OS_NAME}" 2>/dev/null)
case "${HC_VERSION}" in
[0-2][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9])
# OK
(( ARG_DEBUG != 0 )) && debug "HC plugin $1 has version ${HC_VERSION}"
(( ARG_DEBUG != 0 )) && debug "HC plugin ${1} has version ${HC_VERSION}"
;;
*)
die "version of the HC plugin $1 is not in YYYY-MM-DD format (${HC_VERSION})"
die "version of the HC plugin ${1} is not in YYYY-MM-DD format (${HC_VERSION})"
;;
esac
@@ -1039,7 +1122,7 @@ return 0
function is_scheduled
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset CRON_HC="$1"
typeset CRON_HC="${1}"
typeset CRON_COUNT=0
typeset CRON_SYS_LOCATIONS='/etc/crontab /etc/cron.d/*'
typeset CRON_ANACRON_LOCATIONS='/etc/anacrontab /etc/cron.*'
@@ -1077,7 +1160,7 @@ return ${CRON_COUNT}
function list_core
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset FACTION="$1"
typeset FACTION="${1}"
typeset FCONFIG=""
typeset FDIR=""
typeset FNAME=""
@@ -1099,6 +1182,8 @@ do
# exclude core helper librar(y|ies)
ls -1 ${FDIR}/*.sh 2>/dev/null | grep -v "include_" | sort 2>/dev/null | while read -r FFILE
do
# reset state
FSTATE="enabled"
# find function name but skip helper functions in the plug-in file (function _name)
FNAME=$(grep -E -e "^function[[:space:]]+[^_]" "${FFILE}" 2>&1)
# look for version string (cut off comments but don't use [:space:] in tr)
@@ -1163,8 +1248,8 @@ return 0
function list_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset FACTION="$1"
typeset FNEEDLE="$2"
typeset FACTION="${1}"
typeset FNEEDLE="${2}"
typeset FCONFIG=""
typeset FDIR=""
typeset FNAME=""
@@ -1215,6 +1300,7 @@ do
else
FSTATE="enabled"
fi
# reset state when unlinked
[[ -h ${FFILE%%.*} ]] || FSTATE="unlinked"
# check scheduling
is_scheduled "${FNAME#function *}"
@@ -1278,7 +1364,7 @@ function log
typeset NOW="$(date '+%d-%h-%Y %H:%M:%S')"
typeset LOG_LINE=""
if [[ -n "$1" ]]
if [[ -n "${1}" ]]
then
if (( ARG_LOG != 0 ))
then
@@ -1310,20 +1396,47 @@ return 0
function log_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset HC_NAME="$1"
typeset HC_STC=$2
typeset HC_MSG="$3"
typeset HC_NAME="${1}"
typeset HC_STC=${2}
typeset HC_MSG="${3}"
typeset HC_NOW="$(date '+%Y-%m-%d %H:%M:%S' 2>/dev/null)"
typeset HC_MSG_CUR_VAL=""
typeset HC_MSG_EXP_VAL=""
# assign optional parameters
[[ -n "$3" ]] && HC_MSG_TEXT=$(data_newline2hash "$3")
[[ -n "$4" ]] && HC_MSG_CUR_VAL=$(data_newline2hash "$4")
[[ -n "$5" ]] && HC_MSG_EXP_VAL=$(data_newline2hash "$5")
# assign optional parameters; magically quote if necessary
if [[ -n "${3}" ]]
then
data_contains_string "${3}" "${MSG_SEP}"
if (( $? > 0 ))
then
HC_MSG_TEXT=$(data_magic_quote "${3}")
else
HC_MSG_TEXT="${3}"
fi
fi
if [[ -n "${4}" ]]
then
data_contains_string "${4}" "${MSG_SEP}"
if (( $? > 0 ))
then
HC_CUR_VAL=$(data_magic_quote "${4}")
else
HC_CUR_VAL="${4}"
fi
fi
if [[ -n "${5}" ]]
then
data_contains_string "${5}" "${MSG_SEP}"
if (( $? > 0 ))
then
HC_MSG_EXP_VAL=$(data_magic_quote "${5}")
else
HC_MSG_EXP_VAL="${5}"
fi
fi
# save the HC failure message for now
print "${HC_STC}${MSG_SEP}${HC_NOW}${MSG_SEP}${HC_MSG}${MSG_SEP}${HC_MSG_CUR_VAL}${MSG_SEP}${HC_MSG_EXP_VAL}" \
print "${HC_STC}${MSG_SEP}${HC_NOW}${MSG_SEP}${HC_MSG_TEXT}${MSG_SEP}${HC_MSG_CUR_VAL}${MSG_SEP}${HC_MSG_EXP_VAL}" \
>>${HC_MSG_FILE}
return 0
@@ -1430,7 +1543,7 @@ return 0
function stat_hc
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset STAT_HC="$1"
typeset STAT_HC="${1}"
typeset STAT_RC=1 # default: enabled
[[ -f "${STATE_PERM_DIR}/${STAT_HC}.disabled" ]] && STAT_RC=0
@@ -1450,7 +1563,7 @@ function warn
typeset NOW="$(date '+%d-%h-%Y %H:%M:%S')"
typeset LOG_LINE=""
if [[ -n "$1" ]]
if [[ -n "${1}" ]]
then
if (( ARG_LOG != 0 ))
then
sources/lib/core/include_data.sh
+86 -16
View File
@@ -76,8 +76,8 @@ function data_contains_string
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _HAYSTACK="$1"
typeset _NEEDLE="$2"
typeset _HAYSTACK="${1}"
typeset _NEEDLE="${2}"
typeset _RC=0
[[ "${_HAYSTACK#*${_NEEDLE}}" = "${_HAYSTACK}" ]] || _RC=1
@@ -85,11 +85,81 @@ typeset _RC=0
return ${_RC}
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: data_magic_quote()
# DOES: magically quotes a needle in a string (default needle is: %)
# EXPECTS: to be magically quoted [string]; $2=needle [string]
# OUTPUTS: magically quoted [string]
# RETURNS: n/a
# REQUIRES: n/a
function data_magic_quote
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _SEP="${2:-%}"
typeset _MAGIC="${MAGIC:-!_!}"
print -R "${1}" 2>/dev/null | sed "s/${_SEP}/${_MAGIC}/g" 2>/dev/null
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: data_magic_unquote()
# DOES: magically unquotes a needle in a string (default needle is: %)
# EXPECTS: to be magically unquoted [string]; $2=needle [string]
# OUTPUTS: magically unquoted [string]
# RETURNS: n/a
# REQUIRES: n/a
function data_magic_unquote
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _SEP="${2:-%}"
typeset _MAGIC="${MAGIC:-!_!}"
print -R "${1}" 2>/dev/null | sed "s/${_MAGIC}/${_SEP}/g" 2>/dev/null
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: data_escape_csv()
# DOES: escapes semi-colons
# EXPECTS: to be escaped [string]
# OUTPUTS: escaped [string]
# RETURNS: n/a
# REQUIRES: n/a
function data_escape_csv
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
print -R "${1}" 2>/dev/null | sed 's#\([;]\)#\\\1#g' 2>/dev/null
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: data_escape_json()
# DOES: escapes double quotes and backslashes
# EXPECTS: to be escaped [string]
# OUTPUTS: escaped [string]
# RETURNS: n/a
# REQUIRES: n/a
function data_escape_json
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _NEEDLE='[\"]'
print -R "${1}" 2>/dev/null | sed 's#\(["\]\)#\\\1#g' 2>/dev/null
return 0
}
# -----------------------------------------------------------------------------
# @(#) FUNCTION: data_decomma()
# DOES: remove comma's
# EXPECTS: [string] with comma's
# OUTPUTS: [string] without comma's
# DOES: remove commas
# EXPECTS: [string] with commas
# OUTPUTS: [string] without commas
# RETURNS: 0
# REQUIRES: n/a
function data_decomma
@@ -478,7 +548,7 @@ return 0
function data_dot2ip
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _DOT="$1"
typeset _DOT="${1}"
typeset _IP=0
typeset _OLD_IFS="${IFS}"
@@ -507,7 +577,7 @@ return 0
function data_ip2dot
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _IP="$1"
typeset _IP="${1}"
typeset _W=""
typeset _X=""
typeset _Y=""
@@ -534,7 +604,7 @@ return 0
function data_bits2mask
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _BITS=$1
typeset _BITS=${1}
typeset _MAX=4294967296
typeset _OFFSET=0
@@ -590,7 +660,7 @@ return 0
function data_mask2bits
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _MASK="$1"
typeset _MASK="${1}"
typeset -i _I=32
while (( _I > 0 ))
@@ -611,7 +681,7 @@ return 0
function data_is_ipv4
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _IP="$1"
typeset _IP="${1}"
typeset _RC=0
_RC=$(print "${_IP}" | grep -c -E -e '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' 2>/dev/null)
@@ -636,12 +706,12 @@ return ${_RC}
function data_date2epoch
{
(( ARG_DEBUG != 0 && ARG_DEBUG_LEVEL > 0 )) && set "${DEBUG_OPTS}"
typeset _YEAR="$1"
typeset _MONTH="$2"
typeset _DAY="$3"
typeset _HOUR="$4"
typeset _MINUTE="$5"
typeset _SECOND="$6"
typeset _YEAR="${1}"
typeset _MONTH="${2}"
typeset _DAY="${3}"
typeset _HOUR="${4}"
typeset _MINUTE="${5}"
typeset _SECOND="${6}"
typeset _DAYS_ACC
typeset _YEAR_DAY
typeset _EPOCH
sources/lib/core/notify_mail.sh
+27 -9
View File
@@ -30,7 +30,7 @@
function notify_mail
{
# ------------------------- CONFIGURATION starts here -------------------------
typeset _VERSION="2018-05-14" # YYYY-MM-DD
typeset _VERSION="2018-05-20" # YYYY-MM-DD
typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux" # uname -s match
# ------------------------- CONFIGURATION ends here ---------------------------
@@ -133,15 +133,33 @@ $(sed 's/[\$`]/\\&/g;s/<## @\([^ ]*\) ##>/${\1}/g' <${_MAIL_HEADER_TPL})
__EOT" >>${_TMP1_MAIL_FILE}
# create body part (from $HC_MSG_VAR)
print "${HC_MSG_VAR}" | while read _HC_MSG_ENTRY
print "${HC_MSG_VAR}" | while IFS=${MSG_SEP} read _MAIL_MSG_STC _MAIL_MSG_TIME _DISP_MAIL_MSG_TEXTLAY_MSG_TEXT _MAIL_MSG_CUR_VAL _MAIL_MSG_EXP_VAL
do
# split fields (awk is required for multi-char delimiter)
_MAIL_MSG_STC=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $1'})
_MAIL_MSG_TIME=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $2'})
_MAIL_MSG_TEXT=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $3'})
_MAIL_MSG_CUR_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $4'})
_MAIL_MSG_EXP_VAL=$(print "${_HC_MSG_ENTRY}" | awk -F "%%" '{ print $5'})
# magically unquote if needed
if [[ -n "${_MAIL_MSG_TEXT}" ]]
then
data_contains_string "${_MAIL_MSG_TEXT}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_MAIL_MSG_TEXT=$(data_magic_unquote "${_MAIL_MSG_TEXT}")
fi
fi
if [[ -n "${_MAIL_MSG_CUR_VAL}" ]]
then
data_contains_string "${_MAIL_MSG_CUR_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_MAIL_MSG_CUR_VAL=$(data_magic_unquote "${_MAIL_MSG_CUR_VAL}")
fi
fi
if [[ -n "${_MAIL_MSG_EXP_VAL}" ]]
then
data_contains_string "${_MAIL_MSG_EXP_VAL}" "${MAGIC_QUOTE}"
if (( $? > 0 ))
then
_MAIL_MSG_EXP_VAL=$(data_magic_unquote "${_MAIL_MSG_EXP_VAL}")
fi
fi
if (( _MAIL_MSG_STC > 0 ))
then
_HC_BODY=$(printf "%s\n%s\n" "${_HC_BODY}" "${_MAIL_MSG_TEXT}")