feat: switch to pkgs.nix-based alloy module & package (#17)

* feat: switch to pkgs.nix-based alloy module & package * fix: include extra ports in firewall for alloy, formatting fixes * feat: update flake lockfile * feat: update alloy configs * fix: pathing issue in alloy grafana cloud module import * feat: update gc-fwd config * feat: update generic alloy config * feat: remove cachix-agent * fix: update flake.lock
ALT-F4-LLC · Jun 1, 2024 · 7c259a3 · 7c259a3
1 parent 6377de1
commit 7c259a3
Show file tree

Hide file tree

Showing 12 changed files with 170 additions and 120 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,6 +7,9 @@
 
     srvos.url = "github:nix-community/srvos";
     srvos.inputs.nixpkgs.follows = "nixpkgs";
+
+    pkgs-nix.url = "github:ALT-F4-LLC/pkgs.nix";
+    pkgs-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs @ {flake-parts, ...}:
@@ -26,44 +29,7 @@
 
         formatter = pkgs.alejandra;
 
-        packages = {
-          gc-fwd = inputs.nixos-generators.nixosGenerate {
-            inherit system;
-            modules = [
-              inputs.srvos.nixosModules.server
-              inputs.srvos.nixosModules.hardware-amazon
-              ./modules/profiles/common.nix
-              ./modules/mixins/alloy-forwarder
-            ];
-            format = "amazon"; # ami
-          };
-
-          ecs-node = inputs.nixos-generators.nixosGenerate {
-            inherit system;
-            modules = [
-              inputs.srvos.nixosModules.server
-              inputs.srvos.nixosModules.hardware-amazon
-              ./modules/profiles/common.nix
-              ./modules/mixins/ecs-agent
-            ];
-            format = "amazon"; # ami
-          };
-
-          actions-runner = inputs.nixos-generators.nixosGenerate {
-            inherit system;
-            modules = [
-              ({...}: { amazonImage.sizeMB = 6 * 1024; })
-              inputs.srvos.nixosModules.server
-              inputs.srvos.nixosModules.hardware-amazon
-              ./modules/profiles/common.nix
-              ./modules/mixins/github-actions
-            ];
-            specialArgs = {
-              diskSize = 6 * 1024; # 6GB
-            };
-            format = "amazon"; # ami
-          };
-        };
+        packages = import ./nix/images.nix { inherit system inputs; };
       };
     };
 }
