From 3a818ecc21c12f3148504f7acf178bc218197e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 2 Oct 2023 22:53:56 +0200 Subject: [PATCH 1/2] WIP: nginx: Add metrics --- configuration/default.nix | 2 ++ configuration/services/metrics.nix | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/configuration/default.nix b/configuration/default.nix index 610851a..dc05cd3 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -137,6 +137,8 @@ recommendedProxySettings = true; clientMaxBodySize = "10G"; domain = "tlater.net"; + + statusPage = true; # For metrics, should be accessible only from localhost }; security.acme = { diff --git a/configuration/services/metrics.nix b/configuration/services/metrics.nix index 12a48e0..51a654d 100644 --- a/configuration/services/metrics.nix +++ b/configuration/services/metrics.nix @@ -50,6 +50,16 @@ in { enabledCollectors = ["systemd"]; listenAddress = "127.0.0.1"; }; + + nginx = { + enable = true; + listenAddress = "127.0.0.1"; + }; + + nginxlog = { + enable = true; + listenAddress = "127.0.0.1"; + }; }; systemd.services.export-to-victoriametrics = let From 034cc97410516bab3de2360e60ea9cd327997731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 2 Oct 2023 22:54:21 +0200 Subject: [PATCH 2/2] WIP: fail2ban: Add metrics --- pkgs/_sources_pkgs/generated.json | 21 +++++++++++++++++++++ pkgs/_sources_pkgs/generated.nix | 16 ++++++++++++++++ pkgs/nvfetcher.toml | 3 +++ pkgs/prometheus/fail2ban-exporter.nix | 7 +++++++ 4 files changed, 47 insertions(+) create mode 100644 pkgs/_sources_pkgs/generated.json create mode 100644 pkgs/_sources_pkgs/generated.nix create mode 100644 pkgs/nvfetcher.toml create mode 100644 pkgs/prometheus/fail2ban-exporter.nix diff --git a/pkgs/_sources_pkgs/generated.json b/pkgs/_sources_pkgs/generated.json new file mode 100644 index 0000000..b3faf9a --- /dev/null +++ b/pkgs/_sources_pkgs/generated.json @@ -0,0 +1,21 @@ +{ + "prometheus-fail2ban-exporter": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "prometheus-fail2ban-exporter", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "v0.10.0", + "sha256": "sha256-8nIW1XaHCBqQCoLkV1ZYE3NTbVZ6c+UOqYD08XQiv+4=", + "type": "git", + "url": "https://gitlab.com/hectorjsmith/fail2ban-prometheus-exporter" + }, + "version": "v0.10.0" + } +} \ No newline at end of file diff --git a/pkgs/_sources_pkgs/generated.nix b/pkgs/_sources_pkgs/generated.nix new file mode 100644 index 0000000..bb015b4 --- /dev/null +++ b/pkgs/_sources_pkgs/generated.nix @@ -0,0 +1,16 @@ +# This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: +{ + prometheus-fail2ban-exporter = { + pname = "prometheus-fail2ban-exporter"; + version = "v0.10.0"; + src = fetchgit { + url = "https://gitlab.com/hectorjsmith/fail2ban-prometheus-exporter"; + rev = "v0.10.0"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sha256 = "sha256-8nIW1XaHCBqQCoLkV1ZYE3NTbVZ6c+UOqYD08XQiv+4="; + }; + }; +} diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml new file mode 100644 index 0000000..8c53200 --- /dev/null +++ b/pkgs/nvfetcher.toml @@ -0,0 +1,3 @@ +[prometheus-fail2ban-exporter] +src.manual = "v0.10.0" # No gitlab support in nvfetcher +fetch.git = "https://gitlab.com/hectorjsmith/fail2ban-prometheus-exporter" diff --git a/pkgs/prometheus/fail2ban-exporter.nix b/pkgs/prometheus/fail2ban-exporter.nix new file mode 100644 index 0000000..a133f42 --- /dev/null +++ b/pkgs/prometheus/fail2ban-exporter.nix @@ -0,0 +1,7 @@ +{ + buildGoModule, + sources, +}: +buildGoModule { + inherit (sources.prometheus-fail2ban-exporter) name src version; +}