modules/nixos/services/caddy.nix

@@ -30,7 +30,6 @@
             errors.routes = config.caddy.blocks;
             # logs = { }; # Uncomment to collect access logs
           };
-          apps.http.servers.metrics = { }; # Enables Prometheus metrics
           apps.tls.automation.policies = config.caddy.tlsPolicies;
           logging.logs.main = {
             encoder = { format = "console"; };
@@ -48,8 +47,6 @@
       networking.firewall.allowedTCPPorts = [ 80 443 ];
       networking.firewall.allowedUDPPorts = [ 443 ];
 
-      prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
-
     };
 
 }

modules/nixos/services/cloudflare.nix

@@ -41,11 +41,11 @@ in {
   config = lib.mkIf config.cloudflare.enable {
 
     # Forces Caddy to error if coming from a non-Cloudflare IP
-    caddy.routes = [{
+    caddy.blocks = [{
       match = [{ not = [{ remote_ip.ranges = cloudflareIpRanges; }]; }];
       handle = [{
         handler = "static_response";
-        status_code = "403";
+        abort = true;
       }];
     }];
 

modules/nixos/services/jellyfin.nix

@@ -5,25 +5,13 @@
     services.jellyfin.group = "media";
     users.users.jellyfin = { isSystemUser = true; };
 
-    caddy.routes = [
+    caddy.routes = [{
-      {
-        match = [{
-          host = [ config.hostnames.stream ];
-          path = [ "/metrics*" ];
-        }];
-        handle = [{
-          handler = "static_response";
-          status_code = "403";
-        }];
-      }
-      {
       match = [{ host = [ config.hostnames.stream ]; }];
       handle = [{
         handler = "reverse_proxy";
         upstreams = [{ dial = "localhost:8096"; }];
       }];
-      }
+    }];
-    ];
 
     # Create videos directory, allow anyone in Jellyfin group to manage it
     systemd.tmpfiles.rules = [
@@ -47,9 +35,6 @@
     users.users.jellyfin.extraGroups =
       [ "render" "video" ]; # Access to /dev/dri
 
-    # Requires MetricsEnable is true in /var/lib/jellyfin/config/system.xml
-    prometheus.scrapeTargets = [ "127.0.0.1:8096" ];
-
   };
 
 }

modules/nixos/services/prometheus.nix

@@ -38,8 +38,6 @@
 
     services.prometheus = {
       exporters.node.enable = config.prometheus.exporters.enable;
-      exporters.node.enabledCollectors = [ ];
-      exporters.node.disabledCollectors = [ "cpufreq" ];
       exporters.systemd.enable = config.prometheus.exporters.enable;
       exporters.process.enable = config.prometheus.exporters.enable;
       exporters.process.settings.process_names = [