summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-09-27 16:09:12 +0200
committerlassulus <lassulus@lassul.us>2020-09-27 16:09:12 +0200
commit7e7499d86302d261c8f8404fb34f2ac091318d0e (patch)
tree28e7f6bce1f24e2474a8dfbcd5d912b51af8f516 /makefu
parent22d52b8ed4faf55be5d37790e9f84b24fdec80eb (diff)
parent859b7d66884385e1ed1efc5b51467587108c7bb4 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/stats/server.nix33
-rw-r--r--makefu/5pkgs/tt-rss/default.nix25
2 files changed, 25 insertions, 33 deletions
diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix
index bb8fd1750..a2d0693ab 100644
--- a/makefu/2configs/stats/server.nix
+++ b/makefu/2configs/stats/server.nix
@@ -41,40 +41,7 @@ in {
bind-address = ":${toString collectd-port}";
}];
};
- krebs.kapacitor =
- let
- echoToIrc = pkgs.writeDash "echo_irc" ''
- set -euf
- data="$(${pkgs.jq}/bin/jq -r .message)"
- export LOGNAME=${irc-nick}
- ${pkgs.irc-announce}/bin/irc-announce \
- ${irc-server} 6667 ${irc-nick} \#noise "$data" >/dev/null
- '';
- in {
- enable = true;
- alarms = {
- cpu_deadman.database = db;
- cpu_deadman.text = ''
- var data = batch
- |query(${"'''"}
- SELECT mean("value") AS mean
- FROM "collectd_db"."default"."cpu_value"
- WHERE "type_instance" = 'idle' AND "type" = 'percent' fill(0)
- ${"'''"})
- .period(10m)
- .every(1m)
- .groupBy('host')
- data |alert()
- .crit(lambda: "mean" < 50)
- .stateChangesOnly()
- .exec('${echoToIrc}')
- data |deadman(1.0,5m)
- .stateChangesOnly()
- .exec('${echoToIrc}')
- '';
- };
- };
networking.firewall.extraCommands = ''
iptables -A INPUT -i retiolum -p udp --dport ${toString collectd-port} -j ACCEPT
iptables -A INPUT -i retiolum -p tcp --dport ${toString influx-port} -j ACCEPT
diff --git a/makefu/5pkgs/tt-rss/default.nix b/makefu/5pkgs/tt-rss/default.nix
new file mode 100644
index 000000000..4907a73a5
--- /dev/null
+++ b/makefu/5pkgs/tt-rss/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "tt-rss";
+ version = "2020-09-23";
+ rev = "d0ed7890df";
+
+ src = fetchurl {
+ url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
+ sha256 = "1b2fczd41bqg9bq37r99svrqswr9qrp35m6gn3nz032yqcwc22ij";
+ };
+
+ installPhase = ''
+ mkdir $out
+ cp -ra * $out/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Web-based news feed (RSS/Atom) aggregator";
+ license = licenses.gpl2Plus;
+ homepage = "https://tt-rss.org";
+ maintainers = with maintainers; [ globin zohl ];
+ platforms = platforms.all;
+ };
+}