Skip to content

feat(proxy_conf): Reworked jinja Template for Zabbix Proxy 6.2#168

Merged
hatifnatt merged 4 commits intosaltstack-formulas:masterfrom
xenadmin:patch-4
Mar 3, 2025
Merged

feat(proxy_conf): Reworked jinja Template for Zabbix Proxy 6.2#168
hatifnatt merged 4 commits intosaltstack-formulas:masterfrom
xenadmin:patch-4

Conversation

@xenadmin
Copy link
Contributor

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

feat(proxy_conf): Reworked jinja Template for Zabbix Proxy 6.2

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

@xenadmin xenadmin requested a review from hatifnatt as a code owner October 17, 2023 17:12
@hatifnatt
Copy link
Collaborator

Hi @xenadmin sorry for delay, after merging your previous PR there is some conflicts, could you please resolve them?

@xenadmin
Copy link
Contributor Author

xenadmin commented Mar 3, 2025

We finally upgraded our Zabbix infrastructure to 7.0 LTS, which means I have time and resources to upgrade the zabbix_proxy.conf.jinja to 7.0 LTS. This time I make sure I create no conflicting PRs. The 6.2 PR should now be okay, can you take a look @hatifnatt ?
If it's okay and merged, I will create the PR for 6.4 and 7.0 seperatly for zabbix_proxy.conf.jinja.

@hatifnatt
Copy link
Collaborator

Unfortunately I don't have Salt environment to run test by myself and CI is mostly broken here. But changes looks good for me. It would be nice to fix "newline removal issue" but overall this PR can be merged.

@hatifnatt hatifnatt merged commit 0b45d5a into saltstack-formulas:master Mar 3, 2025
1 of 5 checks passed
@hatifnatt
Copy link
Collaborator

@xenadmin thanks for contribution!

@xenadmin xenadmin deleted the patch-4 branch March 3, 2025 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants