From b376133477ee5c2cbd96241383aa6b4fc56163ea Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Tue, 11 Jun 2024 16:56:55 -0400
Subject: [PATCH] fix: some logging bits with daemons

---
 nix/base-system/darwin-configuration.nix   | 12 ++++--------
 nix/base-system/modules/darwin-monitor.nix |  3 ++-
 nix/base-system/modules/vector.nix         |  8 +-------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/nix/base-system/darwin-configuration.nix b/nix/base-system/darwin-configuration.nix
index a266593..f46f0f7 100644
--- a/nix/base-system/darwin-configuration.nix
+++ b/nix/base-system/darwin-configuration.nix
@@ -49,8 +49,8 @@
             title = "Metrics";
             span = {
                 end = "now";
-                duration = "1d";
-                step_duration = "5min";
+                duration = "1h";
+                step_duration = "1min";
             };
             graphs = [
                 {
@@ -192,11 +192,7 @@
                 ];
             };
             vector = {
-                type = "file";
-                include = [
-                    config.services.vector.stdoutPath
-                    config.services.vector.stderrPath
-                ];
+                type = "internal_logs";
             };
             victoria-logs = {
                 type = "file";
@@ -228,7 +224,7 @@
                 type = "elasticsearch";
                 mode = "bulk";
                 endpoints = [
-                    "http://${config.services.victoria-logs.listenAddr}/insert/elasticsearchk"
+                    "http://${config.services.victoria-logs.listenAddr}/insert/elasticsearch"
                 ];
                 inputs = [
                     "prometheus"
diff --git a/nix/base-system/modules/darwin-monitor.nix b/nix/base-system/modules/darwin-monitor.nix
index d4e12bb..6073141 100644
--- a/nix/base-system/modules/darwin-monitor.nix
+++ b/nix/base-system/modules/darwin-monitor.nix
@@ -195,7 +195,8 @@ with lib;
                     "${pkgs.durnitisp}/bin/durnitisp"
                     "--listenHost=${config.services.durnitisp.listen}"
                 ];
-
+                #StandardErrorPath = "/var/log/clio.durnitisp.err";
+                #StandardOutPath = "/var/log/clio.durnitisp.out";
                 KeepAlive =  true;
                 RunAtLoad = true;
             };
diff --git a/nix/base-system/modules/vector.nix b/nix/base-system/modules/vector.nix
index 69efbe3..fd2cdd1 100644
--- a/nix/base-system/modules/vector.nix
+++ b/nix/base-system/modules/vector.nix
@@ -28,14 +28,8 @@ with lib;
         
         launchd.daemons.vector = mkIf config.services.vector.enable {
             serviceConfig = {
+                Program = "${pkgs.vector}/bin/vector";
                 ProgramArguments = [
-                    "${pkgs.clio}/bin/clio"
-                    "--out-path=${config.services.vector.stdoutPath}"
-                    "--err-path=${config.services.vector.stderrPath}"
-                    "--pid-file=${config.services.vector.pidPath}"
-                    "--paranoid"
-                    "--"
-                    "${pkgs.vector}/bin/vector"
                     "--verbose"
                     "--watch-config"
                     "--config=/etc/${config.environment.etc."vector.yaml".target}"