log-vm: module for systemd-journal-upload service

* run service to upload journal to log-vm - tested only to start without errors * formatting (nix fmt) Signed-off-by: Ville Ilvonen <ville.ilvonen@unikie.com>
tiiuae · Apr 19, 2024 · c3e5544 · c3e5544
1 parent 7f1c079
commit c3e5544
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/modules/common/log/journal-remote-upload.nix b/modules/common/log/journal-remote-upload.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: let
+  log-vm-ip-port = "192.168.101.66:19532";
+in {
+  users.users.systemd-journal-upload = {
+    isSystemUser = true;
+    group = "systemd-journal-upload";
+  };
+  users.groups.systemd-journal-upload = {};
+
+  systemd.services.systemd-journal-upload = {
+    enable = true;
+    serviceConfig = {
+      #ExecStart = "${pkgs.systemd}/lib/systemd/systemd-journal-upload --save-state -u http://${log-vm-ip-port}";
+      ExecStart = "${pkgs.systemd}/lib/systemd/systemd-journal-upload -u http://${log-vm-ip-port}";
+      User = "systemd-journal-upload";
+    };
+
+    wantedBy = ["multi-user.target"];
+  };
+}
diff --git a/modules/microvm/virtualization/microvm/logvm.nix b/modules/microvm/virtualization/microvm/logvm.nix
@@ -63,7 +63,7 @@
           group = "systemd-journal";
         };
 
-        systemd.tmpfiles.rules = [ "d /var/log/journal/remote 755 systemd-journal-remote systemd-journal" ];
+        systemd.tmpfiles.rules = ["d /var/log/journal/remote 755 systemd-journal-remote systemd-journal"];
 
         systemd.services.systemd-journal-remote = {
           enable = true;

diff --git a/targets/lenovo-x1/everything.nix b/targets/lenovo-x1/everything.nix
@@ -35,6 +35,8 @@
 
           self.nixosModules.disko-lenovo-x1-basic-v1
 
+          ../../modules/common/log/journal-remote-upload.nix
+
           ./sshkeys.nix
           ({
             pkgs,