pub-solar/infra
6
1
Fork 3
Code Issues 16 Pull requests 7 Actions Packages Projects 1 Releases Wiki Activity

feat(matrix-synapse): enable metrics #100

Merged
teutat3s merged 4 commits from feat/synapse-metrics into main 2024-01-28 23:56:42 +00:00
Conversation 0 Commits 4 Files changed 5 +11 -4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3cfdd9d20a - Show all commits

6
hosts/nachtigall/apps/matrix/irc.nix
View file

@ -1,4 +1,8 @@
{ config, lib, pkgs, ... }:
let
# Get port from first element in list of matrix-synapse listeners
synapsePort = "${toString (lib.findFirst (listener: listener.port != null) "" config.services.matrix-synapse.settings.listeners).port}";
axeman commented 2024-01-27 17:32:05 +00:00
Outdated
Review
Copy link

This looks like it will break if someone adds things as the first element of that list. We should filter for the service which contains federation in names.

This looks like it will break if someone adds things as the first element of that list. We should filter for the service which contains `federation` in `names`.
in
{
systemd.services.matrix-appservice-irc.serviceConfig.SystemCallFilter = lib.mkForce [
"@system-service @pkey"
@ -13,7 +17,7 @@
settings = {
homeserver = {
domain = "pub.solar";
url = "http://127.0.0.1:${toString (builtins.map (listener: listener.port) config.services.matrix-synapse.settings.listeners)}";
url = "http://127.0.0.1:${synapsePort}";
media_url = "https://matrix.pub.solar";
enablePresence = false;
};

9
hosts/nachtigall/apps/nginx-prometheus-exporters.nix
View file

@ -1,5 +1,8 @@
{ config, flake, ... }:
{ config, flake, lib, ... }:
let
# Get port from first element in list of matrix-synapse listeners
synapsePort = "${toString (lib.findFirst (listener: listener.port != null) "" config.services.matrix-synapse.settings.listeners).port}";
in
{
age.secrets.nachtigall-metrics-nginx-basic-auth = {
file = "${flake.self}/secrets/nachtigall-metrics-nginx-basic-auth.age";
@ -15,7 +18,7 @@
proxyPass = "http://127.0.0.1:${toString(config.services.prometheus.exporters.node.port)}";
};
locations."/_synapse/metrics" = {
proxyPass = "http://127.0.0.1:${toString (builtins.map (listener: listener.port) config.services.matrix-synapse.settings.listeners)}";
proxyPass = "http://127.0.0.1:${synapsePort}";
};
};
};