From 6c1fa290e8f3f8b476eb4c64414e3508e9ee2928 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 6 Dec 2023 19:51:27 +0100
Subject: [PATCH] feat(prometheus): add job to scrape nachtigall.pub.solar

---
 hosts/flora-6/apps/prometheus.nix             | 12 ++++++++-
 .../apps/nginx-prometheus-exporters.nix       |  4 +--
 ...> nachtigall-metrics-nginx-basic-auth.age} |  0
 ...metrics-prometheus-basic-auth-password.age | 27 +++++++++++++++++++
 secrets/secrets.nix                           |  3 ++-
 5 files changed, 42 insertions(+), 4 deletions(-)
 rename secrets/{nachtigall-metrics-basic-auth.age => nachtigall-metrics-nginx-basic-auth.age} (100%)
 create mode 100644 secrets/nachtigall-metrics-prometheus-basic-auth-password.age

diff --git a/hosts/flora-6/apps/prometheus.nix b/hosts/flora-6/apps/prometheus.nix
index ee49050b..1a008b59 100644
--- a/hosts/flora-6/apps/prometheus.nix
+++ b/hosts/flora-6/apps/prometheus.nix
@@ -5,6 +5,12 @@
   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;
@@ -15,9 +21,13 @@
         port = 9002;
       };
     };
+    globalConfig = {
+      scrape_interval = "10s";
+      scrape_timeout = "9s";
+    };
     scrapeConfigs = [
       {
-        job_name = "flora-6";
+        job_name = "http-targets";
         static_configs = [{
           targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
           labels = {
diff --git a/hosts/nachtigall/apps/nginx-prometheus-exporters.nix b/hosts/nachtigall/apps/nginx-prometheus-exporters.nix
index 6b383db9..f46e6515 100644
--- a/hosts/nachtigall/apps/nginx-prometheus-exporters.nix
+++ b/hosts/nachtigall/apps/nginx-prometheus-exporters.nix
@@ -1,8 +1,8 @@
 { config, flake, ... }:
 
 {
-  age.secrets.nachtigall-metrics-basic-auth = {
-    file = "${flake.self}/secrets/nachtigall-metrics-basic-auth.age";
+  age.secrets.nachtigall-metrics-nginx-basic-auth = {
+    file = "${flake.self}/secrets/nachtigall-metrics-nginx-basic-auth.age";
     mode = "600";
     owner = "nginx";
   };
diff --git a/secrets/nachtigall-metrics-basic-auth.age b/secrets/nachtigall-metrics-nginx-basic-auth.age
similarity index 100%
rename from secrets/nachtigall-metrics-basic-auth.age
rename to secrets/nachtigall-metrics-nginx-basic-auth.age
diff --git a/secrets/nachtigall-metrics-prometheus-basic-auth-password.age b/secrets/nachtigall-metrics-prometheus-basic-auth-password.age
new file mode 100644
index 00000000..842b1e9d
--- /dev/null
+++ b/secrets/nachtigall-metrics-prometheus-basic-auth-password.age
@@ -0,0 +1,27 @@
+age-encryption.org/v1
+-> ssh-ed25519 Y0ZZaw OfW2lm8CNwkA+63jp04bIHztAyLPV+xXQnTw9mzZBxg
+E1utDkQScMHCbG5+hnBCHghcHXG1RzFaBZgP8rIqP/0
+-> ssh-ed25519 uYcDNw 1ctiOm2nIiOqk9emMqDiEV6A4TogX0QY3i3BpyyRLWQ
+8dmOuKM/ojRmv4Lhq8w9EZVmdnfdheLfrms9AqAwqSw
+-> ssh-rsa kFDS0A
+RdurPDcUR4Qh49KcgWvZEXSf1cV5CQGZQ0NEaDN86EJmUGWx7lpUZK5EhYIpDMU5
+hC15shUmU1Hij9s0I7K1cQ0M3icpWJYdTmOe2IYjXDNr/Z7SUetI/NgPgV32zhW+
+jLl/NIoofFccFYvwgPbg+/pQcmKYAIl5X4B9Il8Z7a+uTDdCcEkdl0sHlf337mzE
+ILPuc4B4tEySaoDAcWzYeUZYOwWkHeZtgV/zxqE1bZzaa7WBqDrOh0/WJhivd2iG
+PmTE+yK/hPV9wWeaAMQwL52UJb/TAjFXSi1iNRhtRkmEC6VbyDzMJ25na7ZN76ZH
+76HaLffoM9yxCsvnA468vG6jr0MAgtstAgnqpb1DK7KAXCbIYeid2lN3gYo+CD8z
+lhs+gxKoZPhw/PhBsqh/O1LYkLCngzC5ydS4VvYQ3CHSU9OAQhAkT6vx8Y+znQxu
+wPEKDiEozAcW+flI9vC3Bg+uRCtGPOTufu+2qy6UNesOghbwiB+5BisjJcO3OtGz
+SHiN40POpi7GUXe2OZ4XnOxOMbs1RGMec+sB6Nno5dG1Mf6m7Vhe0TsVXWBjX+TP
+PuO1LlvUTOYld2xVMYk5intzeIRKljoDgheTf61zO1mwUbI6eMFM+QP9pH3IjETi
+a1kxHDIz6HOaTX5aAvYCPVUHmTU8Qq3GbZzFXth8Qbs
+-> ssh-ed25519 YFSOsg //jm3F459a1AT/e9Yjo0wEXae38rq4Rz3sf/E6nY7m8
+W7K7wOCeIeBQoaf4nj2inerWfr28XMTOo50SrKUi1Sc
+-> ssh-ed25519 iHV63A iTrGQu1a7GWq1b0+EnaQQwF3xD1b/MJW0FpWYd7tiTg
+aOQXaXDMKId6vLhzcm/N0JlqEZgnIXsXQ1b+U7Smahs
+-> ssh-ed25519 BVsyTA MG1cUHckhKrF9zjyDEAFEPl63ouRDVWlZTXMpQhgpzY
+nMZFNhlEFaLmqSdG25AIM2b6rwH11nxzuYrFv7Gw7wQ
+-> }IFM4v@O-grease 3Dun
+Bw
+--- E9LsfDYRjoDMTVbL2bfuFEl2mPIyMCZie1YgaMSc0p0
+�R�1و,'z���2΅|~���i7�^��>�]+
U���|�,�b���3Պ:�!���rz��qǤ
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index b71d8084..6944a90a 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -67,5 +67,6 @@ in {
   "grafana-keycloak-client-secret.age".publicKeys = flora6Keys ++ baseKeys;
   "grafana-smtp-password.age".publicKeys = flora6Keys ++ baseKeys;
 
-  "nachtigall-metrics-basic-auth.age".publicKeys = flora6Keys ++ nachtigallKeys ++ baseKeys;
+  "nachtigall-metrics-nginx-basic-auth.age".publicKeys = nachtigallKeys ++ baseKeys;
+  "nachtigall-metrics-prometheus-basic-auth-password.age".publicKeys = flora6Keys ++ baseKeys;
 }