From 01d41cfec1e30c01e219ad27c4d480daa5383e93 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Thu, 20 May 2021 22:35:03 +0000
Subject: [PATCH] Add Prometheus Server
---
morph/grid/local/grid.nix | 2 ++
morph/lib/make-monitoring.nix | 8 ++++++++
nixos/modules/monitoring/server/prometheus.nix | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 6d9a51b2..f00dabe6 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -38,6 +38,8 @@ import ../../lib/make-grid.nix {
monitoringvpnIPv4 = "172.23.23.1";
inherit vpnClientIPs;
inherit sshUsers;
+ nodeExporterHostNames = [ ];
+ nginxExporterHostNames = [ ];
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.09";
} // cfg);
diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix
index a169732c..93385f7e 100644
--- a/morph/lib/make-monitoring.nix
+++ b/morph/lib/make-monitoring.nix
@@ -9,6 +9,8 @@
, stateVersion
, monitoringvpnIPv4
, vpnClientIPs
+, nodeExporterHostNames
+, nginxExporterHostNames
, ... }: rec {
deployment = {
@@ -38,6 +40,7 @@
hardware
../../nixos/modules/monitoring/vpn/server.nix
../../nixos/modules/monitoring/server/grafana.nix
+ ../../nixos/modules/monitoring/server/prometheus.nix
];
services.private-storage.monitoring.vpn.server = {
@@ -52,5 +55,10 @@
lokiUrl = "http://localhost:3100/";
};
+ services.private-storage.monitoring.prometheus = {
+ nodeExporterTargets = nodeExporterHostNames;
+ nginxExporterTargets = nginxExporterHostNames;
+ };
+
system.stateVersion = stateVersion;
}
diff --git a/nixos/modules/monitoring/server/prometheus.nix b/nixos/modules/monitoring/server/prometheus.nix
index cffb126d..3a85bbd0 100644
--- a/nixos/modules/monitoring/server/prometheus.nix
+++ b/nixos/modules/monitoring/server/prometheus.nix
@@ -24,11 +24,11 @@ in {
};
config = rec {
- networking.firewall.allowedTCPPorts = [ services.prometheus.port ];
+ # networking.firewall.allowedTCPPorts = [ services.prometheus.port ];
services.prometheus = {
enable = true;
- port = 9090; # Option only in recent (20.09?) nixpkgs, 9090 default
+ # port = 9090; # Option only in recent (20.09?) nixpkgs, 9090 default
scrapeConfigs = [
{
job_name = "node-exporters";
--
GitLab