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

prometheus/exporters/collectd: fixed authFile #75884

Closed
wants to merge 1 commit into from
Closed

Conversation

exyi
Copy link

@exyi exyi commented Dec 18, 2019

Motivation for this change

The option authFile was present before, but it was apparently ignored

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

@aanderse aanderse requested a review from grahamc January 5, 2020 13:25
@exyi exyi requested a review from aanderse April 14, 2020 09:26
@Mic92 Mic92 changed the title prometheus/exportes/collectd: fixed authFile prometheus/exporters/collectd: fixed authFile Apr 14, 2020
@@ -61,6 +61,7 @@ in
collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
-collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
-collectd.security-level ${cfg.collectdBinary.securityLevel} \
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
Copy link
Member

Choose a reason for hiding this comment

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

Have you tested this?

Suggested change
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
${optionalString (cfg.colledtdBinary.authFile != null) "-collectd.auth-file ${cfg.collectdBinary.authFile}"} \

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
${optionalString (cfg.collectdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \

Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 27, 2020

Choose a reason for hiding this comment

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

Suggested change
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
${optionalString (cfg.collectdBinary.authFile != null) "-collectd.auth-file ${cfg.collectdBinary.authFile}"} \

@stale
Copy link

stale bot commented Oct 11, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 11, 2020
@@ -61,6 +61,7 @@ in
collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
-collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
-collectd.security-level ${cfg.collectdBinary.securityLevel} \
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 27, 2020

Choose a reason for hiding this comment

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

Suggested change
${optionalString (cfg.colledtdBinary.authFile != null) "-collextd.auth-file ${cfg.collectdBinary.authFile}"} \
${optionalString (cfg.collectdBinary.authFile != null) "-collectd.auth-file ${cfg.collectdBinary.authFile}"} \

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 27, 2020
@SuperSandro2000 SuperSandro2000 marked this pull request as draft November 27, 2020 21:29
@stale
Copy link

stale bot commented Jun 2, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 2, 2021
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 12, 2023
@Janik-Haag
Copy link
Member

@exyi Still interested in getting this merged? If you don't respond or aren't interested anymore I will just close it in a few weeks.

The option was present before, but it was apparently ignored
@exyi
Copy link
Author

exyi commented Jun 19, 2023

Sorry, I forgot about this. I applied the suggested changes, but I don't know how to test it. If this isn't something you'd want, feel free to close it, I don't really care if it gets merged or not.

@SuperSandro2000
Copy link
Member

There is no point in doing this, if you don't test it.

@exyi
Copy link
Author

exyi commented Jul 25, 2023

Ok, but the bug should get fixed somehow #245364

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants