From 81b295f4a3933c1978a3c71a9f7070be105412c5 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 19 Dec 2024 09:48:07 +0100 Subject: [PATCH 1/2] Gracefully fail if diskload.ini is not available. --- .../usr/local/emhttp/plugins/zabbix_agent/scripts/disk.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/files/usr/local/emhttp/plugins/zabbix_agent/scripts/disk.sh b/files/usr/local/emhttp/plugins/zabbix_agent/scripts/disk.sh index 12be1a2..9306ab5 100755 --- a/files/usr/local/emhttp/plugins/zabbix_agent/scripts/disk.sh +++ b/files/usr/local/emhttp/plugins/zabbix_agent/scripts/disk.sh @@ -57,5 +57,9 @@ if [ $found = 0 ]; then exit 1 fi -read bytes_read bytes_written _ < <(grep $device"=" /var/local/emhttp/diskload.ini | cut -d"=" -f2) -echo '"bytes_reading":'$bytes_read', "bytes_writing":'$bytes_written'}' +if [ -e /var/local/emhttp/diskload.ini ]; then + read bytes_read bytes_written _ < <(grep $device"=" /var/local/emhttp/diskload.ini | cut -d"=" -f2) + echo '"bytes_reading":'$bytes_read', "bytes_writing":'$bytes_written'}' +else + echo '"diskload_missing":1}' +fi From 1d982b26d20743a8fbcdb2bbfefc42b3df235155 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 19 Dec 2024 11:20:55 +0100 Subject: [PATCH 2/2] Version 2024.12.19.1 --- zabbix_agent-2020.11.25.1-x86_64-1.txz | Bin 613892 -> 0 bytes zabbix_agent-2024.12.19.1-x86_64-1.txz | Bin 0 -> 613804 bytes zabbix_agent.plg | 12 ++++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 zabbix_agent-2020.11.25.1-x86_64-1.txz create mode 100644 zabbix_agent-2024.12.19.1-x86_64-1.txz diff --git a/zabbix_agent-2020.11.25.1-x86_64-1.txz b/zabbix_agent-2020.11.25.1-x86_64-1.txz deleted file mode 100644 index 463fea9fcce031aebf16e453d3ed41d71068a204..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613892 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