services/prometheus/exporters: add scaphandre #239803
Conversation
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
c0192ee
to
f5ea447
Compare
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
2 times, most recently
from
3f94e09
to
9036413
Compare
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
9036413
to
4876a3b
Compare
| enable = true; | ||
| }; | ||
| metricProvider = { | ||
| boot.kernelModules = [ "intel_rapl_common" ]; |
There was a problem hiding this comment.
Apparently this option will fail on the CI but it does not fail on my host even if ran in QEMU. I added an assertion to make sure it is added explicitly by the user but it seems scaphandre does not produce any error if it is not "really" probed.
There was a problem hiding this comment.
Well it produces an error but it is not what's tested, should I try to handle it?
| ); | ||
| message = '' | ||
| Please enable 'intel_rapl_common' in boot.kernelModules | ||
| ''; |
There was a problem hiding this comment.
I think I should also assert that machine runs on Intel or AMD according to the compatibility page but I don't know how to do that.
There was a problem hiding this comment.
I tried to restrict as much as possible the possibility to use Scaphandre without having the proper configuration.
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
4876a3b
to
877f76c
Compare
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
877f76c
to
d64f297
Compare
|
@GrahamcOfBorg test prometheus-exporters.scaphandre |
nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix
Outdated
Show resolved
Hide resolved
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
d64f297
to
cf16bbc
Compare
|
@GrahamcOfBorg build scaphandre |
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
cf16bbc
to
f63009a
Compare
gaelreyrol
force-pushed
the
prometheus-scaphandre-exporter-init
branch
from
f63009a
to
e11f06a
Compare
There was a problem hiding this comment.
I got linked to the commit from Matrix, I think there are some issues with this MR as it was merged 🙃.
| } { | ||
| assertion = cfg.scaphandre.enable -> (pkgs.stdenv.hostPlatform.isx86_64 == true); | ||
| message = '' | ||
| Only x86_64 host platform architecture is not supported. |
There was a problem hiding this comment.
I think you meant
| Only x86_64 host platform architecture is not supported. | |
| Only x86_64 host platform architecture is supported. |
There was a problem hiding this comment.
And are you sure the (build) host should be x86_64? Or do you mean the (build) target, i.e: the machine that will run the code?
There was a problem hiding this comment.
Well I mean the build target indeed.
| } { | ||
| assertion = cfg.scaphandre.enable -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false; | ||
| message = '' | ||
| A kernel version newer than '5.11' is required. ${pkgs.linux.version} |
There was a problem hiding this comment.
This should explain that the assertion comes from cfg.scaphandre.enable.
There was a problem hiding this comment.
@ambroisie Is there any convention to explain that if comes from a specific config?
| } { | ||
| assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules); | ||
| message = '' | ||
| Please enable 'intel_rapl_common' in 'boot.kernelModules'. |
Still learning the job of a maintainer every single day! Sorry for the trouble ! |
|
@ambroisie What are the issues other than your review comments? |
|
@gaelreyrol I meant the ones I commented on :-). @drupol no worries, I don't even have the commit bit myself 😄. |
|
@ambroisie I submitted a new PR to apply your comments: #240571 |
Description of changes
This PR add scaphandre package to prometheus exporters.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)