1
0
Fork 0

metrics: stop parsing prometheus labels from url

This commit is contained in:
Oystein Kristoffer Tveit 2023-01-20 01:08:09 +01:00
parent 90e924c083
commit 1524b6b10c
Signed by untrusted user: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 14 additions and 36 deletions

View File

@ -34,33 +34,6 @@ in {
url = "https://matrix.pvv.ntnu.no/metrics/config.json"; url = "https://matrix.pvv.ntnu.no/metrics/config.json";
} }
]; ];
relabel_configs = [
{
source_labels = [ "__address__" ];
regex = "[^/]+(/.*)";
target_label = "__metrics_path__";
}
{
source_labels = [ "__address__" ];
regex = "([^/]+)/.*";
target_label = "instance";
}
{
source_labels = [ "__address__" ];
regex = "[^/]+\\/+[^/]+/(.*)/\\d+$";
target_label = "job";
}
{
source_labels = [ "__address__" ];
regex = "[^/]+\\/+[^/]+/.*/(\\d+)$";
target_label = "index";
}
{
source_labels = [ "__address__" ];
regex = "([^/]+)/.*";
target_label = "__address__";
}
];
} }
]; ];
ruleFiles = [ rules/synapse-v2.rules ]; ruleFiles = [ rules/synapse-v2.rules ];

View File

@ -206,17 +206,22 @@ in {
}; };
locations."/metrics/" = let locations."/metrics/" = let
endpoints = lib.pipe cfg.workers.instances [ # See https://github.com/matrix-org/synapse/blob/develop/docs/metrics-howto.md
staticConfigs = lib.pipe cfg.workers.instances [
(lib.mapAttrsToList (_: v: v)) (lib.mapAttrsToList (_: v: v))
(map (w: "${w.type}/${toString w.index}")) # Add metrics for main process to the list of workers
(map (w: "matrix.pvv.ntnu.no/metrics/${w}")) (x: x ++ [{ type = "master"; index = 1; }])
] ++ [ "matrix.pvv.ntnu.no/metrics/master/1" ]; (map (w: {
targets = [ "matrix.pvv.ntnu.no/metrics/${w.type}/${toString w.index}" ];
labels = {
instance = "matrix.pvv.ntnu.no";
job = w.type;
index = toString w.index;
};
}))
];
in { in {
alias = pkgs.writeTextDir "/config.json" alias = (pkgs.writeTextDir "/config.json" (builtins.toJSON staticConfigs)) + "/";
(builtins.toJSON [
{ targets = endpoints;
labels = { };
}]) + "/";
}; };
})]; })];
} }