new tlms release

tlm-solutions · Sep 16, 2023 · e2281f8 · e2281f8
2 parents e792b44 + bd315f0
commit e2281f8
Show file tree

Hide file tree

Showing 15 changed files with 332 additions and 170 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -28,7 +28,7 @@ keys:
   # aachen
   - &traffic-stop-box-7 age1z5n0seu0qpt3y86gmz92mnmts0x8jd0a646e9ld2x5dqvvu5kgzsu93um4
   # C3H
-  - &traffic-stop-box-8 age1cchq3tzcl2jnvq4pc9y8yusak9a2552fnrhhll4q22agm8ncycuqesj3rg
+  - &traffic-stop-box-8 age1x0j3jpeqw3c5qd7wgqavfg3quse6phxdzze62zj8zl8ds9y46p3qecwgxm
   # dumpdvb_bugdorf
   - &traffic-stop-box-9 age1ger9j5fk5v7hcnnl688g9rcnt9uu7c6605ptgcl338l6xl3u9q8s5p7kys
   # CLT

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -43,12 +43,6 @@
       url = "github:tlm-solutions/datacare";
     };
 
-    kindergarten = {
-      url = "github:tlm-solutions/kindergarten";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.utils.follows = "flake-utils";
-    };
-
     telegram-decoder = {
       url = "github:tlm-solutions/telegram-decoder";
       inputs = {
@@ -112,7 +106,6 @@
     , documentation-src
     , funnel
     , gnuradio-decoder
-    , kindergarten
     , microvm
     , nixpkgs
     , sops-nix
@@ -142,7 +135,6 @@
         {
           nixpkgs.overlays = [
             datacare.overlays.default
-            kindergarten.overlays.default
             trekkie.overlays.default
             lizard.overlays.default
             bureaucrat.overlays.default
@@ -215,23 +207,16 @@
           arch = "x86_64-linux";
           monitoring = true;
         }
-        # {
-        #   # Chemnitz
-        #   id = 2;
-        #   arch = "x86_64-linux";
-        #   monitoring = false;
-        # }
         {
           # Wundstr. 9
           id = 4;
           arch = "x86_64-linux";
           monitoring = true;
         }
         {
-          # Warpzone
-          id = 6;
-          arch = "x86_64-linux";
-          monitoring = true;
+          id = 8;
+          arch ="aarch64-linux";
+          monitoring = false;
         }
       ];
 
@@ -249,7 +234,7 @@
           }).optionsCommonMark;
         };
       }
-      // (import ./pkgs/deployment.nix { inherit self pkgs lib;})
+      // (import ./pkgs/deployment.nix { inherit self pkgs lib; })
       // (lib.foldl (x: y: lib.mergeAttrs x { "${y.config.system.name}-vm" = y.config.system.build.vm; }) { } (lib.attrValues self.nixosConfigurations));
 
     in
@@ -319,6 +304,7 @@
 
             ./modules/TLMS
             ./hosts/uranus
+            { deployment-TLMS.monitoring.enable = true; }
           ];
         };
 
@@ -328,12 +314,10 @@
         program = "${self.packages."x86_64-linux".test-vm-wrapper}";
       };
 
-      nixosModules."x86_64-linux".watch-me-senpai = import ./modules/watch-me-senpai;
-
       hydraJobs =
         let
           get-toplevel = (host: nixSystem: nixSystem.config.microvm.declaredRunner or nixSystem.config.system.build.toplevel);
         in
         nixpkgs.lib.mapAttrs get-toplevel self.nixosConfigurations;
-      };
+    };
 }
diff --git a/hardware/dell-wyse-3040.nix b/hardware/dell-wyse-3040.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
@@ -30,6 +30,8 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "sdhci_acpi" ];
   boot.initrd.kernelModules = [ ];
   boot.extraModulePackages = [ ];
+  # some whoopsie in kernel 6.1.x maybe?
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_15;
 
   swapDevices = [ ];
   fileSystems."/" =

diff --git a/hosts/notice-me-senpai/grafana.nix b/hosts/notice-me-senpai/grafana.nix
@@ -20,7 +20,7 @@ in
         port = 9501;
         listenAddress = config.deployment-TLMS.net.wg.addr4;
         globalConfig = {
-          scrape_interval = "17s";
+          scrape_interval = "131s";
         };
         scrapeConfigs =
           let
@@ -62,9 +62,27 @@ in
 
             TLMSScrapeConfigs = lib.lists.flatten (map lib.attrValues (lib.attrValues ScrapeConfigByHost));
           in
-          TLMSScrapeConfigs;
+          TLMSScrapeConfigs ++ [
+            {
+              job_name = "funnel-connections-prod";
+              static_configs = [{
+                targets = [ "10.13.37.1:9010" ];
+              }];
+            }
+            {
+              job_name = "funnel-connections-staging";
+              static_configs = [{
+                targets = [ "10.13.37.5:9010" ];
+              }];
+            }
+            {
+              job_name = "funnel-connections-borken";
+              static_configs = [{
+                targets = [ "10.13.37.7:9010" ];
+              }];
+            }
+          ];
       };
-
     # log collector
     loki = {
       enable = true;
@@ -124,12 +142,15 @@ in
         };
 
         table_manager = {
-          retention_deletes_enabled = false;
-          retention_period = "0s";
+          retention_deletes_enabled = true;
+          retention_period = "720h";
         };
 
         compactor = {
           working_directory = "/var/lib/loki";
+          compaction_interval = "10m";
+          retention_enabled = true;
+          retention_delete_delay = "1m";
           shared_store = "filesystem";
           compactor_ring = {
             kvstore = {