extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-18 15:57:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect bash syntax

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-08-21 17:53:29 +09:00
parent 9bd19e08da
commit a2cf923c2b
7 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfiles/agent2/alpine/docker-entrypoint.sh
View File

@ -152,11 +152,8 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
<<<<<<< HEAD
=======
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}" update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/centos/docker-entrypoint.sh
View File

@ -152,11 +152,8 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
<<<<<<< HEAD
=======
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}" update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/ol/docker-entrypoint.sh
View File

@ -152,11 +152,8 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
<<<<<<< HEAD
=======
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}" update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/rhel/docker-entrypoint.sh
View File

@ -152,11 +152,8 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
<<<<<<< HEAD
=======
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}" update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
View File

@ -152,11 +152,8 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
<<<<<<< HEAD
=======
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}" update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/windows/docker-entrypoint.ps1
View File

@ -163,11 +163,8 @@ function Prepare-Zbx-Agent-Config {
else { else {
Update-Config-Var $ZbxAgentConfig "ServerActive" Update-Config-Var $ZbxAgentConfig "ServerActive"
} }
<<<<<<< HEAD
=======
Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY"
Update-Config-Var $ZbxAgentConfig "ForceActiveChecksOnStart" "$env:ZBX_FORCEACTIVECHECKSONSTART" Update-Config-Var $ZbxAgentConfig "ForceActiveChecksOnStart" "$env:ZBX_FORCEACTIVECHECKSONSTART"
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
if ([string]::IsNullOrWhitespace($env:ZBX_ENABLEPERSISTENTBUFFER)) { if ([string]::IsNullOrWhitespace($env:ZBX_ENABLEPERSISTENTBUFFER)) {
$env:ZBX_ENABLEPERSISTENTBUFFER="true" $env:ZBX_ENABLEPERSISTENTBUFFER="true"

4
env_vars/.env_agent
View File

@ -2,11 +2,7 @@
# ZBX_DEBUGLEVEL=3 # ZBX_DEBUGLEVEL=3
# ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 # ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
# ZBX_LOGREMOTECOMMANDS=0 # ZBX_LOGREMOTECOMMANDS=0
<<<<<<< HEAD
=======
# ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2 # ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2
# ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2
>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
# ZBX_HOSTINTERFACE= # Available since 4.4.0 # ZBX_HOSTINTERFACE= # Available since 4.4.0
# ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 # ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
# ZBX_SERVER_HOST=zabbix-server # ZBX_SERVER_HOST=zabbix-server