Skip to content

Conversation

@stevenmallindine
Copy link

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

  • [feat] A new feature

Does this PR introduce a BREAKING CHANGE?

No.

Describe the changes you're proposing

Update the zabbix server jinja formula to include parameters up to 7.0

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.

Copy link
Collaborator

@hatifnatt hatifnatt left a comment

Choose a reason for hiding this comment

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

Thanks for PR!
Are you running with

jinja_env:
  trim_blocks: True
  lstrip_blocks: True

in the salt -master config?
Otherwise I can't understand why are you removing - (minus sign) from the end of each of {% if ... -%} block. Extra empty lines will be added to configuration files. Please don't introduce changes that will result in big but unnecessary changes in configuration files of each user of this formula.
Long story short - please don't remove minus sign, or please explain why this is necessary.

I would even suggest to add minus sign to the end of the if blocks with new parameters that you added.

@stevenmallindine
Copy link
Author

The removal of the - sign which reintroduces whitespaces was also discussed internally here. I did if to exactly reproduce the same formatting as from Zabbix.

@stevenmallindine stevenmallindine closed this by deleting the head repository Apr 30, 2025
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