From d79c252c7337aeac6463795bd28cd765a94d4d09 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Fri, 15 Oct 2021 14:43:13 +0000
Subject: [PATCH] Add blackbox monitoring also to testing and production grids
---
morph/grid/production/grid.nix | 10 +++++++++-
morph/grid/testing/grid.nix | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index ec0c1b37..dd982833 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -45,7 +45,10 @@ let
gridlib.monitoring
gridlib.hardware-aws
(gridlib.customize-monitoring {
- inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets;
+ inherit hostsMap vpnClientIPs
+ nodeExporterTargets
+ paymentExporterTargets
+ blackboxExporterHttpsTargets;
inherit (grid-config) letsEncryptAdminEmail;
googleOAuthClientID = grid-config.monitoringGoogleOAuthClientID;
enableSlackAlert = true;
@@ -127,6 +130,11 @@ let
"storage005"
];
paymentExporterTargets = [ "payments" ];
+ blackboxExporterHttpsTargets = [
+ "https://private.storage/"
+ "https://payments.private.storage/"
+ "https://monitoring.private.storage/"
+ ];
in {
network = {
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 7a304e11..45ebb306 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -58,7 +58,10 @@ let
gridlib.monitoring
gridlib.hardware-aws
(gridlib.customize-monitoring {
- inherit hostsMap vpnClientIPs nodeExporterTargets paymentExporterTargets;
+ inherit hostsMap vpnClientIPs
+ nodeExporterTargets
+ paymentExporterTargets
+ blackboxExporterHttpsTargets;
inherit (grid-config) letsEncryptAdminEmail;
googleOAuthClientID = grid-config.monitoringGoogleOAuthClientID;
enableSlackAlert = true;
@@ -78,6 +81,11 @@ let
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" ];
nodeExporterTargets = [ "monitoring" "payments" "storage001" ];
paymentExporterTargets = [ "payments" ];
+ blackboxExporterHttpsTargets = [
+ "https://privatestorage-staging.com/"
+ "https://payments.privatestorage-staging.com/"
+ "https://monitoring.privatestorage-staging.com/"
+ ];
in {
network = {
--
GitLab