From c738f2d41f571d3b0771aafc1b8456455ea0f916 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 30 Apr 2024 00:57:27 +0200 Subject: [PATCH] modules: remove leftover apps dir --- .../prometheus/nginx-prometheus-exporters.nix | 32 --------- .../apps/prometheus/prometheus-exporters.nix | 13 ---- modules/apps/prometheus/prometheus.nix | 69 ------------------- 3 files changed, 114 deletions(-) delete mode 100644 modules/apps/prometheus/nginx-prometheus-exporters.nix delete mode 100644 modules/apps/prometheus/prometheus-exporters.nix delete mode 100644 modules/apps/prometheus/prometheus.nix diff --git a/modules/apps/prometheus/nginx-prometheus-exporters.nix b/modules/apps/prometheus/nginx-prometheus-exporters.nix deleted file mode 100644 index af5678c..0000000 --- a/modules/apps/prometheus/nginx-prometheus-exporters.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, flake, lib, ... }: -let - # Find element in list config.services.matrix-synapse.settings.listeners - # that sets type = "metrics" - listenerWithMetrics = lib.findFirst - (listener: - listener.type == "metrics") - (throw "Found no matrix-synapse.settings.listeners.*.type containing string metrics") - config.services.matrix-synapse.settings.listeners - ; - synapseMetricsPort = "${toString listenerWithMetrics.port}"; -in -{ - age.secrets.nachtigall-metrics-nginx-basic-auth = { - file = "${flake.self}/secrets/nachtigall-metrics-nginx-basic-auth.age"; - mode = "600"; - owner = "nginx"; - }; - services.nginx.virtualHosts = { - "nachtigall.pub.solar" = { - enableACME = true; - addSSL = true; - basicAuthFile = "${config.age.secrets.nachtigall-metrics-nginx-basic-auth.path}"; - locations."/metrics" = { - proxyPass = "http://127.0.0.1:${toString(config.services.prometheus.exporters.node.port)}"; - }; - locations."/_synapse/metrics" = { - proxyPass = "http://127.0.0.1:${synapseMetricsPort}"; - }; - }; - }; -} diff --git a/modules/apps/prometheus/prometheus-exporters.nix b/modules/apps/prometheus/prometheus-exporters.nix deleted file mode 100644 index 585474a..0000000 --- a/modules/apps/prometheus/prometheus-exporters.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config -, ... -}: { - services.prometheus = { - exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" ]; - port = 9002; - }; - }; - }; -} diff --git a/modules/apps/prometheus/prometheus.nix b/modules/apps/prometheus/prometheus.nix deleted file mode 100644 index 11bc0bf..0000000 --- a/modules/apps/prometheus/prometheus.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config -, lib -, pkgs -, flake -, ... -}: { - age.secrets.nachtigall-metrics-prometheus-basic-auth-password = { - file = "${flake.self}/secrets/nachtigall-metrics-prometheus-basic-auth-password.age"; - mode = "600"; - owner = "prometheus"; - }; - - services.prometheus = { - enable = true; - port = 9001; - exporters = { - node = { - enable = true; - enabledCollectors = [ "systemd" ]; - port = 9002; - }; - }; - globalConfig = { - scrape_interval = "10s"; - scrape_timeout = "9s"; - }; - scrapeConfigs = [ - { - job_name = "node-exporter-http"; - static_configs = [{ - targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; - labels = { - instance = "flora-6"; - }; - }]; - } - { - job_name = "node-exporter-https"; - scheme = "https"; - metrics_path = "/metrics"; - basic_auth = { - username = "hakkonaut"; - password_file = "${config.age.secrets.nachtigall-metrics-prometheus-basic-auth-password.path}"; - }; - static_configs = [{ - targets = [ "nachtigall.pub.solar" ]; - labels = { - instance = "nachtigall"; - }; - }]; - } - { - job_name = "matrix-synapse"; - scheme = "https"; - metrics_path = "/_synapse/metrics"; - basic_auth = { - username = "hakkonaut"; - password_file = "${config.age.secrets.nachtigall-metrics-prometheus-basic-auth-password.path}"; - }; - static_configs = [{ - targets = [ "nachtigall.pub.solar" ]; - labels = { - instance = "nachtigall"; - }; - }]; - } - ]; - }; -}