Compare commits

...

6 commits

Author SHA1 Message Date
Tristan Daniël Maat a398790ef4
feat(metrics): Add victorialogs 2025-02-28 02:11:39 +08:00
Tristan Daniël Maat e4a7fa8764
feat(grafana): Use the victoriametrics metrics plugin 2025-02-28 02:01:54 +08:00
Tristan Daniël Maat be1d739b40
bump: Update inputs
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/fa5746ecea1772cf59b3f34c5816ab3531478142?narHash=sha256-xFnU%2BuUl48Icas2wPQ%2BZzlL2O3n8f6J2LrzNK9f2nng%3D' (2025-02-15)
  → 'github:nix-community/disko/15dbf8cebd8e2655a883b74547108e089f051bf0?narHash=sha256-lSOXdgW/1zi/SSu7xp71v%2B55D5Egz8ACv0STkj7fhbs%3D' (2025-02-18)
• Updated input 'foundryvtt':
    'github:reckenrode/nix-foundryvtt/0a72a4bf64224c6584fd1b9e9f0012dd09af979a?narHash=sha256-vM9C1gFiQGa3nTYqmTBI8MoiUfprkQdepUBbxV7ECMQ%3D' (2025-01-17)
  → 'github:reckenrode/nix-foundryvtt/a7fa493ba2c623cf90e83756b62285b3b58f18d2?narHash=sha256-u3m%2BawbdL%2B0BKk8IWidsWMr%2BR0ian3GZMUlH7623kd8%3D' (2025-02-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/30d4471a8a2a13b716530d3aad60b9846ea5ff83?narHash=sha256-jGiez5BtGGJUB/LXzRa%2B4AQurMO9acc1B69kBfgQhJc%3D' (2025-02-15)
  → 'github:nixos/nixpkgs/11415c7ae8539d6292f2928317ee7a8410b28bb9?narHash=sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM%3D' (2025-02-21)
• Updated input 'nixpkgs-unstable':
    'github:nixos/nixpkgs/31ff66eb77d02e9ac34b7256a02edb1c43fb9998?narHash=sha256-3bnOIZz8KXtzcaXGuH9Eriv0HiQyr1EIfcye%2BVHLQZE%3D' (2025-02-15)
  → 'github:nixos/nixpkgs/8465e233b0668cf162c608a92e62e8d78c1ba7e4?narHash=sha256-wzBbGGZ6i1VVBA/cDJaLfuuGYCUriD7fwsLgJJHRVRk%3D' (2025-02-22)
2025-02-23 01:45:11 +08:00
Tristan Daniël Maat a60cb7f60c
chore(coturn): Switch to letsencrypt certificate
Fixes 
2025-02-23 01:18:49 +08:00
Tristan Daniël Maat 586ab969a4
feat(battery-manager): Switch to rust version 2025-02-21 04:27:54 +08:00
Tristan Daniël Maat 3c7b6a7163
bump: Update inputs 2025-02-21 04:27:07 +08:00
14 changed files with 1001 additions and 121 deletions

View file

@ -53,7 +53,7 @@
"*.tlater.com" "*.tlater.com"
]; ];
dnsProvider = "porkbun"; dnsProvider = "porkbun";
group = "nginx"; group = "ssl-cert";
credentialFiles = { credentialFiles = {
PORKBUN_API_KEY_FILE = config.sops.secrets."porkbun/api-key".path; PORKBUN_API_KEY_FILE = config.sops.secrets."porkbun/api-key".path;
PORKBUN_SECRET_API_KEY_FILE = config.sops.secrets."porkbun/secret-api-key".path; PORKBUN_SECRET_API_KEY_FILE = config.sops.secrets."porkbun/secret-api-key".path;
@ -61,6 +61,12 @@
}; };
}; };
users.groups.ssl-cert = { };
systemd.services.nginx.serviceConfig.SupplementaryGroups = [
config.security.acme.certs."tlater.net".group
];
services.backups.acme = { services.backups.acme = {
user = "acme"; user = "acme";
paths = lib.mapAttrsToList ( paths = lib.mapAttrsToList (

View file

@ -4,9 +4,13 @@
services.batteryManager = { services.batteryManager = {
enable = true; enable = true;
battery = "3ca39300-c523-4315-b9a3-d030f85a9373";
emailFile = "${config.sops.secrets."battery-manager/email".path}"; emailFile = "${config.sops.secrets."battery-manager/email".path}";
passwordFile = "${config.sops.secrets."battery-manager/password".path}"; passwordFile = "${config.sops.secrets."battery-manager/password".path}";
settings = {
battery_id = "3ca39300-c523-4315-b9a3-d030f85a9373";
log_level = "DEBUG";
};
}; };
} }

View file

@ -50,6 +50,10 @@ in
# See also https://gitlab.com/famedly/conduit/-/issues/314 # See also https://gitlab.com/famedly/conduit/-/issues/314
systemd.services.conduit.serviceConfig.EnvironmentFile = config.sops.secrets."turn/env".path; systemd.services.conduit.serviceConfig.EnvironmentFile = config.sops.secrets."turn/env".path;
systemd.services.coturn.serviceConfig.SupplementaryGroups = [
config.security.acme.certs."tlater.net".group
];
services.coturn = { services.coturn = {
enable = true; enable = true;
no-cli = true; no-cli = true;
@ -59,11 +63,8 @@ in
relay-ips = [ "116.202.158.55" ]; relay-ips = [ "116.202.158.55" ];
# SSL config # SSL config
# pkey = "${config.security.acme.certs."tlater.net".directory}/key.pem";
# TODO(tlater): Switch to letsencrypt once google fix: cert = "${config.security.acme.certs."tlater.net".directory}/fullchain.pem";
# https://github.com/vector-im/element-android/issues/1533
pkey = config.sops.secrets."turn/ssl-key".path;
cert = config.sops.secrets."turn/ssl-cert".path;
# Based on suggestions from # Based on suggestions from
# https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md # https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md

View file

@ -5,5 +5,6 @@
./exporters.nix ./exporters.nix
./grafana.nix ./grafana.nix
./victoriametrics.nix ./victoriametrics.nix
./victorialogs.nix
]; ];
} }

