From 77ca582d91127a5e606652a2e9825dcd63b35df0 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 8 Jun 2020 10:23:44 -0400 Subject: [PATCH 1/3] prometheus-keylight-exporter: init at 0.1.1 --- .../prometheus/keylight-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/keylight-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix new file mode 100644 index 00000000000..b4d716bcdcb --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "keylight-exporter"; + version = "0.1.1"; + + goPackagePath = "github.com/mdlayher/keylight_exporter"; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "keylight_exporter"; + rev = "v${version}"; + sha256 = "141npawcnxj3sz2xqsnyf06r4x1azk3g55941i8gjr7pwcla34r7"; + }; + + vendorSha256 = "0w065ls8dp687jmps4xdffcarss1wyls14dngr43g58xjw6519gb"; + + meta = with stdenv.lib; { + homepage = "https://github.com/mdlayher/keylight_exporter"; + description = "Prometheus exporter for Elgato Key Light devices."; + license = licenses.mit; + maintainers = with maintainers; [ mdlayher ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae39..4caa999e44c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16134,6 +16134,7 @@ in prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; From 51da4293f5fbcd7766bfc832ebf283b5e288e1b9 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Tue, 9 Jun 2020 16:48:40 -0400 Subject: [PATCH 2/3] prometheus-keylight-exporter: remove unnecessary goPackagePath Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> --- pkgs/servers/monitoring/prometheus/keylight-exporter.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index b4d716bcdcb..e1be2a0bddc 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "keylight-exporter"; version = "0.1.1"; - goPackagePath = "github.com/mdlayher/keylight_exporter"; - src = fetchFromGitHub { owner = "mdlayher"; repo = "keylight_exporter"; From e77426822ff234a50bf959384e86d78c0cf9a240 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 10 Jun 2020 13:12:43 -0400 Subject: [PATCH 3/3] nixos/prometheus-keylight-exporter: new module Signed-off-by: Matt Layher --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/keylight.nix | 19 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/keylight.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f9ad1457fc8..b62a68860da 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -28,6 +28,7 @@ let "dovecot" "fritzbox" "json" + "keylight" "mail" "mikrotik" "minio" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix b/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix new file mode 100644 index 00000000000..dfa56343b87 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.keylight; +in +{ + port = 9288; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-keylight-exporter}/bin/keylight_exporter \ + -metrics.addr ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4fc3668cfaf..e2221352dcf 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -202,6 +202,25 @@ let ''; }; + keylight = { + # A hardware device is required to properly test this exporter, so just + # perform a couple of basic sanity checks that the exporter is running + # and requires a target, but cannot reach a specified target. + exporterConfig = { + enable = true; + }; + exporterTest = '' + wait_for_unit("prometheus-keylight-exporter.service") + wait_for_open_port(9288) + succeed( + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics | grep -q '400'" + ) + succeed( + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics?target=nosuchdevice | grep -q '500'" + ) + ''; + }; + mail = { exporterConfig = { enable = true;