From 5c1cccb8a4cb5bce1bea9110962bc6f2e9188a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 5 Sep 2023 14:41:52 +0300 Subject: [PATCH] snmp: from package back to module --- flake.nix | 2 -- hosts/vno1-oh2/configuration.nix | 8 ++----- modules/services/default.nix | 1 + .../services/snmp_exporter}/README.md | 0 modules/services/snmp_exporter/default.nix | 21 +++++++++++++++++++ .../services/snmp_exporter}/generator.yml | 0 .../services/snmp_exporter}/snmp.yml | 0 packages/snmp-yaml/default.nix | 19 ----------------- 8 files changed, 24 insertions(+), 27 deletions(-) rename {packages/snmp-yaml => modules/services/snmp_exporter}/README.md (100%) create mode 100644 modules/services/snmp_exporter/default.nix rename {packages/snmp-yaml => modules/services/snmp_exporter}/generator.yml (100%) rename {packages/snmp-yaml => modules/services/snmp_exporter}/snmp.yml (100%) delete mode 100644 packages/snmp-yaml/default.nix diff --git a/flake.nix b/flake.nix index 896c720..b3584a9 100644 --- a/flake.nix +++ b/flake.nix @@ -173,7 +173,5 @@ }; formatter = pkgs.alejandra; - - packages.snmp-yaml = pkgs.callPackage ./packages/snmp-yaml {}; }); } diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix index 4e40f14..31b4e72 100644 --- a/hosts/vno1-oh2/configuration.nix +++ b/hosts/vno1-oh2/configuration.nix @@ -100,6 +100,8 @@ gitea.enable = true; + snmp_exporter.enable = true; + headscale = { enable = true; clientOidcPath = config.age.secrets.headscale-client-oidc.path; @@ -300,12 +302,6 @@ evaluation_interval = "15s"; }; - exporters.snmp = { - enable = true; - listenAddress = "127.0.0.1"; - configuration = {}; - }; - scrapeConfigs = let port = builtins.toString myData.ports.exporters.node; in [ diff --git a/modules/services/default.nix b/modules/services/default.nix index 98acaaf..0049a35 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -13,6 +13,7 @@ ./node_exporter ./nsd-acme ./postfix + ./snmp_exporter ./syncthing ./zfsunlock ]; diff --git a/packages/snmp-yaml/README.md b/modules/services/snmp_exporter/README.md similarity index 100% rename from packages/snmp-yaml/README.md rename to modules/services/snmp_exporter/README.md diff --git a/modules/services/snmp_exporter/default.nix b/modules/services/snmp_exporter/default.nix new file mode 100644 index 0000000..2e5ab2c --- /dev/null +++ b/modules/services/snmp_exporter/default.nix @@ -0,0 +1,21 @@ +{ + config, + lib, + myData, + ... +}: { + options.mj.services.snmp_exporter = with lib.types; { + enable = lib.mkEnableOption "Enable prometheus snmp_exporter"; + }; + + config = lib.mkIf config.mj.services.snmp_exporter.enable { + mj.services.friendlyport.vpn.ports = [config.services.prometheus.exporters.snmp.port]; + + services.prometheus.exporters.snmp = { + enable = true; + listenAddress = "127.0.0.1"; + configurationPath = ./snmp.yml; + }; + + }; +} diff --git a/packages/snmp-yaml/generator.yml b/modules/services/snmp_exporter/generator.yml similarity index 100% rename from packages/snmp-yaml/generator.yml rename to modules/services/snmp_exporter/generator.yml diff --git a/packages/snmp-yaml/snmp.yml b/modules/services/snmp_exporter/snmp.yml similarity index 100% rename from packages/snmp-yaml/snmp.yml rename to modules/services/snmp_exporter/snmp.yml diff --git a/packages/snmp-yaml/default.nix b/packages/snmp-yaml/default.nix deleted file mode 100644 index 20d89d6..0000000 --- a/packages/snmp-yaml/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - stdenv, - pkgs, - prometheus-snmp-exporter, -}: -stdenv.mkDerivation { - name = "snmp-yaml"; - inherit (prometheus-snmp-exporter) version src; - - buildInputs = [prometheus-snmp-exporter]; - - buildPhase = '' - mkdir -p $out - set -x - cd $src/generator - ${prometheus-snmp-exporter}/bin/generator generate \ - --output-path=$out/snmp.yml - ''; -}