summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-23 10:46:46 +0200
committermakefu <github@syntax-fehler.de>2017-07-23 10:46:46 +0200
commit0d176bb2a0fc182c5bcdd89cf21ef663e1726d71 (patch)
tree9b486419cfea365290181927538ebce61159418d
parent3ee48434e3282ccd2b6ad83dd6c0d6552a54b71d (diff)
wolf,puyak: refactor stats collection
-rw-r--r--krebs/1systems/puyak/config.nix1
-rw-r--r--krebs/1systems/wolf/config.nix2
-rw-r--r--krebs/2configs/stats/puyak-client.nix64
-rw-r--r--krebs/2configs/stats/wolf-client.nix (renamed from krebs/2configs/central-stats-client.nix)0
4 files changed, 66 insertions, 1 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index bcf63dc4b..835d717b8 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -8,6 +8,7 @@
<stockholm/krebs/2configs/repo-sync.nix>
<stockholm/krebs/2configs/shared-buildbot.nix>
+ <stockholm/krebs/2configs/stats/puyak-client.nix>
];
krebs.build.host = config.krebs.hosts.puyak;
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 32e7bd49d..0deb01f0a 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -8,7 +8,7 @@ in
<stockholm/krebs/2configs>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
<stockholm/krebs/2configs/collectd-base.nix>
- <stockholm/krebs/2configs/central-stats-client.nix>
+ <stockholm/krebs/2configs/stats/wolf-client.nix>
<stockholm/krebs/2configs/save-diskspace.nix>
<stockholm/krebs/2configs/graphite.nix>
diff --git a/krebs/2configs/stats/puyak-client.nix b/krebs/2configs/stats/puyak-client.nix
new file mode 100644
index 000000000..6ff88e4bc
--- /dev/null
+++ b/krebs/2configs/stats/puyak-client.nix
@@ -0,0 +1,64 @@
+{pkgs, config, ...}:
+let
+ stats-server = "stats.makefu.r"; # TODO: central krebs logging server
+in{
+ services.collectd = {
+ enable = true;
+ autoLoadPlugin = true;
+ extraConfig = ''
+ Hostname ${config.krebs.build.host.name}
+ LoadPlugin load
+ LoadPlugin disk
+ LoadPlugin memory
+ LoadPlugin df
+ Interval 30.0
+
+ LoadPlugin thermal
+
+ LoadPlugin interface
+ <Plugin "interface">
+ Interface "*Link"
+ Interface "lo"
+ Interface "vboxnet*"
+ Interface "virbr*"
+ IgnoreSelected true
+ </Plugin>
+
+ LoadPlugin df
+ <Plugin "df">
+ MountPoint "/nix/store"
+ # MountPoint "/run*"
+ # MountPoint "/sys*"
+ # MountPoint "/dev"
+ # MountPoint "/dev/shm"
+ # MountPoint "/tmp"
+ 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 "${stats-server}" "25826"
+ </Plugin>
+ '';
+ };
+}
diff --git a/krebs/2configs/central-stats-client.nix b/krebs/2configs/stats/wolf-client.nix
index 0412eba9a..0412eba9a 100644
--- a/krebs/2configs/central-stats-client.nix
+++ b/krebs/2configs/stats/wolf-client.nix