View file

@ -20,6 +20,16 @@ in
timeout = "5s"; timeout = "5s";
http.preferred_ip_protocol = "ip4"; http.preferred_ip_protocol = "ip4";
}; };
turn_server = {
prober = "tcp";
timeout = "5s";
tcp = {
preferred_ip_protocol = "ip4";
source_ip_address = "116.202.158.55";
tls = true;
};
};
}; };
}; };
}; };

View file

@ -1,4 +1,9 @@
{ config, ... }: {
pkgs,
config,
flake-inputs,
...
}:
let let
domain = "metrics.${config.services.nginx.domain}"; domain = "metrics.${config.services.nginx.domain}";
in in
@ -28,6 +33,11 @@ in
}; };
}; };
declarativePlugins = [
pkgs.grafanaPlugins.victoriametrics-metrics-datasource
flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.grafanaPlugins.victoriametrics-logs-datasource
];
provision = { provision = {
enable = true; enable = true;
@ -35,7 +45,16 @@ in
{ {
name = "Victoriametrics - tlater.net"; name = "Victoriametrics - tlater.net";
url = "http://localhost:8428"; url = "http://localhost:8428";
type = "prometheus"; type = "victoriametrics-metrics-datasource";
access = "proxy";
isDefault = true;
}
{
name = "Victorialogs - tlater.net";
url = "http://${config.services.victorialogs.bindAddress}";
type = "victoriametrics-logs-datasource";
access = "proxy";
} }
]; ];
}; };

View file

@ -0,0 +1,110 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.victorialogs;
pkg = pkgs.victoriametrics;
dirname = "victorialogs";
in
{
options.services.victorialogs =
let
inherit (lib.types) str;
in
{
listenAddress = lib.mkOption {
default = ":9428";
type = str;
};
bindAddress = lib.mkOption {
readOnly = true;
type = str;
description = ''
Final address on which victorialogs listens.
'';
};
};
config = {
services.victorialogs.bindAddress =
(lib.optionalString (lib.hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress;
services.journald.upload = {
enable = true;
settings.Upload = {
URL = "http://${cfg.bindAddress}/insert/journald";
NetworkTimeoutSec = "20s";
};
};
systemd.services."systemd-journal-upload".after = [ "victorialogs.service" ];
systemd.services.victorialogs = {
description = "VictoriaLogs log database";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
startLimitBurst = 5;
serviceConfig = {
ExecStart = lib.escapeShellArgs [
"${pkg}/bin/victoria-logs"
"-storageDataPath=/var/lib/${dirname}"
"-httpListenAddr=${cfg.listenAddress}"
];
DynamicUser = true;
RestartSec = 1;
Restart = "on-failure";
RuntimeDirectory = dirname;
RuntimeDirectoryMode = "0700";
StateDirectory = dirname;
StateDirectoryMode = "0700";
LimitNOFILE = 1048576;
# Hardening
DeviceAllow = [ "/dev/null rw" ];
DevicePolicy = "strict";
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "full";
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_UNIX"
];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged"
];
};
postStart = lib.mkBefore ''
until ${lib.getBin pkgs.curl}/bin/curl -s -o /dev/null http://${cfg.bindAddress}/ping; do
sleep 1;
done
'';
};
};
}

View file

@ -40,6 +40,30 @@ in
}; };
}; };
blackbox_turn = {
targets = [ "turn.tlater.net:${toString config.services.coturn.tls-listening-port}" ];
extraSettings = {
metrics_path = "/probe";
params.module = [ "turn_server" ];
relabel_configs = [
{
source_labels = [ "__address__" ];
target_label = "__param_target";
}
{
source_labels = [ "__param_target" ];
target_label = "instance";
}
{
target_label = "__address__";
replacement = "${blackbox_host}:${toString blackbox_port}";
}
];
};
};
blackbox_exporter.targets = [ "${blackbox_host}:${toString blackbox_port}" ]; blackbox_exporter.targets = [ "${blackbox_host}:${toString blackbox_port}" ];
coturn.targets = [ "127.0.0.1:9641" ]; coturn.targets = [ "127.0.0.1:9641" ];

