From 2c484daf3cb78deefdcfe2ef6cececaab397dace Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 5 Feb 2017 00:23:44 +0100
Subject: l 2 monitoring client: remove dns query

---
 lass/2configs/monitoring/client.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lass/2configs/monitoring/client.nix')

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index e879d696..210fd2d1 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -29,10 +29,6 @@ with import <stockholm/lib>;
       ''
         [[inputs.net]]
       ''
-      ''
-        [[inputs.dns_query]]
-          servers = ["8.8.8.8"]
-      ''
     ];
   };
   systemd.services.telegraf.path = with pkgs; [
-- 
cgit v1.2.3


From 6ad79bd34eb62d916d5802536174bdb6c3fcd363 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 5 Feb 2017 12:15:17 +0100
Subject: l 2 monitoring client: use services.telegraf

---
 lass/2configs/monitoring/client.nix | 105 ++++++++----------------------------
 1 file changed, 22 insertions(+), 83 deletions(-)

(limited to 'lass/2configs/monitoring/client.nix')

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index 210fd2d1..d20ad475 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -1,90 +1,29 @@
 {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]]
-      ''
-    ];
-  };
-  systemd.services.telegraf.path = with pkgs; [
-    iputils
-    lm_sensors
-  ];
-
-  services.collectd = {
-    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>
-    '';
+    extraConfig = {
+      interval = "1s";
+      outputs = {
+        influxdb = {
+          urls = ["http://prism:8086"];
+          database = "telegraf_db";
+          user_agent = "telegraf";
+        };
+      };
+      inputs = {
+        cpu = {
+          percpu = false;
+          totalcpu = true;
+        };
+        mem = {};
+        ping = {
+          urls = ["8.8.8.8"];
+        };
+        net = {};
+      };
+    };
   };
 }
-- 
cgit v1.2.3


From 53532e63f006479bc3ff57c93a2b5f52d4709545 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 5 Feb 2017 14:20:55 +0100
Subject: l 2 monitoring: remove broken ping statistics

---
 lass/2configs/monitoring/client.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/2configs/monitoring/client.nix')

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index d20ad475..bd7d6acb 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -19,9 +19,6 @@ with import <stockholm/lib>;
           totalcpu = true;
         };
         mem = {};
-        ping = {
-          urls = ["8.8.8.8"];
-        };
         net = {};
       };
     };
-- 
cgit v1.2.3


From a5bd0ad7742260db8893d8578950a0cfd0cbc62e Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 5 Feb 2017 14:21:42 +0100
Subject: l 2 monitoring: set agent interval to 1s

---
 lass/2configs/monitoring/client.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/monitoring/client.nix')

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index bd7d6acb..b8c24521 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
     enable = true;
 
     extraConfig = {
-      interval = "1s";
+      agent.interval = "1s";
       outputs = {
         influxdb = {
           urls = ["http://prism:8086"];
-- 
cgit v1.2.3


From aaf1f55626f16c7f9dcb681eb2d34743345e0e29 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 7 Feb 2017 17:12:50 +0100
Subject: l 2 monitoring client: add journalbeat

---
 lass/2configs/monitoring/client.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass/2configs/monitoring/client.nix')

diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index b8c24521..e2b7dcae 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -23,4 +23,13 @@ with import <stockholm/lib>;
       };
     };
   };
+
+  services.journalbeat = {
+    enable = true;
+    extraConfig = ''
+      output.elasticsearch:
+        hosts: ["prism:9200"]
+        template.enabled: false
+    '';
+  };
 }
-- 
cgit v1.2.3