Clear ZBX, DB env variables before starting agent, server, proxy and web-service

This commit is contained in:
Alexey Pustovalov 2024-08-20 18:09:56 +09:00
parent 00c3ad8c3e
commit 09fc37682b
35 changed files with 315 additions and 0 deletions

View File

@ -202,9 +202,18 @@ prepare_zbx_agent_config() {
fi
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
clear_zbx_env
}
#################################################

View File

@ -202,9 +202,18 @@ prepare_zbx_agent_config() {
fi
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
clear_zbx_env
}
#################################################

View File

@ -202,9 +202,18 @@ prepare_zbx_agent_config() {
fi
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
clear_zbx_env
}
#################################################

View File

@ -202,9 +202,18 @@ prepare_zbx_agent_config() {
fi
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
clear_zbx_env
}
#################################################

View File

@ -202,9 +202,18 @@ prepare_zbx_agent_config() {
fi
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
clear_zbx_env
}
#################################################

View File

@ -207,10 +207,19 @@ prepare_zbx_agent_plugin_config() {
update_config_var "/etc/zabbix/zabbix_agent2.d/plugins.d/ember.conf" "Plugins.EmberPlus.System.Path" "/usr/sbin/zabbix-agent2-plugin/ember-plus"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
prepare_zbx_agent_plugin_config
clear_zbx_env
}
#################################################

View File

@ -207,10 +207,19 @@ prepare_zbx_agent_plugin_config() {
update_config_var "/etc/zabbix/zabbix_agent2.d/plugins.d/ember.conf" "Plugins.EmberPlus.System.Path" "/usr/sbin/zabbix-agent2-plugin/ember-plus"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
prepare_zbx_agent_plugin_config
clear_zbx_env
}
#################################################

View File

@ -207,10 +207,19 @@ prepare_zbx_agent_plugin_config() {
update_config_var "/etc/zabbix/zabbix_agent2.d/plugins.d/ember.conf" "Plugins.EmberPlus.System.Path" "/usr/sbin/zabbix-agent2-plugin/ember-plus"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
prepare_zbx_agent_plugin_config
clear_zbx_env
}
#################################################

View File

@ -207,10 +207,19 @@ prepare_zbx_agent_plugin_config() {
update_config_var "/etc/zabbix/zabbix_agent2.d/plugins.d/ember.conf" "Plugins.EmberPlus.System.Path" "/usr/sbin/zabbix-agent2-plugin/ember-plus"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
prepare_zbx_agent_plugin_config
clear_zbx_env
}
#################################################

View File

@ -207,10 +207,19 @@ prepare_zbx_agent_plugin_config() {
update_config_var "/etc/zabbix/zabbix_agent2.d/plugins.d/ember.conf" "Plugins.EmberPlus.System.Path" "/usr/sbin/zabbix-agent2-plugin/ember-plus"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_agent() {
echo "** Preparing Zabbix agent"
prepare_zbx_agent_config
prepare_zbx_agent_plugin_config
clear_zbx_env
}
#################################################

View File

@ -513,6 +513,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -528,6 +536,7 @@ prepare_proxy() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -510,6 +510,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -525,6 +533,7 @@ prepare_proxy() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -510,6 +510,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -525,6 +533,7 @@ prepare_proxy() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -510,6 +510,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -525,6 +533,7 @@ prepare_proxy() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -510,6 +510,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -525,6 +533,7 @@ prepare_proxy() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -259,10 +259,19 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_proxy() {
echo "Preparing Zabbix proxy"
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -259,10 +259,19 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_proxy() {
echo "Preparing Zabbix proxy"
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -259,10 +259,19 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_proxy() {
echo "Preparing Zabbix proxy"
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -259,10 +259,19 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_proxy() {
echo "Preparing Zabbix proxy"
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -259,10 +259,19 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_proxy() {
echo "Preparing Zabbix proxy"
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -563,6 +563,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -578,6 +586,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -560,6 +560,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -575,6 +583,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -560,6 +560,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -575,6 +583,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -560,6 +560,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -575,6 +583,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -560,6 +560,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|MYSQL)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -575,6 +583,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -580,6 +580,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|POSTGRES)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -594,6 +602,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -580,6 +580,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|POSTGRES)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -594,6 +602,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -580,6 +580,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|POSTGRES)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -594,6 +602,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -580,6 +580,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|POSTGRES)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -594,6 +602,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -580,6 +580,14 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^(ZBX|DB|POSTGRES)_"); do
unset "${env_var%%=*}"
done
}
prepare_db() {
echo "** Preparing database"
@ -594,6 +602,7 @@ prepare_server() {
prepare_db
update_zbx_config
clear_zbx_env
}
#################################################

View File

@ -109,9 +109,18 @@ prepare_zbx_web_service_config() {
update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_web_service() {
echo "** Preparing Zabbix web service"
prepare_zbx_web_service_config
clear_zbx_env
}
#################################################

View File

@ -109,9 +109,18 @@ prepare_zbx_web_service_config() {
update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_web_service() {
echo "** Preparing Zabbix web service"
prepare_zbx_web_service_config
clear_zbx_env
}
#################################################

View File

@ -109,9 +109,18 @@ prepare_zbx_web_service_config() {
update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_web_service() {
echo "** Preparing Zabbix web service"
prepare_zbx_web_service_config
clear_zbx_env
}
#################################################

View File

@ -109,9 +109,18 @@ prepare_zbx_web_service_config() {
update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_web_service() {
echo "** Preparing Zabbix web service"
prepare_zbx_web_service_config
clear_zbx_env
}
#################################################

View File

@ -109,9 +109,18 @@ prepare_zbx_web_service_config() {
update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}"
}
clear_zbx_env() {
[[ "${ZBX_CLEAR_ENV}" == "false" ]] && return
for env_var in $(env | grep -E "^ZBX_"); do
unset "${env_var%%=*}"
done
}
prepare_web_service() {
echo "** Preparing Zabbix web service"
prepare_zbx_web_service_config
clear_zbx_env
}
#################################################