From 0ee29bf35625f9a59fe27a8a45cfded75ad41c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drix?= Date: Mon, 16 Mar 2026 14:02:00 +0100 Subject: [PATCH] mod +x --- servers/linux/monitoring/bin/alert-engine.sh | 0 servers/linux/monitoring/bin/check_disk.sh | 11 ++++++++--- servers/linux/monitoring/bin/install-monitoring.sh | 0 servers/linux/monitoring/bin/monitoring-update.sh | 0 servers/linux/monitoring/bin/monitoring.sh | 0 servers/linux/monitoring/conf/alert-engine.conf | 4 ++-- servers/linux/monitoring/conf/monitoring.conf | 6 +++--- 7 files changed, 13 insertions(+), 8 deletions(-) mode change 100644 => 100755 servers/linux/monitoring/bin/alert-engine.sh mode change 100644 => 100755 servers/linux/monitoring/bin/check_disk.sh mode change 100644 => 100755 servers/linux/monitoring/bin/install-monitoring.sh mode change 100644 => 100755 servers/linux/monitoring/bin/monitoring-update.sh mode change 100644 => 100755 servers/linux/monitoring/bin/monitoring.sh diff --git a/servers/linux/monitoring/bin/alert-engine.sh b/servers/linux/monitoring/bin/alert-engine.sh old mode 100644 new mode 100755 diff --git a/servers/linux/monitoring/bin/check_disk.sh b/servers/linux/monitoring/bin/check_disk.sh old mode 100644 new mode 100755 index 0f36c3a..31ddec6 --- a/servers/linux/monitoring/bin/check_disk.sh +++ b/servers/linux/monitoring/bin/check_disk.sh @@ -20,6 +20,11 @@ CRITICAL=95 MOUNTS=("/" "/var" "/home") for mount in "${MOUNTS[@]}"; do + # On vérifie si le point de montage existe avant de tester + if ! mountpoint -q "$mount"; then + continue + fi + used_pct="$(df -P "$mount" 2>/dev/null | awk 'NR==2 {gsub("%","",$5); print $5}')" if [[ ! "$used_pct" =~ ^[0-9]+$ ]]; then @@ -31,15 +36,15 @@ for mount in "${MOUNTS[@]}"; do case "$level" in INFO) - log_info "disk_ok" "Utilisation disque normale" \ + log_info "disk_ok" "Utilisation disque normale" \ "mount=$mount" "used_pct=$used_pct" "warning=$WARNING" "critical=$CRITICAL" ;; WARNING) - log_warning "disk_usage_high" "Utilisation disque élevée" \ + log_warning "disk_usage_high" "Utilisation disque élevée" \ "mount=$mount" "used_pct=$used_pct" "warning=$WARNING" "critical=$CRITICAL" ;; CRITICAL) - log_critical "disk_usage_critical" "Utilisation disque critique" \ + log_critical "disk_usage_critical" "Utilisation disque critique" \ "mount=$mount" "used_pct=$used_pct" "warning=$WARNING" "critical=$CRITICAL" ;; esac diff --git a/servers/linux/monitoring/bin/install-monitoring.sh b/servers/linux/monitoring/bin/install-monitoring.sh old mode 100644 new mode 100755 diff --git a/servers/linux/monitoring/bin/monitoring-update.sh b/servers/linux/monitoring/bin/monitoring-update.sh old mode 100644 new mode 100755 diff --git a/servers/linux/monitoring/bin/monitoring.sh b/servers/linux/monitoring/bin/monitoring.sh old mode 100644 new mode 100755 diff --git a/servers/linux/monitoring/conf/alert-engine.conf b/servers/linux/monitoring/conf/alert-engine.conf index 4566cab..f4efd3f 100644 --- a/servers/linux/monitoring/conf/alert-engine.conf +++ b/servers/linux/monitoring/conf/alert-engine.conf @@ -24,9 +24,9 @@ ALERT_MAIL_BIN="/usr/sbin/sendmail" ALERT_MAIL_SUBJECT_PREFIX="[monitoring]" # ntfy -NTFY_SERVER="https://ntfy.a5l.fr" +NTFY_SERVER="https://ntfy.sh" NTFY_TOPIC="TPOSOB84sBJ6HTZ7" -NTFY_TOKEN="VOTRE_TOKEN_ICI" +NTFY_TOKEN="" # Déduplication en secondes ALERT_DEDUP_WINDOW=3600 diff --git a/servers/linux/monitoring/conf/monitoring.conf b/servers/linux/monitoring/conf/monitoring.conf index abd2923..155c881 100644 --- a/servers/linux/monitoring/conf/monitoring.conf +++ b/servers/linux/monitoring/conf/monitoring.conf @@ -22,12 +22,12 @@ HOSTNAME_FQDN="$(hostname -f 2>/dev/null || hostname)" DEST="root" -NTFY_SERVER="" -NTFY_TOPIC="" +NTFY_SERVER="nfy.sh" +NTFY_TOPIC="TPOSOB84sBJ6HTZ7" NTFY_TOKEN="" UPDATE_ENABLED="true" -UPDATE_BASE_URL="https://git.abonnel.fr/cedricAbonnel/scripts-bash/raw/branch/main/servers/linux" +UPDATE_BASE_URL="https://git.abonnel.fr/cedricAbonnel/scripts-bash/raw/branch/main/servers/linux/monitoring" UPDATE_MANIFEST_URL="${UPDATE_BASE_URL}/manifest.txt" UPDATE_TIMEOUT_CONNECT=3 UPDATE_TIMEOUT_TOTAL=15