diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index ecd585e2f..a31108e9a 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -172,7 +172,7 @@ ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 +ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index e35e39767..6b354006e 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -440,7 +440,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index f00a49aea..3fab56202 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -437,7 +437,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index f00a49aea..3fab56202 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -437,7 +437,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index f00a49aea..3fab56202 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -437,7 +437,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 04f2cbf1f..e0c2e89ab 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -437,7 +437,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 057246bf7..b6ebacc53 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -173,7 +173,7 @@ ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 +ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index b994c800d..2f0626e5a 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -474,7 +474,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index b994c800d..2f0626e5a 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -474,7 +474,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index b994c800d..2f0626e5a 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -474,7 +474,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 4027e3e54..36bef8847 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -474,7 +474,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" - update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" diff --git a/Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps index 70d611eee..2f2994e71 100644 --- a/Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps +++ b/Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps @@ -3,6 +3,7 @@ missingok daily rotate 0 - minsize 50M notifempty + minsize 50M + notifempty su zabbix zabbix } diff --git a/Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps index 70d611eee..2f2994e71 100644 --- a/Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps +++ b/Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps @@ -3,6 +3,7 @@ missingok daily rotate 0 - minsize 50M notifempty + minsize 50M + notifempty su zabbix zabbix } diff --git a/Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps index 70d611eee..2f2994e71 100644 --- a/Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps +++ b/Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps @@ -3,6 +3,7 @@ missingok daily rotate 0 - minsize 50M notifempty + minsize 50M + notifempty su zabbix zabbix } diff --git a/Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps index 70d611eee..2f2994e71 100644 --- a/Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps +++ b/Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps @@ -3,6 +3,7 @@ missingok daily rotate 0 - minsize 50M notifempty + minsize 50M + notifempty su zabbix zabbix } diff --git a/Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps b/Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps index 70d611eee..2f2994e71 100644 --- a/Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps +++ b/Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps @@ -3,6 +3,7 @@ missingok daily rotate 0 - minsize 50M notifempty + minsize 50M + notifempty su zabbix zabbix } diff --git a/env_vars/.env_srv b/env_vars/.env_srv index f6a57262d..a7616371a 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -43,7 +43,6 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 # ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 -# ZBX_SENDERFREQUENCY=30 # ZBX_CACHESIZE=8M # ZBX_CACHEUPDATEFREQUENCY=10 # ZBX_STARTDBSYNCERS=4