nix/base-system/.zshrc

@@ -12,8 +12,3 @@ bindkey '^R' history-incremental-search-backward
 if [ -f "$HOME/Library/Application Support/dnvm/env" ]; then
     . "$HOME/Library/Application Support/dnvm/env"
 fi
-
-function service_restart() {
-	launchctl stop $1
-	launchctl start $1
-}

nix/base-system/darwin-configuration.nix

@@ -49,8 +49,8 @@
             title = "Metrics";
             span = {
                 end = "now";
-                duration = "1h";
-                step_duration = "1min";
+                duration = "1d";
+                step_duration = "5min";
             };
             graphs = [
                 {
@@ -192,7 +192,11 @@
                 ];
             };
             vector = {
-                type = "internal_logs";
+                type = "file";
+                include = [
+                    config.services.vector.stdoutPath
+                    config.services.vector.stderrPath
+                ];
             };
             victoria-logs = {
                 type = "file";
@@ -224,7 +228,7 @@
                 type = "elasticsearch";
                 mode = "bulk";
                 endpoints = [
-                    "http://${config.services.victoria-logs.listenAddr}/insert/elasticsearch"
+                    "http://${config.services.victoria-logs.listenAddr}/insert/elasticsearchk"
                 ];
                 inputs = [
                     "prometheus"

nix/base-system/modules/darwin-monitor.nix

@@ -195,8 +195,7 @@ 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;
             };

nix/base-system/modules/vector.nix

@@ -28,8 +28,14 @@ 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}"