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

grafana: support socket protocol #38885

Merged
merged 1 commit into from Apr 13, 2018
Merged

grafana: support socket protocol #38885

merged 1 commit into from Apr 13, 2018

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

Grafana supports unix sockets, but this cannot be configured using the protocol option.

Things done

This PR adds the socket value to the services.grafana.protocol enum, allowing grafana to listen on a unix socket.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 merged commit 0cb8413 into NixOS:master Apr 13, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 13, 2018

18.03:

[detached HEAD f956b4f] grafana: support socket protocol
Author: Ben Wolsieffer benwolsieffer@gmail.com
Date: Thu Apr 12 22:46:12 2018 -0400
1 file changed, 1 insertion(+), 1 deletion(-)

@lopsided98 lopsided98 deleted the grafana-unix-socket branch April 13, 2018 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 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
@lopsided98 @Mic92 @GrahamcOfBorg