diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index 2ec1ec5d2..b0cf98691 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -171,7 +171,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=60 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 686011f96..66adf4fb7 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -413,7 +413,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 "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 f322ae308..2c5f2997f 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -410,7 +410,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 "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 f322ae308..2c5f2997f 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -410,7 +410,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 "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 f322ae308..2c5f2997f 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -410,7 +410,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 "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 e9a8960c5..53824a013 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -410,7 +410,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 "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 4a45ad8b2..89e12f59a 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/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=60 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 09447e13c..107ee4daf 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -448,7 +448,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 "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 09447e13c..107ee4daf 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -448,7 +448,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 "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 09447e13c..107ee4daf 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -448,7 +448,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 "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 6bbe05819..410b66f09 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -448,7 +448,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 "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 da940527f..5be2092c3 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -34,7 +34,6 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_SOURCEIP= # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 -# ZBX_SENDERFREQUENCY=30 # ZBX_CACHESIZE=8M # ZBX_CACHEUPDATEFREQUENCY=60 # ZBX_STARTDBSYNCERS=4