From 79ce805761aa0acedb827141dee46c1ec0b059f4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 30 Jan 2023 11:06:52 +0100 Subject: [PATCH 1/2] prometheus-shelly-exporter: init at 1.0.0 --- .../monitoring/prometheus/shelly-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/shelly-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix new file mode 100644 index 000000000000..ee8002e66140 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "shelly_exporter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "aexel90"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo="; + }; + + vendorSha256 = "sha256-BCrge2xLT4b4wpYA+zcsH64a/nfV8+HeZF7L49p2gEw="; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) shelly; }; + + meta = with lib; { + description = "Shelly humidity sensor exporter for prometheus"; + homepage = "https://github.com/aexel90/shelly_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [drupol]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c859120680aa..31b0ef716d1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25016,6 +25016,7 @@ with pkgs; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; + prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; From 9f17e032e7e7c34ddf8c04472bee9d627951fc44 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 30 Jan 2023 18:58:42 +0100 Subject: [PATCH 2/2] prometheus-shelly-exporter: add NixOS module --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/shelly.nix | 27 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 14 ++++++++++ 3 files changed, 42 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/shelly.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f3fbfb149ad7..b2132b62d678 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -64,6 +64,7 @@ let "rspamd" "rtl_433" "script" + "shelly" "snmp" "smartctl" "smokeping" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix b/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix new file mode 100644 index 000000000000..b9cfd1b1e84a --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.shelly; +in +{ + port = 9784; + extraOpts = { + metrics-file = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to the JSON file with the metric definitions + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-shelly-exporter}/bin/shelly_exporter \ + -metrics-file ${cfg.metrics-file} \ + -listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 5f50a3f87d5d..82d50da63818 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1060,6 +1060,20 @@ let ''; }; + shelly = { + exporterConfig = { + enable = true; + metrics-file = "${pkgs.writeText "test.json" ''{}''}"; + }; + exporterTest = '' + wait_for_unit("prometheus-shelly-exporter.service") + wait_for_open_port(9784) + wait_until_succeeds( + "curl -sSf 'localhost:9784/metrics'" + ) + ''; + }; + script = { exporterConfig = { enable = true;