Merge pull request #8 from lucasbergman/nix-cleanup

Nix cleanup
This commit is contained in:
Jeremy Wall 2024-02-20 09:09:16 -05:00 committed by GitHub
commit 0abd67a729
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 116 additions and 136 deletions

View File

@ -8,4 +8,5 @@ in
} }
) { ) {
src = ./.; src = ./.;
}).defaultNix })
.defaultNix

103
flake.nix
View File

@ -6,11 +6,20 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
naersk.url = "github:nix-community/naersk"; naersk.url = "github:nix-community/naersk";
flake-compat = { url = github:edolstra/flake-compat; flake = false; }; flake-compat = {
url = github:edolstra/flake-compat;
flake = false;
};
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = {nixpkgs, flake-utils, naersk, rust-overlay, ...}: outputs = {
nixpkgs,
flake-utils,
naersk,
rust-overlay,
...
}:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
overlays = [ overlays = [
rust-overlay.overlays.default rust-overlay.overlays.default
@ -26,67 +35,38 @@
verion = "0.0.1"; verion = "0.0.1";
src = ./.; src = ./.;
nativeBuildInputs = [pkgs.pkg-config]; nativeBuildInputs = [pkgs.pkg-config];
buildInputs = ( buildInputs =
if pkgs.stdenv.isDarwin then (
with pkgs.darwin.apple_sdk.frameworks; [ Security SystemConfiguration ] if pkgs.stdenv.isDarwin
else then with pkgs.darwin.apple_sdk.frameworks; [Security SystemConfiguration]
[ pkgs.openssl ]) ++ [rust-bin]; else [pkgs.openssl]
)
++ [rust-bin];
}; };
in in {
{
packages.default = heracles; packages.default = heracles;
}) // { formatter = pkgs.alejandra;
nixosModule = {config, pkgs, lib}: with lib; { })
// {
nixosModules.default = {
config,
pkgs,
lib,
}: {
options = { options = {
services.heracles.enable = mkEnableOption "enable heracles service"; services.heracles.enable = lib.mkEnableOption "enable heracles service";
services.heracles.listen = mkOption { services.heracles.listen = lib.mkOption {
description = "[host]:port address for heracles to listen on"; description = "[host]:port address for heracles to listen on";
default = "localhost:8080"; default = "localhost:8080";
defaultText = "localhost:8080"; defaultText = "localhost:8080";
type = lib.types.string;
}; };
services.heracles.settings = mkOption { services.heracles.settings = lib.mkOption {
description = "heracles dashboard Configuration"; description = "heracles dashboard Configuration";
default = [ type = lib.types.listOf lib.types.attrs;
{ default = [];
title = "A dashboard"; defaultText = lib.literalExpression ''
graphs = [
{
title = "Graph title";
query_type = "Range";
# yaxis formatting default for this graph
d3_tick_format = "~s";
plots = [
{
source = "http://heimdall:9001";
query = ''
sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))
'';
meta = {
name_function = "`\${labels.instance}`";
named_axis = "y";
# yaxis formatting for this subplot
d3_tick_format = "~s";
};
}
];
# span for this graph.
span = {
end = "now";
duration = "1d";
step_duration = "10min";
};
}
];
# default span for dashboard
span = {
end = "now";
duration = "1d";
step_duration = "10min";
};
}
];
defaultText = ''
[ [
{ {
title = "A dashboard"; title = "A dashboard";
@ -103,9 +83,7 @@
sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m])) sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))
\'\'; \'\';
meta = { meta = {
name_label = "instance"; name_function = "''${labels.instance}";
name_prefix = "trace name prefix";
name_suffix = "trace name suffix";
named_axis = "y"; named_axis = "y";
# yaxis formatting for this subplot # yaxis formatting for this subplot
d3_tick_format = "~s"; d3_tick_format = "~s";
@ -132,10 +110,11 @@
}; };
}; };
config = mkIf config.services.heracles.enable { config = let
environment.etc."heracles.yaml" = { cfg = config.services.heracles;
text = (generators.toYAML {} config.services.heracles.settings); cfgFile = pkgs.writeText "heracles.yaml" (builtins.toJSON cfg.settings);
}; in
lib.mkIf cfg.enable {
systemd.services.heracles = { systemd.services.heracles = {
wantedBy = ["multi-user.target" "default.target"]; wantedBy = ["multi-user.target" "default.target"];
wants = ["network.target"]; wants = ["network.target"];
@ -143,7 +122,7 @@
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "30s"; RestartSec = "30s";
ExecStart = "${pkgs.heracles}/bin/heracles --listen ${config.services.heracles.listen} --config=${config.environment.etc."heracles.yaml".target}"; ExecStart = "${pkgs.heracles}/bin/heracles --listen ${cfg.listen} --config=${cfgFile}";
}; };
}; };
}; };