✨ user container-telemetry-non-private-network

components/monitor/container.nix

@@ -1,21 +0,0 @@
-{
-  lib,
-  config,
-  inputs,
-  ...
-}:
-with lib;
-with types;
-{
-  imports = [
-    ../timezone.nix
-  ];
-
-  config = {
-    telemetry.enable = mkDefault true;
-    telemetry.metrics.enable = mkDefault false;
-    telemetry.apps.opentelemetry.enable = false;
-    services.journald.extraConfig = "SystemMaxUse=1G";
-  };
-
-}

machines/orbi/media-nextcloud.nix

@@ -114,9 +114,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/media-transmission2.nix

@@ -35,9 +35,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "21.05";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/service-forgejo.nix

@@ -60,9 +60,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "24.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/service-photoprism.nix

@@ -34,9 +34,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/service-surrealdb.nix

@@ -25,9 +25,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "24.05";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/social-matrix-terranix.nix

@@ -90,9 +90,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here