|
 |
9189c1 |
diff -urN zabbix-5.4.0/conf/zabbix_agentd.conf zabbix-5.4.0-patched/conf/zabbix_agentd.conf
|
|
|
9189c1 |
--- zabbix-5.4.0/conf/zabbix_agentd.conf 2021-04-26 18:52:41.000000000 +0300
|
|
|
9189c1 |
+++ zabbix-5.4.0-patched/conf/zabbix_agentd.conf 2021-06-03 13:50:48.085656485 +0300
|
|
|
a6f440 |
@@ -10,6 +10,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# PidFile=/tmp/zabbix_agentd.pid
|
|
|
a6f440 |
|
|
|
9189c1 |
+PidFile=/run/zabbix/zabbix_agentd.pid
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: LogType
|
|
|
a6f440 |
# Specifies where log messages are written to:
|
|
|
a6f440 |
# system - syslog
|
|
|
a6f440 |
@@ -27,7 +29,7 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFile=
|
|
|
a6f440 |
|
|
|
a6f440 |
-LogFile=/tmp/zabbix_agentd.log
|
|
|
a6f440 |
+LogFile=/var/log/zabbix/zabbix_agentd.log
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: LogFileSize
|
|
|
a6f440 |
# Maximum size of log file in MB.
|
|
|
a6f440 |
@@ -38,6 +40,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFileSize=1
|
|
|
a6f440 |
|
|
|
a6f440 |
+LogFileSize=0
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DebugLevel
|
|
|
a6f440 |
# Specifies debug level:
|
|
|
a6f440 |
# 0 - basic information about starting and stopping of Zabbix processes
|
|
|
9189c1 |
@@ -293,6 +297,7 @@
|
|
|
9189c1 |
# Mandatory: no
|
|
|
9189c1 |
# Default:
|
|
|
9189c1 |
# User=zabbix
|
|
|
9189c1 |
+# NOTE: This option is overriden by settings in systemd service file!
|
|
|
9189c1 |
|
|
|
9189c1 |
### Option: Include
|
|
|
9189c1 |
# You may include individual files or all files in a directory in the configuration file.
|
|
|
9189c1 |
@@ -302,6 +307,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# Include=
|
|
|
a6f440 |
|
|
|
a6f440 |
+Include=/etc/zabbix/zabbix_agentd.d/*.conf
|
|
|
a6f440 |
+
|
|
|
a6f440 |
# Include=/usr/local/etc/zabbix_agentd.userparams.conf
|
|
|
a6f440 |
# Include=/usr/local/etc/zabbix_agentd.conf.d/
|
|
|
a6f440 |
# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
|
|
|
9189c1 |
diff -urN zabbix-5.4.0/conf/zabbix_proxy.conf zabbix-5.4.0-patched/conf/zabbix_proxy.conf
|
|
|
9189c1 |
--- zabbix-5.4.0/conf/zabbix_proxy.conf 2021-04-26 18:52:41.000000000 +0300
|
|
|
9189c1 |
+++ zabbix-5.4.0-patched/conf/zabbix_proxy.conf 2021-06-03 13:36:33.849788003 +0300
|
|
|
a6f440 |
@@ -88,7 +88,7 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFile=
|
|
|
a6f440 |
|
|
|
a6f440 |
-LogFile=/tmp/zabbix_proxy.log
|
|
|
a6f440 |
+LogFile=/var/log/zabbix/zabbix_proxy.log
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: LogFileSize
|
|
|
a6f440 |
# Maximum size of log file in MB.
|
|
|
a6f440 |
@@ -99,6 +99,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFileSize=1
|
|
|
a6f440 |
|
|
|
a6f440 |
+LogFileSize=0
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DebugLevel
|
|
|
a6f440 |
# Specifies debug level:
|
|
|
a6f440 |
# 0 - basic information about starting and stopping of Zabbix processes
|
|
|
a6f440 |
@@ -138,6 +140,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# PidFile=/tmp/zabbix_proxy.pid
|
|
|
a6f440 |
|
|
|
9189c1 |
+PidFile=/run/zabbix/zabbix_proxy.pid
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: SocketDir
|
|
|
a6f440 |
# IPC socket directory.
|
|
|
a6f440 |
# Directory to store IPC sockets used by internal Zabbix services.
|
|
|
a6f440 |
@@ -146,6 +150,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# SocketDir=/tmp
|
|
|
a6f440 |
|
|
|
9189c1 |
+SocketDir=/run/zabbix
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DBHost
|
|
|
a6f440 |
# Database host name.
|
|
|
a6f440 |
# If set to localhost, socket is used for MySQL.
|
|
|
9189c1 |
@@ -414,6 +420,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# SNMPTrapperFile=/tmp/zabbix_traps.tmp
|
|
|
a6f440 |
|
|
|
a6f440 |
+SNMPTrapperFile=/var/log/snmptrap/snmptrap.log
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: StartSNMPTrapper
|
|
|
a6f440 |
# If 1, SNMP trapper process is started.
|
|
|
a6f440 |
#
|
|
|
9189c1 |
@@ -529,7 +537,7 @@
|
|
|
9189c1 |
#
|
|
|
9189c1 |
# Mandatory: no
|
|
|
a6f440 |
# Default:
|
|
|
9189c1 |
-# ExternalScripts=${datadir}/zabbix/externalscripts
|
|
|
9189c1 |
+# ExternalScripts=/usr/lib/zabbix/externalscripts
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: FpingLocation
|
|
|
a6f440 |
# Location of fping.
|
|
|
9189c1 |
diff -urN zabbix-5.4.0/conf/zabbix_server.conf zabbix-5.4.0-patched/conf/zabbix_server.conf
|
|
|
9189c1 |
--- zabbix-5.4.0/conf/zabbix_server.conf 2021-04-26 18:52:41.000000000 +0300
|
|
|
9189c1 |
+++ zabbix-5.4.0-patched/conf/zabbix_server.conf 2021-06-03 13:37:11.324270989 +0300
|
|
|
a6f440 |
@@ -35,7 +35,7 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFile=
|
|
|
a6f440 |
|
|
|
a6f440 |
-LogFile=/tmp/zabbix_server.log
|
|
|
a6f440 |
+LogFile=/var/log/zabbix/zabbix_server.log
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: LogFileSize
|
|
|
a6f440 |
# Maximum size of log file in MB.
|
|
|
a6f440 |
@@ -46,6 +46,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFileSize=1
|
|
|
a6f440 |
|
|
|
a6f440 |
+LogFileSize=0
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DebugLevel
|
|
|
a6f440 |
# Specifies debug level:
|
|
|
a6f440 |
# 0 - basic information about starting and stopping of Zabbix processes
|
|
|
a6f440 |
@@ -67,6 +69,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# PidFile=/tmp/zabbix_server.pid
|
|
|
a6f440 |
|
|
|
9189c1 |
+PidFile=/run/zabbix/zabbix_server.pid
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: SocketDir
|
|
|
a6f440 |
# IPC socket directory.
|
|
|
a6f440 |
# Directory to store IPC sockets used by internal Zabbix services.
|
|
|
a6f440 |
@@ -75,6 +79,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# SocketDir=/tmp
|
|
|
a6f440 |
|
|
|
9189c1 |
+SocketDir=/run/zabbix
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DBHost
|
|
|
a6f440 |
# Database host name.
|
|
|
a6f440 |
# If set to localhost, socket is used for MySQL.
|
|
|
9189c1 |
@@ -373,6 +379,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# SNMPTrapperFile=/tmp/zabbix_traps.tmp
|
|
|
a6f440 |
|
|
|
a6f440 |
+SNMPTrapperFile=/var/log/snmptrap/snmptrap.log
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: StartSNMPTrapper
|
|
|
a6f440 |
# If 1, SNMP trapper process is started.
|
|
|
a6f440 |
#
|
|
|
9189c1 |
@@ -538,7 +546,7 @@
|
|
|
9189c1 |
#
|
|
|
9189c1 |
# Mandatory: no
|
|
|
a6f440 |
# Default:
|
|
|
9189c1 |
-# AlertScriptsPath=${datadir}/zabbix/alertscripts
|
|
|
9189c1 |
+# AlertScriptsPath=/usr/lib/zabbix/alertscripts
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: ExternalScripts
|
|
|
a6f440 |
# Full path to location of external scripts.
|
|
|
9189c1 |
@@ -547,7 +555,7 @@
|
|
|
9189c1 |
#
|
|
|
9189c1 |
# Mandatory: no
|
|
|
a6f440 |
# Default:
|
|
|
9189c1 |
-# ExternalScripts=${datadir}/zabbix/externalscripts
|
|
|
9189c1 |
+# ExternalScripts=/usr/lib/zabbix/externalscripts
|
|
|
a6f440 |
|
|
|
a6f440 |
### Option: FpingLocation
|
|
|
a6f440 |
# Location of fping.
|
|
|
9189c1 |
diff -urN zabbix-5.4.0/src/go/conf/zabbix_web_service.conf zabbix-5.4.0-patched/src/go/conf/zabbix_web_service.conf
|
|
|
9189c1 |
--- zabbix-5.4.0/src/go/conf/zabbix_web_service.conf 2021-04-26 18:52:41.000000000 +0300
|
|
|
9189c1 |
+++ zabbix-5.4.0-patched/src/go/conf/zabbix_web_service.conf 2021-06-03 13:39:04.704416798 +0300
|
|
|
9189c1 |
@@ -20,6 +20,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
9189c1 |
# LogFile=/tmp/zabbix_web_service.log
|
|
|
a6f440 |
|
|
|
9189c1 |
+LogFile=/var/log/zabbix/zabbix_web_service.log
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: LogFileSize
|
|
|
a6f440 |
# Maximum size of log file in MB.
|
|
|
9189c1 |
# 0 - disable automatic log rotation.
|
|
|
9189c1 |
@@ -29,6 +31,8 @@
|
|
|
a6f440 |
# Default:
|
|
|
a6f440 |
# LogFileSize=1
|
|
|
a6f440 |
|
|
|
a6f440 |
+LogFileSize=0
|
|
|
a6f440 |
+
|
|
|
a6f440 |
### Option: DebugLevel
|
|
|
a6f440 |
# Specifies debug level:
|
|
|
a6f440 |
# 0 - basic information about starting and stopping of Zabbix processes
|