m 2 logging: retab

This commit is contained in:
makefu 2017-01-09 16:03:36 +01:00
parent 1ff8b90ad0
commit b2d57b0722
2 changed files with 27 additions and 27 deletions

View file

@ -1,26 +1,26 @@
{pkgs, config, ...}: {pkgs, config, ...}:
{ {
services.collectd = { services.collectd = {
enable = true; enable = true;
autoLoadPlugin = true; autoLoadPlugin = true;
extraConfig = '' extraConfig = ''
Hostname ${config.krebs.build.host.name} Hostname ${config.krebs.build.host.name}
LoadPlugin load LoadPlugin load
LoadPlugin disk LoadPlugin disk
LoadPlugin memory LoadPlugin memory
LoadPlugin df LoadPlugin df
Interval 30.0 Interval 30.0
LoadPlugin interface LoadPlugin interface
<Plugin "interface"> <Plugin "interface">
Interface "*Link" Interface "*Link"
Interface "lo" Interface "lo"
Interface "vboxnet*" Interface "vboxnet*"
Interface "virbr*" Interface "virbr*"
IgnoreSelected true IgnoreSelected true
</Plugin> </Plugin>
LoadPlugin df LoadPlugin df
<Plugin "df"> <Plugin "df">
MountPoint "/nix/store" MountPoint "/nix/store"
# MountPoint "/run*" # MountPoint "/run*"
@ -41,15 +41,15 @@
FSType "devpts" FSType "devpts"
FSType "devtmpfs" FSType "devtmpfs"
MountPoint "/var/lib/docker/devicemapper" MountPoint "/var/lib/docker/devicemapper"
IgnoreSelected true IgnoreSelected true
</Plugin> </Plugin>
LoadPlugin cpu LoadPlugin cpu
<Plugin cpu> <Plugin cpu>
ReportByCpu true ReportByCpu true
ReportByState true ReportByState true
ValuesPercentage true ValuesPercentage true
</Plugin> </Plugin>
LoadPlugin network LoadPlugin network
<Plugin "network"> <Plugin "network">

View file

@ -2,11 +2,11 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let
collectd-port = 25826; collectd-port = 25826;
influx-port = 8086; influx-port = 8086;
grafana-port = 3000; # TODO nginx forward grafana-port = 3000; # TODO nginx forward
in { in {
services.grafana.enable = true; services.grafana.enable = true;
services.grafana.addr = "0.0.0.0"; services.grafana.addr = "0.0.0.0";
services.influxdb.enable = true; services.influxdb.enable = true;
@ -21,7 +21,7 @@ in {
enabled = false; enabled = false;
# write-interval = "24h"; # write-interval = "24h";
}; };
collectd = [{ collectd = [{
enabled = true; enabled = true;
typesdb = "${pkgs.collectd}/share/collectd/types.db"; typesdb = "${pkgs.collectd}/share/collectd/types.db";
database = "collectd_db"; database = "collectd_db";