secrets.yaml

@@ -25,7 +25,6 @@ forgejo_runner_fructose_token: ENC[AES256_GCM,data:vExgJdEHpqzn6DAsMVnE2e3EmgehZ
 grafana_admin_account: ENC[AES256_GCM,data:kDj9o2cpRLmpRVwONBI=,iv:cQfeFhBAVMSysP43J+eDVKAmn1NM+aUN9huraGgpRkY=,tag:AFIr0pwRvHj8ruDAqc2Lww==,type:str]
 grafana_admin_pass: ENC[AES256_GCM,data:AnuVrCJcfj1cHP5W2s5eDlRLaJTOc0T7W3sS2/flnA==,iv:EA0SGXxf9kF+ltmNgcd3rGE7Jmg8/+s3Gip0uByEF9o=,tag:Rm+eSe+H1uytm/MMxMuZpw==,type:str]
 grafana_db_pass: ENC[AES256_GCM,data:2yVNv62go7Bxgmhoqx6J5WU=,iv:4VGAsT4WR0J/aNKUjts+rUIK5UR8OyHjCln4NXnS0LA=,tag:0KtbBFX+3+5fp6ekDSKGrw==,type:str]
-grafana_secret_key: ENC[AES256_GCM,data:w5wrktLlSo8iIfc+r4Rc+XGj5RuXLeRvtTc3iHeGBZclrl+PsjIKf70p,iv:b0NM55wvDCyAtuBebjBgu2Zxio9cPTkFSNusu7veC4o=,tag:3suBUO0tizxjepLgJ1e1mw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -41,8 +40,8 @@ sops:
             NHg3M2l5MWY2alpHdVhIbE5PQ3VxeW8Kr+o5K2EIrPSfIFBWK68mWl4lWJooZxF/
             vKsU99C2iIsbX/eTF2uNQqeDkOqy5egKCG42xikwycGFO/gbnCDIdw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-20T15:19:45Z"
-    mac: ENC[AES256_GCM,data:vDwQ9F9DgTAqdEjA5zDBR6v3ZCLM5VpZZoMpkrOC0baudVqPK7tt8IcyxgfESn9yJ/GGHwkHgmYvQSOSReEjwKtnMjoTjvAl41PBMwG1+5/c7nqliajk0Sx+znXxDoSIKac4XYlWp5J5myK+wln7pTwy0y7/CgKlsyhIOOxOKec=,iv:1hlEIE8rxk74mb6v8Z9wVel01mtF96eOwsPka2os5L8=,tag:PN4soo9Ko5PlUMbI9HeXow==,type:str]
+    lastmodified: "2024-12-20T14:41:58Z"
+    mac: ENC[AES256_GCM,data:+F5UEx3OsmIV7eOXGiwYY51NN/5MY4Zejr54OX51p42m1PBohEiR0DhGygiqyNKLwYfX7eyCKehDeSl7+z/kcqTlc7999Fh8qI7ur+BdxtbQsoH35NWWW6V/q4MTlw7hLoHXqSrt4jw8B9nhEKTYbtMCYNRvxH+k+/OYEy5gn3I=,iv:ydbOr/KAe/TW4OCzrDNipi++BT5X583Ux31Q4KaGMG0=,tag:+Wo6C1zbyCqH4OykGHiBDQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.2

services/monitoring/grafana.mod.nix

@@ -29,10 +29,6 @@
           security = {
             admin_user = builtins.concatStringsSep "" ["$__file" "{${config.sops.secrets.grafana_admin_account.path}}"];
             admin_password = builtins.concatStringsSep "" ["$__file" "{${config.sops.secrets.grafana_admin_pass.path}}"];
-            secret_key = builtins.concatStringsSep "" ["$__file" "{${config.sops.secrets.grafana_secret_key.path}}"];
-
-            disable_gravatar = true;
-            cookie_secure = true;
           };
           server = {
             root_url = "https://grf.collective-conciousness.monster";
@@ -41,10 +37,7 @@
             http_port = 6700;
           };
           # smtp = {};
-          users = {
-            allow_org_create = true;
-            default_theme = "system";
-          };
+          # users = {};
         };
 
         /*

services/monitoring/prometheus.mod.nix

@@ -1,41 +1,11 @@
 {
-  universal.modules = [
-    {
-      services.prometheus.exporters = {
-        node = {
-          enable = true;
-          enabledCollectors = ["systemd"];
-          port = 6703;
-        };
-        varnish.enable = true;
-      };
-    }
-  ];
   glucose.modules = [
     {
-      lib,
-      molecules,
-      ...
-    }: let
-      ip = i: "10.24.1.${toString i}";
-      ips = builtins.mapAttrs (lib.const ip) molecules;
-      ips' = builtins.mapAttrs (name: ip: "${ip}:6703") ips;
-    in {
       services.prometheus = {
         enable = true;
         port = 6750;
-        enableReload = true;
 
-        scrapeConfigs = [
-          {
-            job_name = "devices";
-            static_configs = [
-              {
-                targets = ips';
-              }
-            ];
-          }
-        ];
+        enableReload = true;
       };
     }
   ];

sops.mod.nix

@@ -58,11 +58,9 @@
       sops.secrets.grafana_admin_pass = {};
       sops.secrets.grafana_admin_account = {};
       sops.secrets.grafana_db_pass = {};
-      sops.secrets.grafana_secret_key = {};
       sops.secrets.grafana_admin_account.owner = "grafana";
       sops.secrets.grafana_admin_pass.owner = "grafana";
       sops.secrets.grafana_db_pass.owner = "grafana";
-      sops.secrets.grafana_secret_key.owner = "grafana";
     })
     (
       {config, ...}: {