sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "move alertmanager, prometheus under monitoring.nix-community.org"

Browse source 
This reverts commit 2e480a6b62.
This commit is contained in:
zowoq 2023-09-05 10:06:36 +10:00
parent 2e480a6b62
commit ac4a067c2b
4 changed files with 32 additions and 14 deletions

4
docs/monitoring.md
View file

@ -1,2 +1,2 @@
- [monitoring.nix-community.org/alertmanager](https://monitoring.nix-community.org/alertmanager) - [alertmanager.nix-community.org](https://alertmanager.nix-community.org)
- [monitoring.nix-community.org/prometheus](https://monitoring.nix-community.org/prometheus) - [prometheus.nix-community.org](https://prometheus.nix-community.org)

8
modules/nixos/monitoring/default.nix
View file

@ -4,12 +4,4 @@
./prometheus.nix ./prometheus.nix
./telegraf.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";
};
} }

16
modules/nixos/monitoring/prometheus.nix
View file

@ -15,7 +15,7 @@
]; ];
})) }))
]; ];
webExternalUrl = "https://monitoring.nix-community.org/prometheus/"; webExternalUrl = "https://prometheus.nix-community.org";
scrapeConfigs = [ scrapeConfigs = [
{ {
job_name = "telegraf"; job_name = "telegraf";
@ -49,9 +49,15 @@
"http://localhost:9093/metrics" # alertmanager "http://localhost:9093/metrics" # alertmanager
]; ];
services.nginx.virtualHosts."prometheus.nix-community.org" = {
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://localhost:9090";
};
services.prometheus.alertmanager = { services.prometheus.alertmanager = {
enable = true; enable = true;
webExternalUrl = "https://monitoring.nix-community.org/alertmanager/"; webExternalUrl = "https://alertmanager.nix-community.org";
listenAddress = "[::1]"; listenAddress = "[::1]";
extraFlags = [ "--cluster.listen-address=''" ]; extraFlags = [ "--cluster.listen-address=''" ];
configuration = { configuration = {
@ -83,4 +89,10 @@
]; ];
}; };
}; };
services.nginx.virtualHosts."alertmanager.nix-community.org" = {
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://localhost:9093";
};
} }

18
terraform/cloudflare_nix-community_org.tf
View file

@ -162,9 +162,23 @@ resource "cloudflare_record" "nix-community-org-nur-update-CNAME" {
type = "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 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" value = "web02.nix-community.org"
type = "CNAME" type = "CNAME"
} }