improve loki logging

nixos/machines/pepe/loki-promtail.nix

@@ -22,10 +22,16 @@
               host = config.networking.hostName;
             };
           };
-          relabel_configs = [{
+          relabel_configs = [
-            source_labels = [ "__journal__systemd_unit" ];
+            {
-            target_label = "unit";
+              source_labels = [ "__journal__systemd_unit" ];
-          }];
+              target_label = "unit";
+            }
+            {
+              source_labels = [ "__journal__transport" ];
+              target_label = "transport";
+            }
+          ];
         }
       ];
 

nixos/machines/robi/loki-promtail.nix

@@ -22,10 +22,16 @@
               host = config.networking.hostName;
             };
           };
-          relabel_configs = [{
+          relabel_configs = [
-            source_labels = [ "__journal__systemd_unit" ];
+            {
-            target_label = "unit";
+              source_labels = [ "__journal__systemd_unit" ];
-          }];
+              target_label = "unit";
+            }
+            {
+              source_labels = [ "__journal__transport" ];
+              target_label = "transport";
+            }
+          ];
         }
       ];
 

nixos/system/all/nginx-landingpage.nix

@@ -18,17 +18,38 @@
                 config.services.tinc.networks."private".hostSettings));
           }
           {
-            text = "netdata";
+            text = "robi";
-            items = map
+            items = [
-              ({ name, host ? "${name}.private", ... }: {
+              {
-                label = name;
+                label = "Jellyfin";
-                href = "http://${host}:19999/";
+                href = "http://flix.ingolf-wagner.de/";
+                image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
+              }
+              {
+                label = "netdata";
+                href = "http://robi.private:19999/";
                 image = "https://media.giphy.com/media/BkjdN6MQCDPaw/giphy.gif";
-              })
+              }
-              (map (name: { inherit name; }) [ "robi" "pepe" "sterni" ]);
+              {
+                label = "logs";
+                href = "http://grafana.robi.private/explore";
+                image = "https://raw.githubusercontent.com/cncf/landscape/master/hosted_logos/grafana-loki.svg";
+              }
+              {
+                label = "grafana";
+                href = "http://grafana.robi.private/";
+                image = "https://www.vectorlogo.zone/logos/grafana/grafana-icon.svg";
+              }
+              {
+                label = "prometheus";
+                href = "http://prometheus.robi.private/";
+                image = "https://www.vectorlogo.zone/logos/prometheusio/prometheusio-icon.svg";
+              }
+
+            ];
           }
           {
-            text = "Home";
+            text = "pepe";
             items = [
               {
                 label = "HomeAssistant";
@@ -45,41 +66,30 @@
                 href = "http://pepe:8096/";
                 image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
               }
-
               {
-                label = "robi - logs";
+                label = "netdata";
-                href = "http://grafana.robi.private/explore";
+                href = "http://pepe.private:19999/";
-                image = "https://raw.githubusercontent.com/cncf/landscape/master/hosted_logos/grafana-loki.svg";
+                image = "https://media.giphy.com/media/BkjdN6MQCDPaw/giphy.gif";
               }
               {
-                label = "robi - grafana";
+                label = "logs";
-                href = "http://grafana.robi.private/";
-                image = "https://www.vectorlogo.zone/logos/grafana/grafana-icon.svg";
-              }
-              {
-                label = "robi - prometheus";
-                href = "http://prometheus.robi.private/";
-                image = "https://www.vectorlogo.zone/logos/prometheusio/prometheusio-icon.svg";
-              }
-
-              {
-                label = "pepe - logs";
                 href = "http://grafana.pepe.private/explore";
                 image = "https://raw.githubusercontent.com/cncf/landscape/master/hosted_logos/grafana-loki.svg";
               }
               {
-                label = "pepe - grafana";
+                label = "grafana";
                 href = "http://grafana.pepe.private/";
                 image = "https://www.vectorlogo.zone/logos/grafana/grafana-icon.svg";
               }
               {
-                label = "pepe - prometheus";
+                label = "prometheus";
                 href = "http://prometheus.pepe.private/";
                 image = "https://www.vectorlogo.zone/logos/prometheusio/prometheusio-icon.svg";
               }
 
             ];
           }
+
           {
             title = "Various Links";
             items = [