diff options
| author | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-10-17 19:54:15 +0200 |
| commit | 9afe5210f2a44cacac4f3527b6c8b561d9e4296b (patch) | |
| tree | a83c412966783b123cd3152fe34a6f7cddcb55d6 /makefu/2configs/stats | |
| parent | f4bf9110727f2c7113c80aaa88427b81605016ae (diff) | |
| parent | 4667bb8e4111abde822ae57993a29929c5cc9aad (diff) | |
Merge remote-tracking branch 'temp/master'
Diffstat (limited to 'makefu/2configs/stats')
| -rw-r--r-- | makefu/2configs/stats/server.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/stats/telegraf/europastats.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix index 8f9935658..7548c733e 100644 --- a/makefu/2configs/stats/server.nix +++ b/makefu/2configs/stats/server.nix @@ -2,6 +2,8 @@ with import <stockholm/lib>; let + irc-server = "rc.r"; + irc-nick = "m-alarm"; collectd-port = 25826; influx-port = 8086; grafana-port = 3000; # TODO nginx forward @@ -37,9 +39,9 @@ in { echoToIrc = pkgs.writeDash "echo_irc" '' set -euf data="$(${pkgs.jq}/bin/jq -r .message)" - export LOGNAME=malarm + export LOGNAME=${irc-nick} ${pkgs.irc-announce}/bin/irc-announce \ - irc.freenode.org 6667 malarm \#krebs-bots "$data" >/dev/null + ${irc-server} 6667 ${irc-nick} \#noise "$data" >/dev/null ''; in { enable = true; diff --git a/makefu/2configs/stats/telegraf/europastats.nix b/makefu/2configs/stats/telegraf/europastats.nix index 9249280c5..2ab62766a 100644 --- a/makefu/2configs/stats/telegraf/europastats.nix +++ b/makefu/2configs/stats/telegraf/europastats.nix @@ -4,7 +4,7 @@ let rev = "be31da7"; name = "europastats-${rev}"; propagatedBuildInputs = [ - requests2 + requests docopt ]; src = pkgs.fetchgit { |