From 0a456b8889ed49701d63c98a0a71e8bd0684a09e Mon Sep 17 00:00:00 2001
From: Hendrik Haas <321hendrik@proton.me>
Date: Wed, 23 Oct 2024 19:26:37 +0200
Subject: [PATCH 1/2] Adapt agent script to support zabbix_agent2 config

- Zabbix agent config file is read from /etc/zabbix directory
- Zabbix agent v2 has two entries for Server (Server and ServerActive). This leads to an error when using the grep-ed value as there will be two lines. The script now picks the last line selected. This will be the ServerActive, which should be used with zabbix_sender.
---
 agent_scripts/apt_upgrade_agent_script.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/agent_scripts/apt_upgrade_agent_script.sh b/agent_scripts/apt_upgrade_agent_script.sh
index 72c9de7..b8070d8 100644
--- a/agent_scripts/apt_upgrade_agent_script.sh
+++ b/agent_scripts/apt_upgrade_agent_script.sh
@@ -5,25 +5,25 @@
 #
 
 # Server configuration file route
-AGENTD_CONF_FILE=/etc/zabbix/zabbix_agentd.conf
+ZBX_AGENT_CONF_FILE=$(ls /etc/zabbix/ | grep -E '^zabbix_agent[2d]\.conf$')
 
 # Route for tmp file to store yum output
 TEMP_ZBX_FILE=/tmp/zabbix_apt_check_output.tmp
 echo -n "" > $TEMP_ZBX_FILE
 
 # Check if Server IP/name is set in configuration file
-ZBX_SERVER=$(egrep ^Server $AGENTD_CONF_FILE | cut -d = -f 2)
+ZBX_SERVER=$(egrep ^Server $ZBX_AGENT_CONF_FILE | tail -n 1 | cut -d = -f 2)
 if [ -z "$ZBX_SERVER" ]; then
-   echo "Server is not set in zabbix_agentd.conf file"
-   exit -1
+  echo "Server is not set in $ZBX_AGENT_CONF_FILE file"
+  exit -1
 fi
 
 # Get hostname
-ZBX_HOSTNAMEITEM_PRESENT=$(egrep ^HostnameItem /etc/zabbix/zabbix_agentd.conf -c)
+ZBX_HOSTNAMEITEM_PRESENT=$(egrep ^HostnameItem $ZBX_AGENT_CONF_FILE -c)
 if [ "$ZBX_HOSTNAMEITEM_PRESENT" -ge "1" ]; then
-        ZBX_HOSTNAME=$(hostname)
+  ZBX_HOSTNAME=$(hostname)
 else
-        ZBX_HOSTNAME=$(egrep ^Hostname /etc/zabbix/zabbix_agentd.conf | cut -d = -f 2)
+  ZBX_HOSTNAME=$(egrep ^Hostname $ZBX_AGENT_CONF_FILE | cut -d = -f 2)
 fi
 
 #######

From 31e0183f388adaef1333f2ebb85d75d058676bc1 Mon Sep 17 00:00:00 2001
From: Hendrik Haas <321hendrik@proton.me>
Date: Thu, 24 Oct 2024 12:34:30 +0200
Subject: [PATCH 2/2] Add base path to config folder path

---
 agent_scripts/apt_upgrade_agent_script.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/agent_scripts/apt_upgrade_agent_script.sh b/agent_scripts/apt_upgrade_agent_script.sh
index b8070d8..1083778 100644
--- a/agent_scripts/apt_upgrade_agent_script.sh
+++ b/agent_scripts/apt_upgrade_agent_script.sh
@@ -5,7 +5,8 @@
 #
 
 # Server configuration file route
-ZBX_AGENT_CONF_FILE=$(ls /etc/zabbix/ | grep -E '^zabbix_agent[2d]\.conf$')
+ZBX_CONFIG_FOLDER=/etc/zabbix/
+ZBX_AGENT_CONF_FILE=$ZBX_CONFIG_FOLDER$(ls $ZBX_CONFIG_FOLDER | grep -E '^zabbix_agent[2d]\.conf$')
 
 # Route for tmp file to store yum output
 TEMP_ZBX_FILE=/tmp/zabbix_apt_check_output.tmp