diff --git a/modules/mixins/alloy-forwarder/config.alloy b/modules/mixins/alloy-forwarder/config.alloy
@@ -1,13 +1,13 @@
-import.git "gcloud" {
+import.git "grafana_cloud" {
   repository     = "https://github.com/grafana/alloy-modules.git"
-  path           = "modules/cloud/grafana/cloud/module.river"
+  path           = "modules/cloud/grafana/cloud/module.alloy"
   revision       = "main"
   pull_frequency = "0s"
 }
 
-gcloud.stack "default" {
-    stack_name = env("GRAFANA_CLOUD_STACK")
-    token      = env("GRAFANA_CLOUD_TOKEN")
+grafana_cloud.stack "receivers" {
+  stack_name = env("GRAFANA_CLOUD_STACK")
+  token      = env("GRAFANA_CLOUD_TOKEN")
 }
 
 prometheus.receive_http "forward" {
@@ -22,14 +22,20 @@ prometheus.receive_http "forward" {
 
 prometheus.scrape "linux_node" {
   targets = prometheus.exporter.unix.node.targets
-  forward_to = [
-    grafana_cloud.stack.receivers.metrics,
-  ]
+  forward_to = [ grafana_cloud.stack.receivers.metrics ]
 }
 
 prometheus.exporter.unix "node" {
 }
 
+prometheus.exporter.self "agent" {
+}
+
+prometheus.scrape "agent" {
+  targets = prometheus.exporter.self.agent.targets
+  forward_to = [ grafana_cloud.stack.receivers.metrics ]
+}
+
 loki.source.api "receive" {
     http {
         listen_address = "0.0.0.0"

diff --git a/modules/mixins/alloy-forwarder/default.nix b/modules/mixins/alloy-forwarder/default.nix
@@ -1,13 +1,25 @@
-{lib, ...}: {
-  imports = [../alloy];
+{ lib, ... }: {
+  imports = [ ../alloy ];
 
   # Only change from normal Alloy mixin is an overridden config file
   environment.etc."alloy/config.alloy".source = lib.mkForce ./config.alloy;
 
-  virtualisation.oci-containers.containers.alloy = {
-    environmentFiles = ["/run/keys/grafana-cloud"];
+  networking.firewall.allowedTCPPorts = [
+    9090 # Prometheus
+    3100 # Loki
+    4317 # OTLP/gRPC
+    4318 # OTLP/HTTP
+  ];
 
-    environment = {
+  networking.firewall.allowedUDPPorts = [
+    4317 # OTLP/gRPC
+  ];
+
+  services.alloy = {
+    extraArgs = "--stability.level public-preview";
+
+    environmentFiles = [ "/run/keys/grafana-cloud" ];
+    extraEnvironment = {
       GRAFANA_CLOUD_STACK = "altf4llc";
     };
   };

diff --git a/modules/mixins/alloy/config.alloy b/modules/mixins/alloy/config.alloy
@@ -69,21 +69,21 @@ prometheus.relabel "instance" {
 }
 
 // Export system metrics
-prometheus.exporter.unix "host" {
-  procfs_path    = "/host/proc"
-  sysfs_path     = "/host/sys"
-  rootfs_path    = "/rootfs"
-  udev_data_path = "/host/run/udev/data"
-
-  filesystem {
-    mount_points_exclude = "^/(sys|proc|dev|host|etc)($$|/)"
-  }
-}
+prometheus.exporter.unix "host" {}
 
 // Scrape system metrics
 prometheus.scrape "host" {
   targets    = prometheus.exporter.unix.host.targets
   forward_to = [prometheus.relabel.instance.receiver]
 }
 
+// Export agent metrics
+prometheus.exporter.self "agent" {}
+
+// Scrape agent metrics
+prometheus.scrape "agent" {
+  targets    = prometheus.exporter.self.agent.targets
+  forward_to = [prometheus.relabel.instance.receiver]
+}
+
 // vim:ft=hcl
diff --git a/modules/mixins/alloy/default.nix b/modules/mixins/alloy/default.nix
@@ -1,49 +1,18 @@
-{...}: {
-  # see TODO further down
-  imports = [../docker];
+{ pkgs-nix, pkgs, ... }: {
+  imports = [ pkgs-nix.nixosModules.alloy ];
 
   environment.etc."alloy/config.alloy" = {
     source = ./config.alloy;
     mode = "0440";
     user = "root";
   };
 
-  # TODO: Replace this once there's an Alloy package merged into Nixpkgs
-  # https://github.com/NixOS/nixpkgs/pull/306048
-  virtualisation.oci-containers.containers.alloy = {
-    autoStart = true;
-    image = "grafana/alloy:v1.0.0";
-
+  services.alloy = {
+    enable = true;
+    package = pkgs-nix.packages.${pkgs.system}.alloy;
+    openFirewall = true;
+    configPath = "/etc/alloy";
+    group = "root";
     user = "root";
-
-    ports = [
-      "12345:12345"
-    ];
-
-    cmd = [
-      "run"
-      "--server.http.listen-addr=0.0.0.0:12345"
-      "--storage.path=/var/lib/alloy/data"
-      "--stability.level=public-preview"
-
-      # we give a path to the directory so it loads every file, instead of
-      # one config file. this allows us to add extra configuration in other
-      # mixins.
-      "/etc/alloy"
-    ];
-
-    volumes = [
-      # Alloy
-      "/var/log:/var/log:ro"
-      "/etc/alloy:/etc/alloy:ro"
-
-      "/var/lib/alloy/data"
-
-      # Node Exporter
-      "/proc:/host/proc:ro"
-      "/sys:/host/sys:ro"
-      "/run/udev/data:/host/run/udev/data:ro"
-      "/:/rootfs:ro"
-    ];
   };
 }
diff --git a/modules/mixins/docker/default.nix b/modules/mixins/docker/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{ ... }: {
   virtualisation.docker.enable = true;
   virtualisation.oci-containers.backend = "docker";
 

diff --git a/modules/mixins/ecs-agent/default.nix b/modules/mixins/ecs-agent/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{ ... }: {
   imports = [
     ../docker
     ../alloy
@@ -27,7 +27,7 @@
       "--net=host"
     ];
 
-    environmentFiles = ["/run/keys/ecs.config"];
+    environmentFiles = [ "/run/keys/ecs.config" ];
     environment = {
       ECS_ENABLE_PROMETHEUS_METRICS = "true";
       ECS_LOGLEVEL = "info";

diff --git a/modules/mixins/github-actions/default.nix b/modules/mixins/github-actions/default.nix
@@ -22,7 +22,7 @@ in
     };
   };
 
-  users.groups.github-runner = {};
+  users.groups.github-runner = { };
   users.users.github-runner = {
     group = "github-runner";
     extraGroups = [ "docker" ];

diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix
@@ -1,6 +1,4 @@
 {...}: {
-  services.cachix-agent.enable = true;
-
   boot.loader.efi.canTouchEfiVariables = true;
 
   services.openssh.enable = true;