From 9598c993010d8dff0b428d59bb0957361f976f63 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Oct 2019 09:05:37 +0200
Subject: shack/muell_mail: mkYarnPackage comes from yarn2nix now

---
 krebs/2configs/shack/muell_mail.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs/shack')

diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index a41dbc977..2c105b912 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 
 let
-  pkg = pkgs.callPackage (
+  pkg = (
     pkgs.fetchgit {
       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 {
-- 
cgit v1.2.3


From 7535bc7457cb4cec27420d13570994d3badd2b3d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Oct 2019 14:08:00 +0200
Subject: shack/prometheus: use alertmanagers instead of alertmanagerURL

---
 krebs/2configs/shack/prometheus/server.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs/shack')

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";
-- 
cgit v1.2.3


From f786002cb3db57102d2382a450fa3715dac4742f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Oct 2019 14:35:56 +0200
Subject: shack/muell_mail: use callPackage

---
 krebs/2configs/shack/muell_mail.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs/shack')

diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index 2c105b912..5ae80d780 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  pkg = (
+  pkg = pkgs.callPackage (
     pkgs.fetchgit {
       url = "https://git.shackspace.de/rz/muell_mail";
       rev = "861ec25ab22797d8961efb32e72d79e113aa9f0f";
-- 
cgit v1.2.3