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

Jump to bottom

nixos/zabbix: overhaul package & module #63844

Merged
merged 4 commits into from Jul 12, 2019
Merged

nixos/zabbix: overhaul package & module #63844

merged 4 commits into from Jul 12, 2019

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Jun 27, 2019 •
edited

Motivation for this change

Team effort between @mmahut and myself to cleanup Zabbix in NixOS as the module & packages have become fairly unmaintained.

I've been running this in a reasonably sized environment for about a month now.

Things not yet done
  • Write some release notes (@aanderse)
  • Add a NixOS test which tests all of the server, proxy, and agent (@mmahut)
  • test zabbixProxy module in a real environment (@aanderse)

I'm comfortable to go ahead and merge this without a NixOS test in good faith that @mmahut will eventually get the up and running. As for the zabbixProxy module it will eventually get tested in my environment before 19.09 so I can fix an issues which may come up before then. At this point mostly waiting for @PsyanticY to give a thumbs up, as they had done some of the same work this PR does (my fault, I really should have searched for any open PRs when I pushed this).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This was referenced Jun 30, 2019
Merged
Merged
@aanderse aanderse force-pushed the zabbix-cleanup branch 2 times, most recently from 77a1543 to 9cbb595 Compare July 6, 2019 20:49
@aanderse aanderse changed the title Zabbix cleanup nixos/zabbix: overhaul package & module Jul 8, 2019
@aanderse
Copy link
Member Author

@PsyanticY Well I didn't notice #63581... Can you please review this and provide feedback?

@aanderse aanderse marked this pull request as ready for review July 11, 2019 23:01
@aanderse aanderse requested a review from infinisil as a code owner July 11, 2019 23:01
@aanderse aanderse mentioned this pull request Jul 11, 2019
Merged
10 tasks
@aanderse aanderse mentioned this pull request Jul 12, 2019
Closed
10 tasks
@matthewbauer
Copy link
Member

Sorry for missing this! Had not realized there were multiple zabbix prs, but this one certainly looks to handle things well. Feel free to revert the other PR (or base on top of it).

@aanderse
Copy link
Member Author

@matthewbauer No problem, it happens. My fault as well. I had started this branch before the other was publish so when I checked it wasn't there... but then when I actually pushed and made a PR I didn't check again. Oops.

This PR has now been based on top of master after the other PR was merged. As mentioned I have been running this for roughly a month now. Mostly compatible with the merged PR, just a few tiny naming differences. Care to merge?

@PsyanticY
Copy link
Contributor

@aanderse, as @matthewbauer said this one handle thing way better then the other pr so please revert the other or base on top of it.

@aanderse
Copy link
Member Author

@PsyanticY Thanks for your approval on this. I regret that our work clashed so I'll double check open PRs more than once next time I work on something like this! Already rebased and briefly tested so I'm going ahead and merging this. Thank you for your support and listing yourself as a maintainer. I hope to hear from you again on the topic of zabbix on NixOS 😄

@aanderse aanderse merged commit c13fbe0 into NixOS:master Jul 12, 2019
@PsyanticY
Copy link
Contributor

Thanks, no problem, it is all for the grater nix good :p :)

@aanderse aanderse deleted the zabbix-cleanup branch July 12, 2019 10:31
@mmahut mmahut mentioned this pull request Jul 16, 2019
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aanderse @matthewbauer @PsyanticY