fixes

newinfra/nix/apps/uptime/uptime.json

@@ -12,11 +12,11 @@
     },
     {
       "name": "docker.nilstrieb.dev",
-      "url": "https://docker.nilstrieb.dev"
+      "url": "https://docker.noratrieb.dev"
     },
     {
       "name": "vps1.nilstrieb.dev",
-      "url": "https://vps1.nilstrieb.dev"
+      "url": "https://vps1.infra.noratrieb.dev"
     },
     {
       "name": "vps2.nilstrieb.dev",

newinfra/nix/modules/default/default.nix

@@ -58,16 +58,27 @@
         {
           job_name = "journal";
           journal = {
-            max_age = "12h";
+            max_age = "24h";
             labels = {
               job = "systemd-journal";
               node = name;
             };
           };
-          relabel_configs = [{
+          relabel_configs = [
+            {
               source_labels = [ "__journal__systemd_unit" ];
               target_label = "unit";
-          }];
+            }
+            {
+              source_labels = [ "__journal__hostname" ];
+              target_label = "host";
+            }
+            {
+              source_labels = [ "__journal_priority_keyword" ];
+              target_label = "severity";
+              regex = "(.+)";
+            }
+          ];
         }
       ];
     };

newinfra/nix/modules/prometheus/default.nix

@@ -98,7 +98,7 @@
   systemd.services.loki.serviceConfig.EnvironmentFile = config.age.secrets.loki_env.path;
   services.loki = {
     enable = true;
-    extraFlags = [ "-config.expand-env=true" ];
+    extraFlags = [ "-config.expand-env=true" /*"-print-config-stderr"*/ ];
     configuration = {
       auth_enabled = false;
       server = {
@@ -132,8 +132,13 @@
           cache_location = "/var/lib/loki/cache";
         };
         aws = {
-          s3 = "s3://\${ACCESS_KEY}:\${SECRET_KEY}@http://127.0.0.1:3900/loki";
+          access_key_id = "\${ACCESS_KEY}";
+          secret_access_key = "\${SECRET_KEY}";
+          endpoint = "127.0.0.1:3900";
+          s3forcepathstyle = true;
+          region = "garage";
           insecure = true;
+          s3 = "s3://\${ACCESS_KEY}:\${SECRET_KEY}@127.0.0.1:3900/loki";
         };
       };
     };