extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-05-30 06:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed depcreated SenderFrequency parameter. Fixed logrotate for SNMP traps

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-03-20 22:46:41 +09:00
parent 010d3bd49f
commit 6e9d6d3def
17 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/server-mysql/README.md
View File

@ -172,7 +172,7 @@ ZBX_SOURCEIP=
ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
ZBX_SENDERFREQUENCY=30 ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0
ZBX_CACHESIZE=8M ZBX_CACHESIZE=8M
ZBX_CACHEUPDATEFREQUENCY=10 ZBX_CACHEUPDATEFREQUENCY=10
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4

1
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -440,7 +440,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -437,7 +437,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -437,7 +437,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -437,7 +437,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -437,7 +437,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-pgsql/README.md
View File

@ -173,7 +173,7 @@ ZBX_SOURCEIP=
ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
ZBX_SENDERFREQUENCY=30 ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0
ZBX_CACHESIZE=8M ZBX_CACHESIZE=8M
ZBX_CACHEUPDATEFREQUENCY=10 ZBX_CACHEUPDATEFREQUENCY=10
ZBX_STARTDBSYNCERS=4 ZBX_STARTDBSYNCERS=4

1
Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
View File

@ -474,7 +474,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
View File

@ -474,7 +474,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
View File

@ -474,7 +474,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

1
Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -474,7 +474,6 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

3
Dockerfiles/snmptraps/alpine/conf/etc/logrotate.d/zabbix_snmptraps
View File

@ -3,6 +3,7 @@
missingok missingok
daily daily
rotate 0 rotate 0
minsize 50M notifempty minsize 50M
notifempty
su zabbix zabbix su zabbix zabbix
} }

3
Dockerfiles/snmptraps/centos/conf/etc/logrotate.d/zabbix_snmptraps
View File

@ -3,6 +3,7 @@
missingok missingok
daily daily
rotate 0 rotate 0
minsize 50M notifempty minsize 50M
notifempty
su zabbix zabbix su zabbix zabbix
} }

3
Dockerfiles/snmptraps/ol/conf/etc/logrotate.d/zabbix_snmptraps
View File

@ -3,6 +3,7 @@
missingok missingok
daily daily
rotate 0 rotate 0
minsize 50M notifempty minsize 50M
notifempty
su zabbix zabbix su zabbix zabbix
} }

3
Dockerfiles/snmptraps/rhel/conf/etc/logrotate.d/zabbix_snmptraps
View File

@ -3,6 +3,7 @@
missingok missingok
daily daily
rotate 0 rotate 0
minsize 50M notifempty minsize 50M
notifempty
su zabbix zabbix su zabbix zabbix
} }

3
Dockerfiles/snmptraps/ubuntu/conf/etc/logrotate.d/zabbix_snmptraps
View File

@ -3,6 +3,7 @@
missingok missingok
daily daily
rotate 0 rotate 0
minsize 50M notifempty minsize 50M
notifempty
su zabbix zabbix su zabbix zabbix
} }

1
env_vars/.env_srv
View File

@ -43,7 +43,6 @@ ZBX_ENABLE_SNMP_TRAPS=true
# ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_HOUSEKEEPINGFREQUENCY=1
# ZBX_MAXHOUSEKEEPERDELETE=5000 # ZBX_MAXHOUSEKEEPERDELETE=5000
# ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60
# ZBX_SENDERFREQUENCY=30
# ZBX_CACHESIZE=8M # ZBX_CACHESIZE=8M
# ZBX_CACHEUPDATEFREQUENCY=10 # ZBX_CACHEUPDATEFREQUENCY=10
# ZBX_STARTDBSYNCERS=4 # ZBX_STARTDBSYNCERS=4