summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-01-09 16:03:36 +0100
committermakefu <github@syntax-fehler.de>2017-01-09 16:03:36 +0100
commit0695846f3c3d474eb8ee7d4b902e14676fd1a8d8 (patch)
tree67ee3d7a88bb58d2fa5acf7ce9f706db7d3a7cdb
parent66c1ef89b7e950105ddbd918f1900f5625c08c7b (diff)
m 2 logging: retab
-rw-r--r--makefu/2configs/logging/central-stats-client.nix46
-rw-r--r--makefu/2configs/logging/central-stats-server.nix8
2 files changed, 27 insertions, 27 deletions
diff --git a/makefu/2configs/logging/central-stats-client.nix b/makefu/2configs/logging/central-stats-client.nix
index c1365c581..dd6ddddaf 100644
--- a/makefu/2configs/logging/central-stats-client.nix
+++ b/makefu/2configs/logging/central-stats-client.nix
@@ -1,26 +1,26 @@
{pkgs, config, ...}:
{
- services.collectd = {
+ services.collectd = {
enable = true;
autoLoadPlugin = true;
extraConfig = ''
- Hostname ${config.krebs.build.host.name}
- LoadPlugin load
- LoadPlugin disk
- LoadPlugin memory
- LoadPlugin df
- Interval 30.0
+ Hostname ${config.krebs.build.host.name}
+ LoadPlugin load
+ LoadPlugin disk
+ LoadPlugin memory
+ LoadPlugin df
+ Interval 30.0
- LoadPlugin interface
- <Plugin "interface">
- Interface "*Link"
- Interface "lo"
- Interface "vboxnet*"
- Interface "virbr*"
- IgnoreSelected true
- </Plugin>
+ LoadPlugin interface
+ <Plugin "interface">
+ Interface "*Link"
+ Interface "lo"
+ Interface "vboxnet*"
+ Interface "virbr*"
+ IgnoreSelected true
+ </Plugin>
- LoadPlugin df
+ LoadPlugin df
<Plugin "df">
MountPoint "/nix/store"
# MountPoint "/run*"
@@ -41,15 +41,15 @@
FSType "devpts"
FSType "devtmpfs"
MountPoint "/var/lib/docker/devicemapper"
- IgnoreSelected true
+ IgnoreSelected true
</Plugin>
- LoadPlugin cpu
- <Plugin cpu>
- ReportByCpu true
- ReportByState true
- ValuesPercentage true
- </Plugin>
+ LoadPlugin cpu
+ <Plugin cpu>
+ ReportByCpu true
+ ReportByState true
+ ValuesPercentage true
+ </Plugin>
LoadPlugin network
<Plugin "network">
diff --git a/makefu/2configs/logging/central-stats-server.nix b/makefu/2configs/logging/central-stats-server.nix
index eb4e2a344..69e37e493 100644
--- a/makefu/2configs/logging/central-stats-server.nix
+++ b/makefu/2configs/logging/central-stats-server.nix
@@ -2,11 +2,11 @@
with import <stockholm/lib>;
let
- collectd-port = 25826;
- influx-port = 8086;
+ collectd-port = 25826;
+ influx-port = 8086;
grafana-port = 3000; # TODO nginx forward
in {
- services.grafana.enable = true;
+ services.grafana.enable = true;
services.grafana.addr = "0.0.0.0";
services.influxdb.enable = true;
@@ -21,7 +21,7 @@ in {
enabled = false;
# write-interval = "24h";
};
- collectd = [{
+ collectd = [{
enabled = true;
typesdb = "${pkgs.collectd}/share/collectd/types.db";
database = "collectd_db";