grafana.nixos.org, prometheus.nixos.org -> monitoring.nixos.org
Rok Garbas committed
Dec 3, 2020 at 16:03 UTC
d2ca81d435e0f65ce3e2e08bd167632656d316d9
4 files changed
+16
-20
delft/apache-errors/503.html
+2
-2
@@ -19,8 +19,8 @@
19
<p>Looks like Hydra is having some problems. Sorry about that!</p>
20
<p style="font-size: 90%;">
21
<a href="https://nixos.org/">NixOS Homepage</a> |
22
- <a href="https://prometheus.nixos.org/alerts">System Alerts</a> |
23
- <a href="https://grafana.nixos.org/">Dashboards</a> |
22
+ <a href="https://monitoring.nixos.org/prometheus/alerts">System Alerts</a> |
23
+ <a href="https://monitoring.nixos.org/grafana/">Dashboards</a> |
24
<a href="https://github.com/NixOS/nixpkgs/labels/infrastructure">Related Issues</a>
25
</p>
26
</center>
delft/eris.nix
+12
-16
@@ -40,15 +40,11 @@ in {
40
41
services.nginx = {
42
enable = true;
43
- virtualHosts."grafana.nixos.org" = {
43
+ virtualHosts."monitoring.nixos.org" = {
44
enableACME = true;
45
forceSSL = true;
46
- locations."/".proxyPass = "http://${config.services.grafana.addr}:${toString config.services.grafana.port}/";
47
- };
48
- virtualHosts."prometheus.nixos.org" = {
49
- enableACME = true;
50
- forceSSL = true;
51
- locations."/".proxyPass = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}";
46
+ locations."/prometheus/".proxyPass = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}";
47
+ locations."/grafana/".proxyPass = "http://${config.services.grafana.addr}:${toString config.services.grafana.port}/";
48
};
49
};
50
@@ -56,7 +52,7 @@ in {
52
enable = true;
53
extraFlags = [
54
"--storage.tsdb.retention=${toString (150 * 24)}h"
59
- "--web.external-url=https://prometheus.nixos.org/"
55
+ "--web.external-url=https://monitoring.nixos.org/prometheus/"
56
];
57
58
alertmanagers = [
@@ -117,7 +113,7 @@ in {
113
expr = ''hydra_machine_build_duration_bucket{le="259200"} - ignoring(le) hydra_machine_build_duration_bucket{le="172800"} > 0'';
114
for = "30m";
115
labels.severity = "page";
120
- annotations.summary = "https://grafana.nixos.org/d/j0hJAY1Wk/in-progress-build-duration-heatmap";
116
+ annotations.summary = "https://monitoring.nixos.org/grafana/d/j0hJAY1Wk/in-progress-build-duration-heatmap";
117
}
118
];
119
}
@@ -130,7 +126,7 @@ in {
126
expr = ''node_filesystem_files_free{mountpoint="/"} <= 10000'';
127
for = "30m";
128
labels.severity = "page";
133
- annotations.summary = "https://grafana.nixos.org/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
129
+ annotations.summary = "https://monitoring.nixos.org/grafana/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
130
}
131
132
{
@@ -138,7 +134,7 @@ in {
134
expr = ''node_filesystem_avail_bytes{mountpoint="/"} <= 10000000000'';
135
for = "30m";
136
labels.severity = "page";
141
- annotations.summary = "https://grafana.nixos.org/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
137
+ annotations.summary = "https://monitoring.nixos.org/grafana/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
138
}
139
];
140
}
@@ -151,13 +147,13 @@ in {
147
expr = ''node_systemd_unit_state{name=~"^rfc39-sync.service$", state="failed"} == 1'';
148
for = "30m";
149
labels.severity = "page";
154
- annotations.summary = "https://grafana.nixos.org/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
150
+ annotations.summary = "https://monitoring.nixos.org/grafana/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
151
}
152
{
153
alert = "ChannelUpdateStuck";
154
expr = ''max_over_time(node_systemd_unit_state{name=~"^update-nix.*.service$",state=~"failed"}[5m]) == 1'';
155
for = "30m";
160
- annotations.summary = "https://grafana.nixos.org/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
156
+ annotations.summary = "https://monitoring.nixos.org/grafana/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
157
}
158
];
159
}
@@ -314,7 +310,7 @@ in {
310
static_configs = [
311
{
312
targets = [
317
- "prometheus.nixos.org:9200"
313
+ "monitoring.nixos.org:9200"
314
];
315
}
316
];
@@ -412,8 +408,8 @@ in {
408
auth.anonymous.enable = true;
409
users.allowSignUp = true;
410
addr = "0.0.0.0";
415
- domain = "grafana.nixos.org";
416
- rootUrl = "https://grafana.nixos.org/";
411
+ domain = "monitoring.nixos.org";
412
+ rootUrl = "https://monitoring.nixos.org/grafana/";
413
};
414
415
systemd.services.prometheus-hydra-exporter = {
delft/eris/alertmanager-irc-forwarder.nix
+1
-1
@@ -21,7 +21,7 @@
21
22
environment = {
23
FLASK_APP = ./prometheus-alertmanager-irc-notifier.py;
24
- EXTERNAL_URL = "https://prometheus.nixos.org/alerts";
24
+ EXTERNAL_URL = "https://monitoring.nixos.org/prometheus/alerts";
25
};
26
27
serviceConfig = {
ngi0/hydra/hydra.nix
+1
-1
@@ -29,7 +29,7 @@ in
29
# patchelf:master:3
30
xxx-jobset-repeats = nixos:reproducibility:1
31
32
- # https://prometheus.nixos.org/graph?g0.range_input=2w&g0.expr=hydra_memory_tokens_in_use&g0.tab=0
32
+ # https://monitoring.nixos.org/prometheus/graph?g0.range_input=2w&g0.expr=hydra_memory_tokens_in_use&g0.tab=0
33
nar_buffer_size = ${let gb = 8; in toString (gb * 1024 * 1024 * 1024)}
34
35
#upload_logs_to_binary_cache = true