Merge branch 'main' of ssh://git.berlin.ccc.de/cccb/matrix

services/draupnir.nix

@@ -2,7 +2,7 @@
 
 {
   services.draupnir = {
-    enable = false;
+    enable = true;
     settings = {
       homeserverUrl = "https://matrix.berlin.ccc.de";
       managementRoom = "!ZYWNuaQBkkenNklCSm:matrix.org"; # #cccb-moderators:berlin.ccc.de

services/prometheus.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   services.prometheus = {
@@ -6,8 +6,14 @@
     retentionTime = "14d";
     listenAddress = "[::1]";
     exporters = {
-      #node = {};
-      #nginx = {};
+      node = {
+        enable = true;
+        listenAddress = config.services.prometheus.listenAddress;
+      };
+      nginx = {
+        enable = true;
+        listenAddress = config.services.prometheus.listenAddress;
+      };
       #postgres = {};
     };
     scrapeConfigs = [
@@ -16,10 +22,28 @@
         scrape_interval = "15s";
         static_configs = [
           {
-            targets = [ "[::1]:9009" ];
+            targets = lib.pipe config.services.matrix-synapse.settings.listeners [
+              (lib.filter (l: l.type == "metrics"))
+              builtins.head
+              (l: [ "[${builtins.head l.bind_addresses}]:${toString l.port}" ])
+            ];
           }
         ];
       }
+      {
+        job_name = "node";
+        scrape_interval = "15s";
+        static_configs = [
+          { targets = [ "${config.services.prometheus.exporters.node.listenAddress}:${toString config.services.prometheus.exporters.node.port}" ]; }
+        ];
+      }
+      {
+        job_name = "nginx";
+        scrape_interval = "15s";
+        static_configs = [
+          { targets = [ "${config.services.prometheus.exporters.nginx.listenAddress}:${toString config.services.prometheus.exporters.nginx.port}" ]; }
+        ];
+      }
     ];
     ruleFiles = [
       # https://github.com/element-hq/synapse/tree/master/contrib/prometheus