Merge remote-tracking branch 'tv/master'

1 files changed, 23 insertions, 82 deletions

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index e879d6960..e2b7dcae6 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -1,94 +1,35 @@
 {pkgs, config, ...}:
 with import <stockholm/lib>;
 {
-  lass.telegraf = {
+  services.telegraf = {
     enable = true;
-    interval = "1s";
 
-
-    outputs = ''
-      [outputs.influxdb]
-        urls = ["http://prism:8086"]
-        database = "telegraf_db"
-        user_agent = "telegraf"
-    '';
-    inputs = [
-      ''
-        [cpu]
-          percpu = false
-          totalcpu = true
-          drop = ["cpu_time"]
-      ''
-      ''
-        [[inputs.mem]]
-      ''
-      ''
-        [[inputs.ping]]
-        urls = ["8.8.8.8"]
-      ''
-      ''
-        [[inputs.net]]
-      ''
-      ''
-        [[inputs.dns_query]]
-          servers = ["8.8.8.8"]
-      ''
-    ];
+    extraConfig = {
+      agent.interval = "1s";
+      outputs = {
+        influxdb = {
+          urls = ["http://prism:8086"];
+          database = "telegraf_db";
+          user_agent = "telegraf";
+        };
+      };
+      inputs = {
+        cpu = {
+          percpu = false;
+          totalcpu = true;
+        };
+        mem = {};
+        net = {};
+      };
+    };
   };
-  systemd.services.telegraf.path = with pkgs; [
-    iputils
-    lm_sensors
-  ];
 
-  services.collectd = {
+  services.journalbeat = {
     enable = true;
-    autoLoadPlugin = true;
     extraConfig = ''
-      Hostname ${config.krebs.build.host.name}
-      LoadPlugin load
-      LoadPlugin disk
-      LoadPlugin memory
-      Interval 30.0
-
-      LoadPlugin interface
-      <Plugin "interface">
-        Interface "*Link"
-        Interface "lo"
-        Interface "vboxnet*"
-        Interface "virbr*"
-        IgnoreSelected true
-      </Plugin>
-
-      LoadPlugin df
-      <Plugin "df">
-        MountPoint "/nix/store"
-        FSType "tmpfs"
-        FSType "binfmt_misc"
-        FSType "debugfs"
-        FSType "mqueue"
-        FSType "hugetlbfs"
-        FSType "systemd-1"
-        FSType "cgroup"
-        FSType "securityfs"
-        FSType "ramfs"
-        FSType "proc"
-        FSType "devpts"
-        FSType "devtmpfs"
-        MountPoint "/var/lib/docker/devicemapper"
-        IgnoreSelected true
-      </Plugin>
-
-      LoadPlugin cpu
-      <Plugin cpu>
-        ReportByCpu true
-        ReportByState true
-        ValuesPercentage true
-      </Plugin>
-
-      LoadPlugin network
-      <Plugin "network">
-          Server "prism" "25826"
-      </Plugin>
+      output.elasticsearch:
+        hosts: ["prism:9200"]
+        template.enabled: false
     '';
   };
 }