From 8b7f7dcf09fd8a696f907debc704224d8ef7b7c6 Mon Sep 17 00:00:00 2001 From: Tomi Eckert Date: Thu, 25 Sep 2025 18:15:01 +0200 Subject: [PATCH] update state-based notifications for monitor --- monitor/monitor.conf | 4 +- monitor/monitor.sh | 106 ++++++++++++++++++++++++++++++++++--------- packages.conf | 2 +- 3 files changed, 88 insertions(+), 24 deletions(-) diff --git a/monitor/monitor.conf b/monitor/monitor.conf index 70d161d..280432c 100644 --- a/monitor/monitor.conf +++ b/monitor/monitor.conf @@ -2,13 +2,13 @@ # --- Company Information --- # Used to identify which company the alert is for. -COMPANY_NAME="Your Company Name" +COMPANY_NAME="Company" # --- Notification Settings --- # Your ntfy.sh topic URL NTFY_TOPIC_URL="https://ntfy.technopunk.space/sap" # Your ntfy.sh bearer token (if required) -NTFY_TOKEN="your_ntfy_token_here" +NTFY_TOKEN="tk_xxxxx" # --- HANA Connection Settings --- # Full path to the sapcontrol executable diff --git a/monitor/monitor.sh b/monitor/monitor.sh index 1d39200..b253d85 100644 --- a/monitor/monitor.sh +++ b/monitor/monitor.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Version: 1.1.1 +# Version: 1.2.0 # ============================================================================= # SAP HANA Monitoring Script # @@ -28,21 +28,71 @@ if [ ! -f "$CONFIG_FILE" ]; then fi source "$CONFIG_FILE" +STATE_DIR="${SCRIPT_DIR}/monitor_state" +mkdir -p "${STATE_DIR}" + +# Helper functions for state management +get_state() { + local key="$1" + if [ -f "${STATE_DIR}/${key}.state" ]; then + cat "${STATE_DIR}/${key}.state" + else + echo "" + fi +} + +set_state() { + local key="$1" + local value="$2" + echo "$value" > "${STATE_DIR}/${key}.state" +} + HOSTNAME=$(hostname) SQL_QUERY="SELECT b.host, b.service_name, a.state, count(*) FROM PUBLIC.M_LOG_SEGMENTS a JOIN PUBLIC.M_SERVICES b ON (a.host = b.host AND a.port = b.port) GROUP BY b.host, b.service_name, a.state;" -send_notification() { - local title="$1" - local message="$2" - local full_message="[${COMPANY_NAME} | ${HOSTNAME}] ${message}" - curl -H "Authorization: Bearer ${NTFY_TOKEN}" -H "Title: ${title}" -d "${full_message}" "${NTFY_TOPIC_URL}" > /dev/null 2>&1 +send_notification_if_changed() { + local alert_key="$1" + local title_prefix="$2" # e.g., "HANA Process" + local current_message="$3" + local is_alert_condition="$4" # "true" or "false" + local current_value="$5" # The value to store as state (e.g., "85%", "GREEN", "ALERT") + + local previous_value=$(get_state "${alert_key}") + + if [ "$current_value" != "$previous_value" ]; then + local full_title="" + local full_message="" + + if [ "$is_alert_condition" == "true" ]; then + full_title="${title_prefix} Alert" + full_message="🚨 Critical: ${current_message}" + else + # Check if it was previously an alert (i.e., previous_value was not "OK") + if [ -n "$previous_value" ] && [ "$previous_value" != "OK" ]; then + full_title="${title_prefix} Resolved" + full_message="✅ Resolved: ${current_message}" + else + # No alert, and no previous alert to resolve, so just update state silently + set_state "${alert_key}" "$current_value" + echo "ℹī¸ State for ${alert_key} updated to ${current_value}. No notification sent." + return + fi + fi + + local final_message="[${COMPANY_NAME} | ${HOSTNAME}] ${full_message}" + curl -H "Authorization: Bearer ${NTFY_TOKEN}" -H "Title: ${full_title}" -d "${final_message}" "${NTFY_TOPIC_URL}" > /dev/null 2>&1 + set_state "${alert_key}" "$current_value" + echo "🔔 Notification sent for ${alert_key}: ${full_message}" + else + echo "ℹī¸ State for ${alert_key} unchanged. No notification sent." + fi } # --- HANA Process Status --- echo "⚙ī¸ Checking HANA process status..." if [ ! -x "$SAPCONTROL_PATH" ]; then echo "❌ Error: sapcontrol not found or not executable at ${SAPCONTROL_PATH}" >&2 - send_notification "HANA Monitor Error" "❌ Error: sapcontrol not found or not executable at ${SAPCONTROL_PATH}" + send_notification_if_changed "hana_sapcontrol_path" "HANA Monitor Error" "sapcontrol not found or not executable at ${SAPCONTROL_PATH}" "true" "SAPCONTROL_ERROR" exit 1 fi @@ -51,23 +101,28 @@ non_green_processes=$("${SAPCONTROL_PATH}" -nr "${HANA_INSTANCE_NR}" -function G if [ -n "$non_green_processes" ]; then echo "🚨 Alert: One or more HANA processes are not running!" >&2 echo "$non_green_processes" >&2 - send_notification "HANA Process Alert" "🚨 Critical: One or more HANA processes are not GREEN. Problem processes: ${non_green_processes}" + send_notification_if_changed "hana_processes" "HANA Process" "One or more HANA processes are not GREEN. Problem processes: ${non_green_processes}" "true" "PROCESS_ALERT:${non_green_processes}" exit 1 # Exit early as other checks might fail +else + send_notification_if_changed "hana_processes" "HANA Process" "All HANA processes are GREEN." "false" "OK" + echo "✅ Success! All HANA processes are GREEN." fi -echo "✅ Success! All HANA processes are GREEN." # --- Disk Space Monitoring --- echo "ℹī¸ Checking disk usage..." for dir in "${DIRECTORIES_TO_MONITOR[@]}"; do if [ ! -d "$dir" ]; then echo "⚠ī¸ Warning: Directory '$dir' not found. Skipping." >&2 + send_notification_if_changed "disk_dir_not_found_${dir//\//_}" "HANA Disk Warning" "Directory '$dir' not found." "true" "DIR_NOT_FOUND" continue fi usage=$(df -h "$dir" | awk 'NR==2 {print $5}' | sed 's/%//') echo " - ${dir} is at ${usage}%" if (( $(echo "$usage > $DISK_USAGE_THRESHOLD" | bc -l) )); then echo "🚨 Alert: ${dir} usage is at ${usage}% which is above the ${DISK_USAGE_THRESHOLD}% threshold." >&2 - send_notification "HANA Disk Alert" "🚨 Critical: Disk usage for ${dir} is at ${usage}%." + send_notification_if_changed "disk_usage_${dir//\//_}" "HANA Disk" "Disk usage for ${dir} is at ${usage}%." "true" "${usage}%" + else + send_notification_if_changed "disk_usage_${dir//\//_}" "HANA Disk" "Disk usage for ${dir} is at ${usage}% (below threshold)." "false" "OK" fi done @@ -75,14 +130,14 @@ done echo "⚙ī¸ Executing HANA SQL query..." if [ ! -x "$HDBSQL_PATH" ]; then echo "❌ Error: hdbsql not found or not executable at ${HDBSQL_PATH}" >&2 - send_notification "HANA Monitor Error" "❌ Error: hdbsql not found or not executable at ${HDBSQL_PATH}" + send_notification_if_changed "hana_hdbsql_path" "HANA Monitor Error" "hdbsql not found or not executable at ${HDBSQL_PATH}" "true" "HDBSQL_ERROR" exit 1 fi readarray -t sql_output < <("$HDBSQL_PATH" -U "$HANA_USER_KEY" -c ";" "$SQL_QUERY" 2>&1) if [ $? -ne 0 ]; then echo "❌ Failure! The hdbsql command failed. Please check logs." >&2 error_message=$(printf '%s\n' "${sql_output[@]}") - send_notification "HANA Monitor Error" "❌ Failure! The hdbsql command failed. Details: ${error_message}" + send_notification_if_changed "hana_hdbsql_command" "HANA Monitor Error" "The hdbsql command failed. Details: ${error_message}" "true" "HDBSQL_COMMAND_FAILED" exit 1 fi @@ -108,19 +163,26 @@ echo "ℹī¸ Free Segments: ${free_segments}" if [ $total_segments -eq 0 ]; then echo "⚠ī¸ Warning: No log segments found. Skipping percentage checks." >&2 + send_notification_if_changed "hana_log_segments_total" "HANA Log Segment Warning" "No log segments found. Skipping percentage checks." "true" "NO_LOG_SEGMENTS" exit 0 +else + send_notification_if_changed "hana_log_segments_total" "HANA Log Segment" "Log segments found." "false" "OK" fi truncated_percentage=$((truncated_segments * 100 / total_segments)) if (( $(echo "$truncated_percentage > $TRUNCATED_PERCENTAGE_THRESHOLD" | bc -l) )); then echo "🚨 Alert: ${truncated_percentage}% of log segments are 'Truncated'." >&2 - send_notification "HANA Log Segment Alert" "🚨 Alert: ${truncated_percentage}% of HANA log segments are in 'Truncated' state." + send_notification_if_changed "hana_log_truncated" "HANA Log Segment" "${truncated_percentage}% of HANA log segments are in 'Truncated' state." "true" "${truncated_percentage}%" +else + send_notification_if_changed "hana_log_truncated" "HANA Log Segment" "${truncated_percentage}% of HANA log segments are in 'Truncated' state (below threshold)." "false" "OK" fi free_percentage=$((free_segments * 100 / total_segments)) if (( $(echo "$free_percentage < $FREE_PERCENTAGE_THRESHOLD" | bc -l) )); then echo "🚨 Alert: Only ${free_percentage}% of log segments are 'Free'." >&2 - send_notification "HANA Log Segment Alert" "🚨 Alert: Only ${free_percentage}% of HANA log segments are in 'Free' state." + send_notification_if_changed "hana_log_free" "HANA Log Segment" "Only ${free_percentage}% of HANA log segments are in 'Free' state." "true" "${free_percentage}%" +else + send_notification_if_changed "hana_log_free" "HANA Log Segment" "Only ${free_percentage}% of HANA log segments are in 'Free' state (above threshold)." "false" "OK" fi echo "ℹī¸ Checking last successful data backup status..." @@ -131,9 +193,9 @@ last_backup_date=$("$HDBSQL_PATH" -U "$HANA_USER_KEY" -j -a -x \ if [[ -z "$last_backup_date" ]]; then # No successful backup found at all - local message="🚨 Critical: No successful complete data backup found for ${COMPANY_NAME} HANA." - echo "$message" - send_notification "HANA Backup Alert" "$message" + local message="No successful complete data backup found for ${COMPANY_NAME} HANA." + echo "🚨 Critical: ${message}" + send_notification_if_changed "hana_backup_status" "HANA Backup" "${message}" "true" "NO_BACKUP" return fi @@ -146,11 +208,13 @@ age_seconds=$((current_epoch - last_backup_epoch)) age_hours=$((age_seconds / 3600)) if (( age_seconds > threshold_seconds )); then - local message="🚨 Critical: Last successful HANA backup for ${COMPANY_NAME} is ${age_hours} hours old, which exceeds the threshold of ${BACKUP_THRESHOLD_HOURS} hours. Last backup was on: ${last_backup_date}." - echo "$message" - send_notification "HANA Backup Alert" "$message" + local message="Last successful HANA backup for ${COMPANY_NAME} is ${age_hours} hours old, which exceeds the threshold of ${BACKUP_THRESHOLD_HOURS} hours. Last backup was on: ${last_backup_date}." + echo "🚨 Critical: ${message}" + send_notification_if_changed "hana_backup_status" "HANA Backup" "${message}" "true" "${age_hours}h" else - echo "✅ Success! Last successful backup is ${age_hours} hours old (Threshold: ${BACKUP_THRESHOLD_HOURS} hours)." + local message="Last successful backup is ${age_hours} hours old (Threshold: ${BACKUP_THRESHOLD_HOURS} hours)." + echo "✅ Success! ${message}" + send_notification_if_changed "hana_backup_status" "HANA Backup" "${message}" "false" "OK" fi echo "✅ Success! HANA monitoring check complete." diff --git a/packages.conf b/packages.conf index 76c05c2..56df2ea 100644 --- a/packages.conf +++ b/packages.conf @@ -10,7 +10,7 @@ declare -A SCRIPT_PACKAGES # Format: short_name="Display Name|Version|Description|URL1 URL2..." SCRIPT_PACKAGES["aurora"]="Aurora Suite|2.1.0|A collection of scripts for managing Aurora database instances.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/aurora/aurora.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/aurora/aurora.conf" SCRIPT_PACKAGES["backup"]="Backup Suite|1.0.5|A comprehensive script for backing up system files and databases.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.conf" -SCRIPT_PACKAGES["monitor"]="Monitor Suite|1.1.1|Scripts for monitoring system health and performance metrics.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.conf" +SCRIPT_PACKAGES["monitor"]="Monitor Suite|1.2.0|Scripts for monitoring system health and performance metrics.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.conf" SCRIPT_PACKAGES["keymanager"]="Key Manager|1.2.1|A utility for managing HDB user keys for SAP HANA.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/keymanager.sh" SCRIPT_PACKAGES["cleaner"]="File Cleaner|1.1.0|A simple script to clean up temporary files and logs.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/cleaner.sh" SCRIPT_PACKAGES["hanatool"]="HANA Tool|1.5.0|A command-line tool for various SAP HANA administration tasks.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/hanatool.sh"