nixos/grafana: Remove duplicate plugins and add service script error handling #125703
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
happysalada
reviewed
Jun 6, 2021
happysalada
reviewed
Jun 6, 2021
| declarativePlugins = mkOption { | ||
| type = with types; nullOr (listOf path); | ||
| default = null; | ||
| description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; | ||
| example = literalExample "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; | ||
| apply = x: if isList x then lib.unique x else x; |
There was a problem hiding this comment.
Could you just add a comment here for why we are adding this.
Just so we can remember later in case it ever needs to be changed.
There was a problem hiding this comment.
Added a comment. I hope it's readable enough. :)
If the same plugin appears multiple times in `declarativePlugins`, for example due to being added both by a module and in user config, the build fails with an error message similar to ln: failed to create symbolic link 'grafana-worldmap-panel/glmqcj88zk2bz3mvdr3r7920wxg02qnq-grafana-worldmap-panel-0.3.2': Permission denied This is solved by removing all duplicates.
Without this, the services starts even if files are missing or prerequisite commands fail, which can lead to incorrect initial state.
|
Thanks a lot for this! ❤️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixes two issues I had when trying to use the module:
Remove duplicate plugins
If the same plugin appears multiple times in
declarativePlugins, for example due to being added both by a module and in user config, the build fails with an error message similar toThis is solved by removing all duplicates.
Add service script error handling
The services starts even if files are missing or prerequisite commands fail, which can lead to incorrect initial state.
Solved by adding some boilerplate bash error handling and exporting variables in a separate step (subshell errors aren't propagated otherwise).
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)