rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-18 17:11:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

grafana: init

Browse source
This commit is contained in:
Rouven Seifert 2024-05-24 15:59:34 +02:00
parent af73e70082
commit 5fd94d8540
8 changed files with 154 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/falkenstein/default.nix
View file

@ -10,6 +10,7 @@
./modules/dns
./modules/fail2ban
./modules/mail
./modules/monitoring
./modules/networks
./modules/pfersel
./modules/purge

18
hosts/falkenstein/modules/monitoring/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, ... }:
{
services.prometheus = {
exporters = {
node = {
enable = true;
enabledCollectors = [ "systemd" ];
};
postfix = {
enable = true;
};
};
};
networking.firewall.allowedTCPPorts = [
config.services.prometheus.exporters.node.port
config.services.prometheus.exporters.postfix.port
];
}

1
hosts/fujitsu/default.nix
View file

@ -3,6 +3,7 @@
imports = [
./hardware-configuration.nix
./modules/networks
./modules/monitoring
];
boot.loader.grub.enable = true;

14
hosts/fujitsu/modules/monitoring/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ config, ... }:
{
services.prometheus = {
exporters = {
node = {
enable = true;
enabledCollectors = [ "systemd" ];
};
};
};
networking.firewall.allowedTCPPorts = [
config.services.prometheus.exporters.node.port
];
}

27
hosts/nuc/modules/monitoring/default.nix
View file

@ -3,7 +3,7 @@ let
domain = "monitoring.${config.networking.domain}";
in
{
sops.secrets."grafana/oidc_secret" = {
age.secrets."grafana/oidc_secret" = {
file = ../../../../secrets/nuc/grafana/oidc.age;
owner = "grafana";
};
@ -37,13 +37,11 @@ in
auth_url = "https://auth.rfive.de/application/o/authorize/";
token_url = "https://auth.rfive.de/application/o/token/";
api_url = "https://auth.rfive.de/application/o/userinfo/";
role_attribute_path = "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'";
role_attribute_path = "contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'";
};
};
};
services.postgresql = {
@ -64,7 +62,6 @@ in
node = {
enable = true;
enabledCollectors = [ "systemd" ];
port = 9002;
};
# postfix = {
# enable = true;
@ -75,17 +72,21 @@ in
{
job_name = "node";
static_configs = [{
targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
targets = [
"nuc.vpn.rfive.de:${toString config.services.prometheus.exporters.node.port}"
"falkenstein.vpn.rfive.de:${toString config.services.prometheus.exporters.node.port}"
"cudy.vpn.rfive.de:${toString config.services.prometheus.exporters.node.port}"
"fujitsu.vpn.rfive.de:${toString config.services.prometheus.exporters.node.port}"
];
}];
scrape_interval = "15s";
}
# {
# job_name = "postfix";
# static_configs = [{
# targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.postfix.port}" ];
# }];
# # scrape_interval = "60s";
# }
{
job_name = "postfix";
static_configs = [{
targets = [ "falkenstein.vpn.rfive.de:${toString config.services.prometheus.exporters.postfix.port}" ];
}];
}
];
};

3
hosts/nuc/modules/networks/default.nix
View file

@ -35,8 +35,7 @@
}];
networkConfig = {
DNS = [
"9.9.9.9"
"149.112.112.112"
"192.168.42.1"
];
LLDP = true;
EmitLLDP = "nearest-bridge";

16
overlays/default.nix
View file

@ -63,8 +63,7 @@ in
adguardian-term = callPackage ../pkgs/adguardian-term { };
# upstream package is broken and can't be fixed by overriding attrs. so I just completely redo it in here
seahub = (python3Packages.buildPythonApplication
rec {
seahub = (python3Packages.buildPythonApplication rec {
pname = "seahub";
version = "11.0.1";
format = "other";
@ -138,5 +137,18 @@ in
pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
};
});
# (hopefully) fix systemd journal reading
prometheus-postfix-exporter = prev.prometheus-postfix-exporter.overrideAttrs (_old: {
patches = [
./prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch
];
src = fetchFromGitHub {
owner = "adangel";
repo = "postfix_exporter";
rev = "414ac12ee63415eede46cb3084d755a6da6fba23";
hash = "sha256-m1kVaO3N7XC1vtnxXX9kMiEFPmZuoopRUYgA7gQzP8w=";
};
});
}

25
overlays/prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch Normal file
View file

@ -0,0 +1,25 @@
From f4c5dd5628c873981b2d6d6b8f3bbf036b9fd724 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven.seifert@ifsr.de>
Date: Thu, 2 May 2024 11:20:27 +0200
Subject: [PATCH] cleanup: also catch milter-reject
---
postfix_exporter.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/postfix_exporter.go b/postfix_exporter.go
index f20d99c..676d767 100644
--- a/postfix_exporter.go
+++ b/postfix_exporter.go
@@ -335,6 +335,8 @@ func (e *PostfixExporter) CollectFromLogLine(line string) {
e.cleanupProcesses.Inc()
} else if strings.Contains(remainder, ": reject: ") {
e.cleanupRejects.Inc()
+ } else if strings.Contains(remainder, ": milter-reject: ") {
+ e.cleanupRejects.Inc()
} else {
e.addToUnsupportedLine(line, subprocess, level)
}
--
2.44.0