diff options
| author | lassulus <lass@aidsballs.de> | 2015-11-09 02:37:13 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-11-09 02:37:13 +0100 |
| commit | 3d7790601ef2b32bf6b72f829137fd18d9874fd3 (patch) | |
| tree | 02b5af9d30d27c5ddac360ae1fa13e0e20d5c20c /shared | |
| parent | 9ff1f770f6f3703fad34ef4ce2d24116d84a5665 (diff) | |
| parent | 610a3ce59c2ba0e58205305a85e9cb86e680d481 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/1systems/wolf.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/collectd-base.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 73552e705..60d1e8ce8 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -27,7 +27,7 @@ with lib; krebs.build.source = { git.nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "e916273209560b302ab231606babf5ce1c481f08"; + rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; }; dir.secrets = { host = config.krebs.current.host; diff --git a/shared/2configs/collectd-base.nix b/shared/2configs/collectd-base.nix index b2ec40b28..3b792bf23 100644 --- a/shared/2configs/collectd-base.nix +++ b/shared/2configs/collectd-base.nix @@ -9,7 +9,7 @@ let ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/" Import "collectd_connect_time" <Module collectd_connect_time> - target "heidi.retiolum:8080" "localhost" "google.com" "google.de" "omo.retiolum" "gum.retiolum" "gum.krebsco.de" + target "localhost:22" "google.com" "google.de" "gum.retiolum:22" "gum.krebsco.de" "heidi.shack:22" "10.42.0.1:22" "heise.de" "t-online.de" interval 10 </Module> </Plugin> @@ -18,7 +18,7 @@ let LoadPlugin write_graphite <Plugin "write_graphite"> <Carbon> - Host "heidi.retiolum" + Host "heidi.shack" Port "2003" Prefix "retiolum." EscapeCharacter "_" |