git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #100274 from hax404/prometheus-xmpp-alerts
commit4c798857e2baa9578d24abbb2a2851313c201ba6 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateWed 19 May 2021, 01:36 (6 years ago) parent90b400603c0925
3 files changed+43−18
nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix+17−9 pkgs/servers/monitoring/prometheus/xmpp-alerts.nix+25−6 pkgs/top-level/all-packages.nix+1−3
nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix+17−9
@@ -4,21 +4,29 @@ with lib;
44
55let
66 cfg = config.services.prometheus.xmpp-alerts;
7−
8− configFile = pkgs.writeText "prometheus-xmpp-alerts.yml" (builtins.toJSON cfg.configuration);
9−
7+ settingsFormat = pkgs.formats.yaml {};
8+ configFile = settingsFormat.generate "prometheus-xmpp-alerts.yml" cfg.settings;
109in
11−
1210{
13− options.services.prometheus.xmpp-alerts = {
11+ imports = [
12+ (mkRenamedOptionModule
13+ [ "services" "prometheus" "xmpp-alerts" "configuration" ]
14+ [ "services" "prometheus" "xmpp-alerts" "settings" ])
15+ ];
1416
17+ options.services.prometheus.xmpp-alerts = {
1518 enable = mkEnableOption "XMPP Web hook service for Alertmanager";
1619
17− configuration = mkOption {
18− type = types.attrs;
19− description = "Configuration as attribute set which will be converted to YAML";
20− };
20+ settings = mkOption {
21+ type = settingsFormat.type;
22+ default = {};
2123
24+ description = ''
25+ Configuration for prometheus xmpp-alerts, see
26+ <link xlink:href="https://github.com/jelmer/prometheus-xmpp-alerts/blob/master/xmpp-alerts.yml.example"/>
27+ for supported values.
28+ '';
29+ };
2230 };
2331
2432 config = mkIf cfg.enable {
pkgs/servers/monitoring/prometheus/xmpp-alerts.nix+25−6
@@ -1,17 +1,36 @@
1−{ lib, fetchFromGitHub, pythonPackages }:
1+{ lib
2+, fetchFromGitHub
3+, python3Packages
4+, prometheus-alertmanager
5+}:
26
3−pythonPackages.buildPythonApplication rec {
7+python3Packages.buildPythonApplication rec {
48 pname = "prometheus-xmpp-alerts";
5− version = "0.4.2";
9+ version = "0.5.1";
610
711 src = fetchFromGitHub {
812 owner = "jelmer";
913 repo = pname;
10− rev = version;
11− sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63";
14+ rev = "v${version}";
15+ sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld";
1216 };
1317
14− propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ];
18+ propagatedBuildInputs = [
19+ prometheus-alertmanager
20+ ] ++ (with python3Packages; [
21+ aiohttp
22+ slixmpp
23+ prometheus_client
24+ pyyaml
25+ ]);
26+
27+ checkInputs = with python3Packages; [
28+ pytz
29+ ];
30+
31+ checkPhase = ''
32+ ${python3Packages.python.interpreter} -m unittest discover
33+ '';
1534
1635 meta = {
1736 description = "XMPP Web hook for Prometheus";
pkgs/top-level/all-packages.nix+1−3
@@ -19453,9 +19453,7 @@ in
1945319453 prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
1945419454 inherit (darwin.apple_sdk.frameworks) Security;
1945519455 };
19456− prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix {
19457− pythonPackages = python3Packages;
19458− };
19456+ prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
1945919457
1946019458 prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };
1946119459