From 3837beae97ee842d3108f10bf9ef8d4a668ca69e Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Fri, 3 Nov 2023 18:11:58 -0700 Subject: [PATCH] feat - Add checksum time, and hash output to Zabbix --- README.md | 2 +- install/assets/functions/10-db-backup | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f4575d..777d024 100644 --- a/README.md +++ b/README.md @@ -438,7 +438,7 @@ Otherwise, override them per backup job. Additional backup jobs can be scheduled | `DB01_EXTRA_ENUMERATION_OPTS` | Pass extra arguments to the database enumeration command only, add them here e.g. `--extra-command` | | | `DB01_EXTRA_OPTS` | Pass extra arguments to the backup and database enumeration command, add them here e.g. `--extra-command` | | | `DB01_LOG_LEVEL` | Log output on screen and in files `INFO` `NOTICE` `ERROR` `WARN` `DEBUG` | `debug` | -| `DEFAULT_RESOURCE_OPTIMIZED` | Perform operations at a lower priority to the CPU scheduler | `FALSE` | +| `DB01_RESOURCE_OPTIMIZED` | Perform operations at a lower priority to the CPU scheduler | `FALSE` | | `DB01_SKIP_AVAILABILITY_CHECK` | Before backing up - skip connectivity check | `FALSE` | ##### Compression Options diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index 23d02dc..7954f4e 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -998,12 +998,16 @@ generate_checksum() { ;; esac + checksum_routines_start_time=$(date +'%s') write_log notice "Generating ${checksum_extension^^} for '${target}'" cd "${TEMP_PATH}" run_as_user ${checksum_command} "${target}" | run_as_user tee "${target}"."${checksum_extension}" > /dev/null chmod ${backup_job_filesystem_permission} "${target}"."${checksum_extension}" checksum_value=$(run_as_user cat "${target}"."${checksum_extension}" | awk '{print $1}') + checksum_routines_finish_time=$(date +'%s') + checksum_routines_total_time=$(echo $((checksum_routines_finish_time-checksum_routines_start_time))) write_log debug "${checksum_extension^^}: ${checksum_value} - ${target}" + write_log debug "Checksum routines time taken: $(echo ${checksum_routines_total_time} | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')" else write_log error "Skipping Checksum creation because backup did not complete successfully" fi