Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add and remove Zabbix 6.0 + 6.4 options (HA mode, StatsAllowedIP, ProxyConfigFrequency, HeartbeatFrequency) #921

Merged
merged 15 commits into from Mar 5, 2024

Conversation

geirra
Copy link
Contributor

@geirra geirra commented Feb 16, 2024

Pull Request (PR) description

This PR adds some new 6.0 + 6.4 functions and removes config values that have been Deprecated.

  1. Add missing parameter StatsAllowedIP for Zabbix Server + Proxys
    This is a rebase of an earlier attempt Add Zabbix parameter StatsAllowedIP for Server and Proxy and remove ServerPort for proxy in >6.0 #869
    The parameter has been supported since version 4.2
  2. HA Mode for Zabbix:
    This adds HANodeName + NodeAddress to Zabbix server.
  3. Since Zabbix 6.0 and the support for HA setup of Zabbix, the webconfig does not require $ZBX_SERVER_PORT and $ZBX_SERVER . In cases where HA is used these values have to be removed.
    Offical Zabbix deployments from 6.0 has these values disabled by default, the connection details is now pulled by DB.
  4. As of Zabbix 6.4 ConfigFrequency has been Deprecated and has been replaced with ProxyConfigFrequency, so the same value is now used in Server and Proxy.
### Option: ConfigFrequency - Deprecated, use ProxyConfigFrequency
#	How often proxy retrieves configuration data from Zabbix Server in seconds.
#	For a proxy in the passive mode this parameter will be ignored.
# Mandatory: no

This is not to be confused with the existing server parameter ProxyConfigFrequency:

From Zabbix wiki

Note that ProxyConfigFrequency is:

the server parameter for passive proxies;
the proxy parameter for active proxies.
  1. HeartbeatFrequency has been removed from 6.4 and up
The heartbeat sender has been removed from the proxy. Therefore, Zabbix proxy item zabbix [process,heartbeat sender] is no longer supported and has been removed from templates. The HeartbeatFrequency parameter has been deprecated.

This Pull Request (PR) fixes the following issues

@geirra
Copy link
Contributor Author

geirra commented Feb 16, 2024

Seem like this one should be fine now.

The failed tests are due to broken postgresql gpg keys, needs to fixed upstream.

Public key for postgresql13-13.14-1PGDG.rhel7.x86_64.rpm is not installed Importing GPG key 0x442DF0F8: Userid : "PostgreSQL RPM Building Project <pgsqlrpms-hackers@pgfoundry.org>" Fingerprint: 68c9 e2b9 1a37 d136 fe74 d176 1f16 d2e1 442d f0f8 From : /etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-13

Probably related to https://yum.postgresql.org/news/pgdg-rpm-repo-gpg-key-update/

Should be fixed here:
puppetlabs/puppetlabs-postgresql#1566

But this module locks it to 10.0.0
metadata.json:
"version_requirement": ">= 6.4.0 < 10.0.0"

Copy link
Member

@Valantin Valantin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration checked in the official documentation, seems to be all ok, I've test it in our infrastructure as soon as possible

@root-expert
Copy link
Member

@geirra Hey! Thanks for the PR. Would mind rebasing with our master branch? It should fix the acceptance tests, postgresql module was bumped at 327a043

manifests/params.pp Show resolved Hide resolved
manifests/server.pp Outdated Show resolved Hide resolved
@geirra
Copy link
Contributor Author

geirra commented Mar 4, 2024

So this sould be rebased and the empty line is removed, i have not fixed the issue about ProxyConfigFrequency, see the comment about that one.

Mind taking a look @root-expert ?

@root-expert root-expert added the enhancement New feature or request label Mar 5, 2024
@root-expert root-expert merged commit db01009 into voxpupuli:master Mar 5, 2024
54 checks passed
Valantin pushed a commit to Valantin/puppet-zabbix that referenced this pull request Mar 7, 2024
…xyConfigFrequency, HeartbeatFrequency) (voxpupuli#921)

* add StatsAllowedIP for proxy and server

* make value optional

* remove ServerPort for proxy for versions below 6.0 - its deprecated

* Add Zabbix 6.0 and 6.4 changes

* add reference for statsallowedip

* fix proxy--statsallowedip reference

* add statsallowedip to params

* add reference for HA (nodename + nodeaddress)

* run strings:generate:reference

* attempt to rewrite web_spec.rb checks

* adjust web_spec.rb

* fix context

* remove emptyline

---------

Co-authored-by: Geir Råness <git@winning.no>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants