⬆️ use new nixos-telemetry architecture

components/monitor/container.nix

@@ -14,7 +14,7 @@ with types;
   config = {
     telemetry.enable = mkDefault true;
     telemetry.metrics.enable = mkDefault false;
-    telemetry.opentelemetry.enable = false;
+    telemetry.apps.opentelemetry.enable = false;
     services.journald.extraConfig = "SystemMaxUse=1G";
   };
 

flake.lock

@@ -1405,11 +1405,11 @@
         "treefmt-nix": "treefmt-nix_8"
       },
       "locked": {
-        "lastModified": 1740492270,
+        "lastModified": 1740556259,
-        "narHash": "sha256-4JGmOis851TM0OL88S7+u8HbNk25xvBNh4dVsNDRAC8=",
+        "narHash": "sha256-k8f7+Ir+DiK7rVH1RoHt8Do/Y8JKagTlNoSwgOPVsU0=",
         "owner": "mrvandalo",
         "repo": "nixos-telemetry",
-        "rev": "94c12227bd7e98f7ec8f8759d41941c5afcce352",
+        "rev": "3481a8b1c94fc5adc4ae7c1ba9695e6fe59389de",
         "type": "github"
       },
       "original": {

flake.nix

@@ -289,12 +289,6 @@
         ./features
         ./modules # todo : spread this across features and components
         #./system/all # todo : spread this across features and components
-        (
-          { lib, pkgs, ... }:
-          {
-            telemetry.netdata.enable = false;
-          }
-        )
 
         # some modules I always use
         telemetry.nixosModules.telemetry

homes/palo/i3.nix

@@ -87,36 +87,37 @@ in
               format = "$icon $percentage $time";
             }
             { block = "uptime"; }
-            {
+            # interferes with `bugwarrior pull`
-              block = "taskwarrior";
+            #            {
-              interval = 60;
+            #              block = "taskwarrior";
-              format = " $icon $count.eng(w:3) todo ";
+            #              interval = 60;
-              format_singular = " $icon 1 task ";
+            #              format = " $icon $count.eng(w:3) todo ";
-              format_everything_done = "";
+            #              format_singular = " $icon 1 task ";
-              warning_threshold = 10;
+            #              format_everything_done = "";
-              critical_threshold = 20;
+            #              warning_threshold = 10;
-              filters = [
+            #              critical_threshold = 20;
-                {
+            #              filters = [
-                  name = "active";
+            #                {
-                  filter = "+PENDING and ( +ACTIVE or +DUETODAY or +TODAY or +OVERDUE )";
+            #                  name = "active";
-                }
+            #                  filter = "+PENDING and ( +ACTIVE or +DUETODAY or +TODAY or +OVERDUE )";
-              ];
+            #                }
-            }
+            #              ];
-            {
+            #            }
-              block = "taskwarrior";
+            #            {
-              interval = 60;
+            #              block = "taskwarrior";
-              format = " $icon $count.eng(w:2) ";
+            #              interval = 60;
-              format_singular = " $icon 1 task ";
+            #              format = " $icon $count.eng(w:2) ";
-              format_everything_done = "";
+            #              format_singular = " $icon 1 task ";
-              warning_threshold = 3;
+            #              format_everything_done = "";
-              critical_threshold = 5;
+            #              warning_threshold = 3;
-              filters = [
+            #              critical_threshold = 5;
-                {
+            #              filters = [
-                  name = "started";
+            #                {
-                  filter = "+PENDING and +ACTIVE";
+            #                  name = "started";
-                }
+            #                  filter = "+PENDING and +ACTIVE";
-              ];
+            #                }
-            }
+            #              ];
+            #            }
             {
               block = "time";
               interval = 60;

machines/cherry/configuration.nix

@@ -63,7 +63,7 @@
   components.terminal.enable = true;
 
   telemetry.enable = true;
-  telemetry.opentelemetry.exporter.endpoint = "10.100.0.1:4317"; # orbi
+  telemetry.apps.opentelemetry.exporter.endpoint = "10.100.0.1:4317"; # orbi
 
   home-manager.users.mainUser.home.sessionPath = [ "$HOME/.timewarrior/scripts" ];
   # todo: move to homemanager

machines/chungus/configuration.nix

@@ -71,7 +71,7 @@
   features.boot.tor.enable = true;
 
   telemetry.enable = true;
-  telemetry.opentelemetry.receiver.endpoint = "0.0.0.0:4317";
+  telemetry.apps.opentelemetry.receiver.endpoint = "0.0.0.0:4317";
   networking.firewall.interfaces.wg0.allowedTCPPorts = [ 4317 ];
   networking.firewall.interfaces.wg0.allowedUDPPorts = [ 4317 ];
 

machines/chungus/telemetry/prometheus.nix

@@ -22,12 +22,8 @@
     };
   };
 
-  services.prometheus = {
+  telemetry.apps.prometheus.enable = true;
-    checkConfig = "syntax-only";
+  telemetry.apps.prometheus.retentionTime = "90d";
-    enable = true;
-    # keep data for 30 days
-    extraFlags = [ "--storage.tsdb.retention.time=90d" ];
-  };
 
   services.grafana.provision.datasources.settings = {
     apiVersion = 1;

machines/orbi/configuration.nix

@@ -67,8 +67,8 @@
   features.boot.ssh.enable = true;
 
   telemetry.enable = true;
-  telemetry.opentelemetry.receiver.endpoint = "0.0.0.0:4317";
+  telemetry.apps.opentelemetry.receiver.endpoint = "0.0.0.0:4317";
-  telemetry.opentelemetry.exporter.endpoint = "10.100.0.2:4317"; # chnungus
+  telemetry.apps.opentelemetry.exporter.endpoint = "10.100.0.2:4317"; # chnungus
   networking.firewall.interfaces.wg0.allowedTCPPorts = [ 4317 ];
   networking.firewall.interfaces.wg0.allowedUDPPorts = [ 4317 ];
   healthchecks.closed.public.ports.opentelemetry = [ 4317 ];