Skip to content

Commit 039bd98

Browse files
committed
feat: enhance Zabbix scripts to accept server IP as a parameter or prompt for input
1 parent 6f0c330 commit 039bd98

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ zabbix_server() {
6666
}
6767

6868
zabbix_client() {
69+
local server_ip="${1:-}"
6970
cd "$CURRENT_DIR/setup/system" || exit
70-
if [ -n "${2:-}" ]; then
71-
sudo bash zabbix.sh client "${2}"
71+
if [ -n "$server_ip" ]; then
72+
sudo bash zabbix.sh client "$server_ip"
7273
else
7374
sudo bash zabbix.sh client
7475
fi
@@ -155,7 +156,7 @@ case "${1:-}" in
155156
;;
156157

157158
zabbix_client | zc)
158-
zabbix_client "$@"
159+
zabbix_client "${2:-}"
159160
;;
160161

161162
fix_mysql | fix_mysql_frozen | fmf)

setup/system/zabbix.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,14 @@ install_zabbix_agent() {
546546
echo '=========================================='
547547
echo ''
548548

549-
# Get Zabbix server address from user
550-
read -r -p "Enter Zabbix Server IP address: " ZABBIX_SERVER_IP
549+
# Get Zabbix server address from parameter or user input
550+
ZABBIX_SERVER_IP="${1:-}"
551+
552+
if [ -z "$ZABBIX_SERVER_IP" ]; then
553+
read -r -p "Enter Zabbix Server IP address: " ZABBIX_SERVER_IP
554+
else
555+
print_info "Using Zabbix Server IP: ${ZABBIX_SERVER_IP}"
556+
fi
551557

552558
if [ -z "$ZABBIX_SERVER_IP" ]; then
553559
print_error "Zabbix Server IP is required"
@@ -651,7 +657,7 @@ main() {
651657
install_zabbix_server
652658
;;
653659
client)
654-
install_zabbix_agent
660+
install_zabbix_agent "${2:-}"
655661
;;
656662
*)
657663
show_usage

0 commit comments

Comments
 (0)