git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93291 from mdlayher/mdl-mmexporter

prometheus-modemmanager-exporter: init at 0.1.0, add NixOS module

commitc8a29f640a3c2d2b914d273616b18920734b72bb authorWilliButz <WilliButz@users.noreply.github.com> dateFri 17 Jul 2020, 20:02 (6 years ago) parent5adadd1a58346a
5 files changed+84
nixos/modules/services/monitoring/prometheus/exporters.nix+1 nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix+33 nixos/tests/prometheus-exporters.nix+25 pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix+24 pkgs/top-level/all-packages.nix+1
nixos/modules/services/monitoring/prometheus/exporters.nix+1
@@ -34,6 +34,7 @@ let
3434 "mail"
3535 "mikrotik"
3636 "minio"
37+ "modemmanager"
3738 "nextcloud"
3839 "nginx"
3940 "node"
nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nixnew file+33
@@ -0,0 +1,33 @@
1+{ config, lib, pkgs, options }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.prometheus.exporters.modemmanager;
7+in
8+{
9+ port = 9539;
10+ extraOpts = {
11+ refreshRate = mkOption {
12+ type = types.str;
13+ default = "5s";
14+ description = ''
15+ How frequently ModemManager will refresh the extended signal quality
16+ information for each modem. The duration should be specified in seconds
17+ ("5s"), minutes ("1m"), or hours ("1h").
18+ '';
19+ };
20+ };
21+ serviceOpts = {
22+ serviceConfig = {
23+ # Required in order to authenticate with ModemManager via D-Bus.
24+ SupplementaryGroups = "networkmanager";
25+ ExecStart = ''
26+ ${pkgs.prometheus-modemmanager-exporter}/bin/modemmanager_exporter \
27+ -addr ${cfg.listenAddress}:${toString cfg.port} \
28+ -rate ${cfg.refreshRate} \
29+ ${concatStringsSep " \\\n " cfg.extraFlags}
30+ '';
31+ };
32+ };
33+}
nixos/tests/prometheus-exporters.nix+25
@@ -363,6 +363,31 @@ let
363363 '';
364364 };
365365
366+ modemmanager = {
367+ exporterConfig = {
368+ enable = true;
369+ refreshRate = "10s";
370+ };
371+ metricProvider = {
372+ # ModemManager is installed when NetworkManager is enabled. Ensure it is
373+ # started and is wanted by NM and the exporter to start everything up
374+ # in the right order.
375+ networking.networkmanager.enable = true;
376+ systemd.services.ModemManager = {
377+ enable = true;
378+ wantedBy = [ "NetworkManager.service" "prometheus-modemmanager-exporter.service" ];
379+ };
380+ };
381+ exporterTest = ''
382+ wait_for_unit("ModemManager.service")
383+ wait_for_unit("prometheus-modemmanager-exporter.service")
384+ wait_for_open_port(9539)
385+ succeed(
386+ "curl -sSf http://localhost:9539/metrics | grep -q 'modemmanager_info'"
387+ )
388+ '';
389+ };
390+
366391 nextcloud = {
367392 exporterConfig = {
368393 enable = true;
pkgs/servers/monitoring/prometheus/modemmanager-exporter.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
2+
3+buildGoModule rec {
4+ pname = "modemmanager-exporter";
5+ version = "0.1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "mdlayher";
9+ repo = "modemmanager_exporter";
10+ rev = "v${version}";
11+ sha256 = "0d8z7qzk5j5jj0ixkwpi8dw9kki78mxrajdlzzcj2rcgbnwair91";
12+ };
13+
14+ vendorSha256 = "0f6v97cvzdz7wygswpm87wf8r169x5rw28908vqhmqk644hli4zy";
15+
16+ passthru.tests = { inherit (nixosTests.prometheus-exporters) modemmanager; };
17+
18+ meta = with stdenv.lib; {
19+ homepage = "https://github.com/mdlayher/modemmanager_exporter";
20+ description = "Prometheus exporter for ModemManager and its devices.";
21+ license = licenses.mit;
22+ maintainers = with maintainers; [ mdlayher ];
23+ };
24+}
pkgs/top-level/all-packages.nix+1
@@ -16392,6 +16392,7 @@ in
1639216392 prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
1639316393 prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { };
1639416394 prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
16395+ prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { };
1639516396 prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
1639616397 prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };
1639716398 prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };