From fb5fa40e86b7f134b392d8b2136da9f90c65b5cb Mon Sep 17 00:00:00 2001
From: "xyno (Philipp Hochkamp)" <git@xyno.systems>
Date: Mon, 7 Aug 2023 19:15:48 +0200
Subject: [PATCH] aaa

---
 hosts/beliskner/default.nix               |  29 ++++++++++++++++------
 hosts/picard/xynospace-matrix.nix         |   3 +++
 secrets/prometheusBlackboxConfig.age      | Bin 996 -> 0 bytes
 secrets/prometheusBlackboxConfig.yaml.age | Bin 0 -> 1668 bytes
 secrets/secrets.nix                       |   2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 secrets/prometheusBlackboxConfig.age
 create mode 100644 secrets/prometheusBlackboxConfig.yaml.age

diff --git a/hosts/beliskner/default.nix b/hosts/beliskner/default.nix
index bfaa4150..2b274dc8 100644
--- a/hosts/beliskner/default.nix
+++ b/hosts/beliskner/default.nix
@@ -71,16 +71,29 @@
   };
 
 
-  ragon.agenix.secrets."prometheusBlackboxConfig" = { owner = config.services.prometheus.exporters.blackbox.user; };
-  users.groups.${config.services.prometheus.exporters.blackbox.user} = { };
-  users.users.${config.services.prometheus.exporters.blackbox.user} = {
-    isSystemUser = true;
-    group = config.services.prometheus.exporters.blackbox.user;
-  };
+  ragon.agenix.secrets."prometheusBlackboxConfig.yaml" = { owner = "prometheus"; };
+  services.prometheus.scrapeConfigs = [{
+    job_name = "blackbox";
+    file_sd_configs = [{
+      files = [
+        config.age.secrets."prometheusBlackboxConfig.yaml".path
+      ];
+    }];
+  }];
+  services.prometheus.checkConfig = false;
   services.prometheus.exporters.blackbox = {
     enable = true;
-    configFile = "${config.age.secrets.prometheusBlackboxConfig.path}";
-    enableConfigCheck = false;
+    configFile = pkgs.writeText "blackboxexporter" ''
+      modules:
+        dns:
+          prober: dns
+        http_2xx:
+          prober: http
+          timeout: 5s
+          http:
+            method: GET
+            preferred_ip_protocol: "ip4" # defaults to "ip6"
+    '';
   };
 
 
diff --git a/hosts/picard/xynospace-matrix.nix b/hosts/picard/xynospace-matrix.nix
index 8fac4102..7fff7de1 100644
--- a/hosts/picard/xynospace-matrix.nix
+++ b/hosts/picard/xynospace-matrix.nix
@@ -111,6 +111,9 @@ in
       locations."/_matrix" = {
         proxyPass = "http://${localAddress}:8008"; # without a trailing /
       };
+      locations."/notifications" = {
+        proxyPass = "http://${localAddress}:8008"; # without a trailing /
+      };
       locations."/synapse" = {
         proxyPass = "http://${localAddress}:8008"; # without a trailing /
       };
diff --git a/secrets/prometheusBlackboxConfig.age b/secrets/prometheusBlackboxConfig.age
deleted file mode 100644
index 23b5ae85b3c02119cb5539d614a3ee1d1445bab5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUl^a;=MDp#m*%J%Z~
z%t|T?EHX&+2sSP7ObazJOv?4nF7e5*&`&9<FfFa}E)EVeOy+VaPEYbONGi^+bSW$`
z^9icb5A}5~)ecR`&Wms}jL6Wo2yt`_&&bP42}QT9G~FXSyj&qCFf&5iB{;-9$v89A
zKOo)G+#o2}J=M?8-8I=gD9b(A*vPHaDAX-C*p(|Vq}0;XA}_DdKi53d(@;OM&^IwX
zt0YC+xj5S?E8DUlAiE;1$TKrD*#zCT&``^uU`GXSGw%X-BiE3mGE0lfOv6M!qp;w>
zT&Kzumvkq~B4d;E0#B2|Oh-2t4-+mQ!>qD&|8!GN$8du@ukb3bvT`%u{15|Am#Qic
z-;xOJ9JBQD^r9r+NJn(rg1kJ9og5XM@(qnm%v~ajJhJo3jJ3Ty6CEweT}ylo{X%nH
z&9uEeob*%jqk_yb@=UlYjZ*wAymLyj0{lZ$E5Zu%{6pOQN?Z#){F7Z>ikywSQlrdD
zO_NPs{nF8Gi^wbU@-9~}3r~(L3`)w*FDxt#(=PCKv~UcL$TBqdD>6?Fh;(-jEI0A?
z3AIdg3Q6WlDb+R(FAeoh4^J#FcXcmF^T>87OAqx;%h!%Ftc>uFG}TWJ$~R232=hd@
z&D_t&)Gu8jved#^+oPf~D96{+wKT#z$|KyZRJ+*F&mz^e*tEn*zf4=-H$5sbJ;#L0
zq{1gO$g9lNEy^RXG{h;p#LG3<I3qRGtlX(0-`A@uF)zg@GRo62GA9sZn^&G;Rc>xz
zjBa{SYGQG!LZL#8nS+8#je?h|t(hB_zo)ZHrfE5suCA_vX_Sd+PE@2%UYLoYUs9k!
zP;t1En^B6hWm#2jaiW{KX`X3$x?4q#mwO=BuEYnAHeY<$GvS=aqFW+Mw>|XdNC@+-
z6Aix*@GpjAeu>2eIaP+)$8P+o7pv*HIalw|hnAOS`}X{qS{+cA#cDPo=g7wAdvl7M
zPNxdY{J^qkMx}R)(o<Whrfqwsm#UYtbItv!7S=lVp3S{!N2e+>zIJ_j)Hiue#F1Hc
zVF4YNvgiEKn{8dZ`LwP1_Zv-&OUpOT)7|{Xbe|XFk5APLiXx&{#kdOF#YoDvidBbv
zRSZ$Iec+?)r1<)V#=@m;dC8{oc2kPhFGwnBH7x0J(fn-sWXkI^x_Kf?k1m;b&_31c
I*psy103~W*=>Px#

diff --git a/secrets/prometheusBlackboxConfig.yaml.age b/secrets/prometheusBlackboxConfig.yaml.age
new file mode 100644
index 0000000000000000000000000000000000000000..968d2bd2ee33a4a035f55c911d6444178a2b9cd4
GIT binary patch
literal 1668
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

literal 0
HcmV?d00001

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 45457d86..7886b84e 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -23,7 +23,7 @@ in
   "gitlabSecretFile.age".publicKeys = pubkeys.ragon.host "picard";
   "gitlabDBFile.age".publicKeys = pubkeys.ragon.host "picard";
   "gitlabOTPFile.age".publicKeys = pubkeys.ragon.host "picard";
-  "prometheusBlackboxConfig.age".publicKeys = pubkeys.ragon.host "beliskner";
+  "prometheusBlackboxConfig.yaml.age".publicKeys = pubkeys.ragon.host "beliskner";
   "gitlabJWSFile.age".publicKeys = pubkeys.ragon.host "picard";
   "nextcloudAdminPass.age".publicKeys = pubkeys.ragon.host "picard";
   "picardResticSSHKey.age".publicKeys = pubkeys.ragon.host "picard";