Skip to content

Commit

Permalink
Added SMSDevices for server images
Browse files Browse the repository at this point in the history
  • Loading branch information
@dotneft
dotneft committed May 29, 2024
1 parent 9ef9ef6 commit 8d654cc
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 1 deletion.
1 change: 1 addition & 0 deletions Dockerfiles/server-mysql/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ ZBX_VMWARECACHESIZE=8M
ZBX_VMWARETIMEOUT=10
ZBX_ENABLE_SNMP_TRAPS=false
ZBX_SOURCEIP=
ZBX_SMSDEVICES=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
1 change: 1 addition & 0 deletions Dockerfiles/server-mysql/rhel/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ <h3 id="other-variables">Other variables</h3>
<span class="hljs-attr">ZBX_VMWARETIMEOUT</span>=<span class="hljs-number">10</span>
<span class="hljs-attr">ZBX_ENABLE_SNMP_TRAPS</span>=<span class="hljs-literal">false</span>
<span class="hljs-attr">ZBX_SOURCEIP</span>=
<span class="hljs-attr">ZBX_SMSDEVICES</span>=
<span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
<span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
<span class="hljs-attr">ZBX_PROBLEMHOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">60</span> # Available since <span class="hljs-number">6.0</span>.<span class="hljs-number">0</span>
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/server-pgsql/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ ZBX_VMWARECACHESIZE=8M
ZBX_VMWARETIMEOUT=10
ZBX_ENABLE_SNMP_TRAPS=false
ZBX_SOURCEIP=
ZBX_SMSDEVICES=
ZBX_HOUSEKEEPINGFREQUENCY=1
ZBX_MAXHOUSEKEEPERDELETE=5000
ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0
Expand Down Expand Up @@ -218,7 +219,6 @@ ZBX_TLSCIPHERPSK= # Available since 4.4.7
ZBX_TLSCIPHERPSK13= # Available since 4.4.7
ZBX_WEBDRIVERURL= # Available since 7.0.0
ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0
```

Default values of these variables are specified after equal sign.
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
1 change: 1 addition & 0 deletions Dockerfiles/server-pgsql/rhel/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ <h3 id="other-variables">Other variables</h3>
<span class="hljs-attr">ZBX_VMWARECACHESIZE</span>=<span class="hljs-number">8</span>M
<span class="hljs-attr">ZBX_VMWARETIMEOUT</span>=<span class="hljs-number">10</span>
<span class="hljs-attr">ZBX_ENABLE_SNMP_TRAPS</span>=<span class="hljs-literal">false</span>
<span class="hljs-attr">ZBX_SMSDEVICES</span>=
<span class="hljs-attr">ZBX_SOURCEIP</span>=
<span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
<span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}"
update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}"

update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}"

if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)"
elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then
Expand Down
1 change: 1 addition & 0 deletions env_vars/.env_srv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ZBX_STARTJAVAPOLLERS=5
# ZBX_VMWARETIMEOUT=10
ZBX_ENABLE_SNMP_TRAPS=true
# ZBX_SOURCEIP=
# ZBX_SMSDEVICES=
# ZBX_HOUSEKEEPINGFREQUENCY=1
# ZBX_MAXHOUSEKEEPERDELETE=5000
# ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60
Expand Down

0 comments on commit 8d654cc

Please sign in to comment.