From ac4a067c2b3c214b919c9de8a432772af63e7086 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:06:36 +1000
Subject: [PATCH] Revert "move alertmanager, prometheus under
monitoring.nix-community.org"
This reverts commit 2e480a6b62ae56e92aed905044bb83e6f6f073f0.
---
docs/monitoring.md | 4 ++--
modules/nixos/monitoring/default.nix | 8 --------
modules/nixos/monitoring/prometheus.nix | 16 ++++++++++++++--
terraform/cloudflare_nix-community_org.tf | 18 ++++++++++++++++--
4 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/docs/monitoring.md b/docs/monitoring.md
index b8eeaf1..fad5c94 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -1,2 +1,2 @@
-- [monitoring.nix-community.org/alertmanager](https://monitoring.nix-community.org/alertmanager)
-- [monitoring.nix-community.org/prometheus](https://monitoring.nix-community.org/prometheus)
+- [alertmanager.nix-community.org](https://alertmanager.nix-community.org)
+- [prometheus.nix-community.org](https://prometheus.nix-community.org)
diff --git a/modules/nixos/monitoring/default.nix b/modules/nixos/monitoring/default.nix
index 9dc581f..732314e 100644
--- a/modules/nixos/monitoring/default.nix
+++ b/modules/nixos/monitoring/default.nix
@@ -4,12 +4,4 @@
./prometheus.nix
./telegraf.nix
];
-
- services.nginx.virtualHosts."monitoring.nix-community.org" = {
- enableACME = true;
- forceSSL = true;
- locations."/".return = "302 https://nix-community.org/monitoring";
- locations."/alertmanager/".proxyPass = "http://localhost:9093";
- locations."/prometheus/".proxyPass = "http://localhost:9090";
- };
}
diff --git a/modules/nixos/monitoring/prometheus.nix b/modules/nixos/monitoring/prometheus.nix
index d198751..955e8a2 100644
--- a/modules/nixos/monitoring/prometheus.nix
+++ b/modules/nixos/monitoring/prometheus.nix
@@ -15,7 +15,7 @@
];
}))
];
- webExternalUrl = "https://monitoring.nix-community.org/prometheus/";
+ webExternalUrl = "https://prometheus.nix-community.org";
scrapeConfigs = [
{
job_name = "telegraf";
@@ -49,9 +49,15 @@
"http://localhost:9093/metrics" # alertmanager
];
+ services.nginx.virtualHosts."prometheus.nix-community.org" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/".proxyPass = "http://localhost:9090";
+ };
+
services.prometheus.alertmanager = {
enable = true;
- webExternalUrl = "https://monitoring.nix-community.org/alertmanager/";
+ webExternalUrl = "https://alertmanager.nix-community.org";
listenAddress = "[::1]";
extraFlags = [ "--cluster.listen-address=''" ];
configuration = {
@@ -83,4 +89,10 @@
];
};
};
+
+ services.nginx.virtualHosts."alertmanager.nix-community.org" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/".proxyPass = "http://localhost:9093";
+ };
}
diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf
index c54f63a..72e59fa 100644
--- a/terraform/cloudflare_nix-community_org.tf
+++ b/terraform/cloudflare_nix-community_org.tf
@@ -162,9 +162,23 @@ resource "cloudflare_record" "nix-community-org-nur-update-CNAME" {
type = "CNAME"
}
-resource "cloudflare_record" "nix-community-org-monitoring-CNAME" {
+resource "cloudflare_record" "nix-community-org-alertmanager-CNAME" {
zone_id = local.nix_community_zone_id
- name = "monitoring"
+ name = "alertmanager"
+ value = "web02.nix-community.org"
+ type = "CNAME"
+}
+
+resource "cloudflare_record" "nix-community-org-grafana-CNAME" {
+ zone_id = local.nix_community_zone_id
+ name = "grafana"
+ value = "web02.nix-community.org"
+ type = "CNAME"
+}
+
+resource "cloudflare_record" "nix-community-org-prometheus-CNAME" {
+ zone_id = local.nix_community_zone_id
+ name = "prometheus"
value = "web02.nix-community.org"
type = "CNAME"
}