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 SMSDevices in zabbix server 7+ #988

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Ph0B1uS
Copy link

@Ph0B1uS Ph0B1uS commented Feb 19, 2025

Pull Request (PR) description

Adds SMSDevices to zabbix_server.conf if defined for zabbix_version 7+

This Pull Request (PR) fixes the following issues

Fixes #985

@Valantin
Copy link
Contributor

Hi, can you squash the commit and use just the verified account?

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Feb 21, 2025

Hi, can you squash the commit and use just the verified account?

I did manage to change to the verified account but it seems the squash was unsuccessful as i can still see the old commits in the repo.
I tried git rebase -i HEAD~16

Could it be that commits can only be squashed on merge? If that is the case then it will be hard to do here as all commits are in master as opposed to a feature branch.

@Valantin
Copy link
Contributor

@Ph0B1uS have you replace the pick to the squash?

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Feb 21, 2025

@Ph0B1uS have you replace the pick to the squash?

Yup, i did that and changed the commit message too, then push -f but it only added to the commit count I'm afraid.

Edit: The commits will no doubt be squashed upon merging though.

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Feb 24, 2025

Alright to merge or are there any suggestions and/or corrections that needs to be implemented?

@Valantin
Copy link
Contributor

Sorry but it can't be merged without the required changes, you can find here https://voxpupuli.org/docs/reviewing_pr/ the list of things to check before approve a PR

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Feb 26, 2025

Sorry but it can't be merged without the required changes, you can find here https://voxpupuli.org/docs/reviewing_pr/ the list of things to check before approve a PR

The only two points I can find in that document that needs to be rectified is:

  1. the label and correct me if I'm wrong but it would appear as if I cannot do that as in am not allowed to.
  2. the unfortunate commits from a non approved account.

How about I close this PR, open a new one to rectify the 2nd issue. Would that work or is there something else I've missed?

@Valantin
Copy link
Contributor

Valantin commented Feb 26, 2025

try to use "git rebase -i HEAD~3" replace "pick" with "edit" for the first line "ADD..." and replace "pick" with "squash" for all the other line, than save, "git commit --amend --author "Ph0B1uS <[email protected]>" --no-edit" than "git rebase --continue"

If all is ok "git log" show you one commit than you can force push it

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Feb 28, 2025

Reopening to rerun tests

@Ph0B1uS Ph0B1uS reopened this Feb 28, 2025
@Ph0B1uS Ph0B1uS closed this Mar 5, 2025
@Ph0B1uS
Copy link
Author

Ph0B1uS commented Mar 5, 2025

Reopening to rerun tests, hopefully they work a bit better this time

@Ph0B1uS
Copy link
Author

Ph0B1uS commented Mar 5, 2025

The failing tests has nothing to do with my code as they stem from a file which I have not touched, now what? :)

Copy link
Contributor

@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.

Add test for the new parameter if it is on zabbix >= 7.0

@Ph0B1uS Ph0B1uS requested a review from Valantin March 10, 2025 21:49
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.

SMSDevices required in zabbix_server.conf
5 participants