View file

@ -1,18 +1,11 @@
{ config, lib, ... }:
{ {
sops = { sops = {
defaultSopsFile = ../keys/production.yaml; defaultSopsFile = ../keys/production.yaml;
secrets = { secrets = {
"battery-manager/email" = lib.mkIf config.services.batteryManager.enable { "battery-manager/email" = { };
owner = "battery-manager";
group = "battery-manager";
};
"battery-manager/password" = lib.mkIf config.services.batteryManager.enable { "battery-manager/password" = { };
owner = "battery-manager";
group = "battery-manager";
};
# Gitea # Gitea
"forgejo/metrics-token" = { "forgejo/metrics-token" = {

File diff suppressed because it is too large Load diff

View file

@ -26,8 +26,6 @@
url = "git+ssh://git@github.com/sonnenshift/battery-manager"; url = "git+ssh://git@github.com/sonnenshift/battery-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-crowdsec.url = "github:tlater/nixpkgs/tlater/fix-crowdsec";
}; };
outputs = outputs =
@ -106,7 +104,6 @@
in in
{ {
default = vm.config.system.build.vm; default = vm.config.system.build.vm;
crowdsec = pkgs.callPackage "${inputs.nixpkgs-crowdsec}/pkgs/by-name/cr/crowdsec/package.nix" { };
crowdsec-hub = localPkgs.crowdsec.hub; crowdsec-hub = localPkgs.crowdsec.hub;
crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer; crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer;
}; };

View file

@ -1,5 +1,4 @@
{ {
flake-inputs,
pkgs, pkgs,
lib, lib,
config, config,
@ -9,8 +8,6 @@ let
cfg = config.security.crowdsec; cfg = config.security.crowdsec;
settingsFormat = pkgs.formats.yaml { }; settingsFormat = pkgs.formats.yaml { };
crowdsec = flake-inputs.self.packages.${pkgs.system}.crowdsec;
hub = pkgs.fetchFromGitHub { hub = pkgs.fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = "hub"; repo = "hub";
@ -19,14 +16,14 @@ let
}; };
cscli = pkgs.writeShellScriptBin "cscli" '' cscli = pkgs.writeShellScriptBin "cscli" ''
export PATH="$PATH:${crowdsec}/bin/" export PATH="$PATH:${cfg.package}/bin/"
sudo=exec sudo=exec
if [ "$USER" != "crowdsec" ]; then if [ "$USER" != "crowdsec" ]; then
sudo='exec /run/wrappers/bin/sudo -u crowdsec' sudo='exec /run/wrappers/bin/sudo -u crowdsec'
fi fi
$sudo ${crowdsec}/bin/cscli "$@" $sudo ${cfg.package}/bin/cscli "$@"
''; '';
acquisitions = '' acquisitions = ''
@ -53,7 +50,7 @@ in
package = lib.mkOption { package = lib.mkOption {
type = package; type = package;
default = crowdsec; default = pkgs.crowdsec;
}; };
stateDirectory = lib.mkOption { stateDirectory = lib.mkOption {

View file

@ -21,7 +21,7 @@
}, },
"crowdsec-hub": { "crowdsec-hub": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-01-30", "date": "2025-02-22",
"extract": null, "extract": null,
"name": "crowdsec-hub", "name": "crowdsec-hub",
"passthru": null, "passthru": null,
@ -33,10 +33,10 @@
"name": null, "name": null,
"owner": "crowdsecurity", "owner": "crowdsecurity",
"repo": "hub", "repo": "hub",
"rev": "8f102f5ac79af59d3024ca2771b65ec87411ac02", "rev": "f9883cd6c7d1913c13e4a3a69d9a0b887a7d57df",
"sha256": "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo=", "sha256": "sha256-45pUln7Qj5luY9I9BE2qhzjH7kv4IbYvNoEX3/4AVVg=",
"type": "github" "type": "github"
}, },
"version": "8f102f5ac79af59d3024ca2771b65ec87411ac02" "version": "f9883cd6c7d1913c13e4a3a69d9a0b887a7d57df"
} }
} }

View file

@ -14,14 +14,14 @@
}; };
crowdsec-hub = { crowdsec-hub = {
pname = "crowdsec-hub"; pname = "crowdsec-hub";
version = "8f102f5ac79af59d3024ca2771b65ec87411ac02"; version = "f9883cd6c7d1913c13e4a3a69d9a0b887a7d57df";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = "hub"; repo = "hub";
rev = "8f102f5ac79af59d3024ca2771b65ec87411ac02"; rev = "f9883cd6c7d1913c13e4a3a69d9a0b887a7d57df";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo="; sha256 = "sha256-45pUln7Qj5luY9I9BE2qhzjH7kv4IbYvNoEX3/4AVVg=";
}; };
date = "2025-01-30"; date = "2025-02-22";
}; };
} }