From f76e422cdf45943b5ade648f3b826e93d3982858 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 20 Mar 2023 22:46:41 +0900 Subject: [PATCH] Removed depcreated SenderFrequency parameter. Fixed logrotate for SNMP traps --- Dockerfiles/server-mysql/README.md | 2 +- Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 1 - Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/README.md | 2 +- Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 1 - Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 1 - .../snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps | 3 ++- .../snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps | 3 ++- Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps | 3 ++- .../snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps | 3 ++- .../snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps | 3 ++- env_vars/.env_srv | 1 - 17 files changed, 12 insertions(+), 17 deletions(-) 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 6e8002d59..b279e4bef 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -433,7 +433,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 2d8d01fdb..4bec83e64 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -430,7 +430,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 2d8d01fdb..4bec83e64 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -430,7 +430,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 2d8d01fdb..4bec83e64 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -430,7 +430,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 ab2bd8d50..ca83d8549 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -430,7 +430,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 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 e5b50be9e..08c4aac39 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -467,7 +467,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 e5b50be9e..08c4aac39 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -467,7 +467,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 e5b50be9e..08c4aac39 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -467,7 +467,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 7ef2db469..95273cf75 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -467,7 +467,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 39dd5e70c..cc96709c5 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -42,7 +42,6 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 # ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 -# ZBX_SENDERFREQUENCY=30 # ZBX_CACHESIZE=8M # ZBX_CACHEUPDATEFREQUENCY=60 # ZBX_STARTDBSYNCERS=4