fix: message impr

This commit is contained in:
2023-06-10 09:59:24 +01:00
parent feeaf2e9d5
commit 90e90d64a2

View File

@@ -24,13 +24,13 @@ if [[ ! -z "$INFLUXDB_CLIENT_HOSTNAME" ]]; then
UNSCAPED=$INFLUXDB_CLIENT_HOSTNAME UNSCAPED=$INFLUXDB_CLIENT_HOSTNAME
escape_tag_str escape_tag_str
TAGS="${TAGS},host=${ESCAPED}" TAGS="${TAGS},host=${ESCAPED}"
MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE} ${INFLUXDB_CLIENT_HOSTNAME}" MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE}${INFLUXDB_CLIENT_HOSTNAME} "
else else
if [[ ! -z "$HOSTNAME" ]]; then if [[ ! -z "$HOSTNAME" ]]; then
UNSCAPED=$HOSTNAME UNSCAPED=$HOSTNAME
escape_tag_str escape_tag_str
TAGS="${TAGS},host=${ESCAPED}" TAGS="${TAGS},host=${ESCAPED}"
MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE} ${HOSTNAME}" MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE}${HOSTNAME} "
fi fi
fi fi
@@ -44,21 +44,21 @@ if [[ ! -z "$DUPLICATI__OPERATIONNAME" ]]; then
UNSCAPED=$DUPLICATI__OPERATIONNAME UNSCAPED=$DUPLICATI__OPERATIONNAME
escape_tag_str escape_tag_str
TAGS="${TAGS},operationName=${ESCAPED}" TAGS="${TAGS},operationName=${ESCAPED}"
MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE} ${DUPLICATI__OPERATIONNAME}" MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE}${DUPLICATI__OPERATIONNAME} "
fi fi
if [[ ! -z "$DUPLICATI__backup_name" ]]; then if [[ ! -z "$DUPLICATI__backup_name" ]]; then
UNSCAPED=$DUPLICATI__backup_name UNSCAPED=$DUPLICATI__backup_name
escape_tag_str escape_tag_str
TAGS="${TAGS},backupName=${ESCAPED}" TAGS="${TAGS},backupName=${ESCAPED}"
MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE} ${DUPLICATI__backup_name}" MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE}${DUPLICATI__backup_name} "
fi fi
if [[ ! -z "$DUPLICATI__PARSED_RESULT" ]]; then if [[ ! -z "$DUPLICATI__PARSED_RESULT" ]]; then
UNSCAPED=$DUPLICATI__PARSED_RESULT UNSCAPED=$DUPLICATI__PARSED_RESULT
escape_tag_str escape_tag_str
TAGS="${TAGS},status=${ESCAPED}" TAGS="${TAGS},status=${ESCAPED}"
MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE} ${DUPLICATI__PARSED_RESULT}" MESSAGE_FIELD_VALUE="${MESSAGE_FIELD_VALUE}${DUPLICATI__PARSED_RESULT} "
fi fi
if [[ ! -z "$DUPLICATI__RESULTFILE" ]]; then if [[ ! -z "$DUPLICATI__RESULTFILE" ]]; then
@@ -73,7 +73,7 @@ if [[ ! -z "$DUPLICATI__LOCALPATH" ]]; then
TAGS="${TAGS},localPath=${ESCAPED}" TAGS="${TAGS},localPath=${ESCAPED}"
fi fi
FIELDS="message=\"Duplicati ${MESSAGE_FIELD_VALUE}\"" FIELDS="message=\"${MESSAGE_FIELD_VALUE}\""
#echo $TAGS #echo $TAGS
curl --request POST \ curl --request POST \