diff options
| author | lassulus <lassulus@lassul.us> | 2019-10-16 11:39:55 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-10-16 11:39:55 +0200 |
| commit | 1cfe17faa0b5b2d062da0b3cdbda34b1241dac02 (patch) | |
| tree | 2ae25beec60641929e65d22b05a241eff656b8c0 /krebs/2configs | |
| parent | 005d456ef42ca1a371131a558e834944ce2e616f (diff) | |
| parent | 349ccf95e76dec7d3eb87b96cc8bb8bcb3317dc0 (diff) | |
Merge remote-tracking branch 'gum/19.09'
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/shack/muell_mail.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/shack/prometheus/server.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix index a41dbc977..5ae80d780 100644 --- a/krebs/2configs/shack/muell_mail.nix +++ b/krebs/2configs/shack/muell_mail.nix @@ -6,7 +6,7 @@ let url = "https://git.shackspace.de/rz/muell_mail"; rev = "861ec25ab22797d8961efb32e72d79e113aa9f0f"; sha256 = "sha256:18cw95zbr7isv4cw80cbpd84n5z208fwh5390i6j10jkn398mjq2"; - }) {}; + }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; }; home = "/var/lib/muell_mail"; cfg = toString <secrets/shack/muell_mail.js>; in { diff --git a/krebs/2configs/shack/prometheus/server.nix b/krebs/2configs/shack/prometheus/server.nix index 12f757e89..7f6f38610 100644 --- a/krebs/2configs/shack/prometheus/server.nix +++ b/krebs/2configs/shack/prometheus/server.nix @@ -28,7 +28,6 @@ "-storage.local.index-cache-size.label-name-to-label-values 2097152" "-storage.local.index-cache-size.label-pair-to-fingerprints 41943040" ]; - alertmanagerURL = [ "http://localhost:9093" ]; rules = [ '' ALERT node_down @@ -161,6 +160,12 @@ ]; } ]; + alertmanagers = [ + { scheme = "http"; + path_prefix = "/"; + static_configs = [ { targets = [ "localhost:9093" ]; } ]; + } + ]; alertmanager = { enable = true; listenAddress = "0.0.0.0"; |