search

voxpupuli / puppet-zabbix

Puppet module for creating and maintaining zabbix components with puppet.
https://forge.puppet.com/puppet/zabbix
Apache License 2.0
79 stars 228 forks source link

Duplicate: Add sensitive support #857

Open teluq-pbrideau opened 1 year ago

teluq-pbrideau commented 1 year ago

Pull Request (PR) description

This is a copy of #828, where @bdeferme do not have any more time to work on it. Here I tried to fix the tests.

This Pull Request (PR) fixes the following issues

Fixes #440 Fixes #950

teluq-pbrideau commented 1 year ago

While trying to add some basic tests about this change, I’ve discovered that the zabbix::proxy tests aren’t run at all, it is restricted to when 'RedHat' which is not in the listed OS on_supported_os(baseline_os_hash)…

I’ve fixed the tests for them to run at least for CentOS, but they fail for other OS for reasons outside the scope of this PR:

zabbix::proxy
  on debian-10-x86_64
[...]
      is expected to contain Yumrepo[zabbix-nonsupported] (FAILED - 1)

It should probably be fixed it its own PR…

bastelfreak commented 3 weeks ago

@teluq-pbrideau thanks for working on this! Can you please rebase against our master branch?

teluq-pbrideau commented 3 weeks ago

@bastelfreak I’m sorry but rebasing was just a pain in the ass with all the conflicts. I solved the conflict once with the merge of your master branch

teluq-pbrideau commented 3 weeks ago

You might see I added back the SSLCALocation and VMwarePerfFrequency parameters as they were already defined in the .erb template, without beeing defined in the class. I think it is cleaner to follow how the template was, and adapting the class accordingly. It is such a pain to modify and update the erb vs the epp to keep them consistent.

teluq-pbrideau commented 3 weeks ago

I’m not quite sure how to cleanup my git tree… Can we just squash to only one commit when we merge into master?

teluq-pbrideau commented 3 weeks ago

I’ve been running the old changes in my production environment since my original PR, but I cannot test these new changes right now in a live environment. I’m stuck with a dependency cycle in my Puppetfile with stdlib9, which I’m in the process of solving right now, but might take a few days still to solve on my side. Feel free to freeze this PR until I come back with confirmation on my side, or if someone can test in a more complete environment.

teluq-pbrideau commented 2 weeks ago

I’ve just successfully tested this PR in my development environment. The failing tests are out of my control, it was a timeout after 360 minutes:

Error: The operation was canceled.

Can we force the tests to rerun and move forward with this? Or It can also be the changes #973!