cedricAbonnel/scripts-bash
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

correct dans log_event

Browse Source
This commit is contained in:
Cédric Abonnel
2026-03-16 14:24:53 +01:00
parent 0ee29bf356
commit 9296b2f680
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/linux/config_adminSys.sh.sha256
View File

@@ -1 +1 @@
5a3d38a862d5a25e9078914401bb896eac96ed8a9238a1632f76ea668caebfad config_adminSys.sh 97b479fe4da550d1f3712ac3fa2ab42aa0624442a09953432400f1b40e7c8806 config_adminSys.sh

0
servers/linux/manifest.txt Normal file
View File

10
servers/linux/monitoring/lib/monitoring-lib.sh
View File

@@ -49,8 +49,13 @@ log_event() {
local message="$3" local message="$3"
shift 3 shift 3
local ts extra key value kv local ts extra key value kv host
ts="$(date --iso-8601=seconds)" ts="$(date --iso-8601=seconds)"
# Détection dynamique du hostname si HOSTNAME_FQDN n'est pas défini
# On utilise 'hostname -f' pour le nom complet ou 'hostname' en secours
host="${HOSTNAME_FQDN:-$(hostname -f 2>/dev/null || hostname)}"
extra="" extra=""
for kv in "$@"; do for kv in "$@"; do
@@ -59,9 +64,10 @@ log_event() {
extra="${extra},\"$(json_escape "$key")\":\"$(json_escape "$value")\"" extra="${extra},\"$(json_escape "$key")\":\"$(json_escape "$value")\""
done done
# Utilisation de la variable 'host' détectée ci-dessus
printf '{"ts":"%s","host":"%s","app":"%s","level":"%s","event":"%s","message":"%s"%s}\n' \ printf '{"ts":"%s","host":"%s","app":"%s","level":"%s","event":"%s","message":"%s"%s}\n' \
"$(json_escape "$ts")" \ "$(json_escape "$ts")" \
"$(json_escape "${HOSTNAME_FQDN:-unknown}")" \ "$(json_escape "$host")" \
"$(json_escape "$SCRIPT_NAME")" \ "$(json_escape "$SCRIPT_NAME")" \
"$(json_escape "$level")" \ "$(json_escape "$level")" \
"$(json_escape "$event")" \ "$(json_escape "$event")" \

16
servers/linux/monitoring/manifest.txt
View File

@@ -1,8 +1,8 @@
f433b3e2ca25c76cccebf971072255dae64169a8ae162d6baa10776904d733e9 644 bin/alert-engine.sh f433b3e2ca25c76cccebf971072255dae64169a8ae162d6baa10776904d733e9 755 bin/alert-engine.sh
18d85d9cebe1b9d3d115e4cc27171cb30e2087fad8b10a33c199ee07b3ca19db 644 bin/check_disk.sh 7ff2eb1163ca8b9aa3927ac7f0ebbcc1f90c944e51afbc880d57359b83a0c73f 755 bin/check_disk.sh
4fae83b48dc25c5e2a59bba944d8c3f2c6dff89bf2adb932d4dd9201f6305ca4 644 bin/install-monitoring.sh 4fae83b48dc25c5e2a59bba944d8c3f2c6dff89bf2adb932d4dd9201f6305ca4 755 bin/install-monitoring.sh
36528963f2e78a160738a2cf3b8da67b9d12dbe495d9d01ca6c1ba97956288fa 644 bin/monitoring.sh 36528963f2e78a160738a2cf3b8da67b9d12dbe495d9d01ca6c1ba97956288fa 755 bin/monitoring.sh
d70bc86761b697d601d3b63b8428fe3a79baa8160bb3664fcebf6d89b242fc53 644 bin/monitoring-update.sh d70bc86761b697d601d3b63b8428fe3a79baa8160bb3664fcebf6d89b242fc53 755 bin/monitoring-update.sh
d9bc1240aa94c962ccf57f7106a369aa3d36e22e40167bf5a828542439571dd1 644 conf/alert-engine.conf 83db39c8d0cfd6f6e9d3cc5b961a67db29dc73666304a91e0d4a6d5831c623cb 644 conf/alert-engine.conf
bc105e25768f02123751fa767c819347e6912e9d49547326fde0c9220f39440c 644 conf/monitoring.conf b98edb9424be57bbf89b2c177163ede93bb15aa822ac0bf749d7619416be158b 644 conf/monitoring.conf
c7cfe04b0437369a72310cccf47f2d4632bd9dafa4ec1f35fbdb9873ee0b7992 644 lib/monitoring-lib.sh 654cd98ecda1c485a0ea1224f160a3c4d7396ab95a491603574e2ad1981fe010 644 lib/monitoring-lib.sh

2
servers/linux/sys_check.sh.sha256
View File

@@ -1 +1 @@
67e1a9853c4ce2f53ad24149d0c3ca1652048b7e081d8bf329bf2abf0b388454 sys_check.sh ed2cd7671fd7e22314856972bdb86412e2fbac575051f182640260efa299cd9c sys_check.sh