Skip to content

Commit

Permalink
removing status.nixos.org
Browse files Browse the repository at this point in the history 
also:
- status.nixos.org/prometheus -> prometheus.nixos.org
- status.nixos.org/grafana -> grafana.nixos.org
  • Loading branch information
@garbas
garbas committed Dec 3, 2020
1 parent b3ad8c9 commit a3f9083
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 410 deletions.
44 changes: 22 additions & 22 deletions delft/apache-errors/503.html
View file
Expand Up @@ -2,28 +2,28 @@

<html>

<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Hydra is down</title>
<style type="text/css" media="screen">
body {
font-family: Helvetica, Arial, sans-serif;
color: rgba(0, 0, 0, 0.7);
}
</style>
</head>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Hydra is down</title>
<style type="text/css" media="screen">
body {
font-family: Helvetica, Arial, sans-serif;
color: rgba(0, 0, 0, 0.7);
}
</style>
</head>

<body>
<center>
<img src="/apache-errors/warning.png" alt="Warning" />
<p>Looks like Hydra is having some problems. Sorry about that!</p>
<p style="font-size: 90%;">
<a href="https://nixos.org/">NixOS Homepage</a> |
<a href="https://status.nixos.org/prometheus/alerts">System Alerts</a> |
<a href="https://status.nixos.org/grafana/">Dashboards</a> |
<a href="https://github.com/NixOS/nixpkgs/labels/infrastructure">Related Issues</a>
</p>
</center>
</body>
<body>
<center>
<img src="/apache-errors/warning.png" alt="Warning" />
<p>Looks like Hydra is having some problems. Sorry about that!</p>
<p style="font-size: 90%;">
<a href="https://nixos.org/">NixOS Homepage</a> |
<a href="https://prometheus.nixos.org/alerts">System Alerts</a> |
<a href="https://grafana.nixos.org/">Dashboards</a> |

This comment has been minimized.

Sign in to view

Copy link
@grahamc

grahamc Dec 3, 2020

Member

I don't think it is a good idea to have a subdomain per tool like this. Maybe monitoring.nixos.org/grafana?
<a href="https://github.com/NixOS/nixpkgs/labels/infrastructure">Related Issues</a>
</p>
</center>
</body>

</html>
29 changes: 16 additions & 13 deletions delft/eris.nix
View file
Expand Up @@ -40,20 +40,23 @@ in {

services.nginx = {
enable = true;
virtualHosts."status.nixos.org" = {
virtualHosts."grafana.nixos.org" = {
enableACME = true;
forceSSL = true;
root = ./eris/status-page;
locations."/grafana/".proxyPass = "http://${config.services.grafana.addr}:${toString config.services.grafana.port}/";
locations."/prometheus".proxyPass = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}";
locations."/".proxyPass = "http://${config.services.grafana.addr}:${toString config.services.grafana.port}/";
};
virtualHosts."prometheus.nixos.org" = {
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}";
};
};

services.prometheus = {
enable = true;
extraFlags = [
"--storage.tsdb.retention=${toString (150 * 24)}h"
"--web.external-url=https://status.nixos.org/prometheus/"
"--web.external-url=https://prometheus.nixos.org/"
];

alertmanagers = [
Expand Down Expand Up @@ -114,7 +117,7 @@ in {
expr = ''hydra_machine_build_duration_bucket{le="259200"} - ignoring(le) hydra_machine_build_duration_bucket{le="172800"} > 0'';
for = "30m";
labels.severity = "page";
annotations.summary = "https://status.nixos.org/grafana/d/j0hJAY1Wk/in-progress-build-duration-heatmap";
annotations.summary = "https://grafana.nixos.org/d/j0hJAY1Wk/in-progress-build-duration-heatmap";
}
];
}
Expand All @@ -127,15 +130,15 @@ in {
expr = ''node_filesystem_files_free{mountpoint="/"} <= 10000'';
for = "30m";
labels.severity = "page";
annotations.summary = "https://status.nixos.org/grafana/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
annotations.summary = "https://grafana.nixos.org/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
}

{
alert = "RootPartitionLowDiskSpace";
expr = ''node_filesystem_avail_bytes{mountpoint="/"} <= 10000000000'';
for = "30m";
labels.severity = "page";
annotations.summary = "https://status.nixos.org/grafana/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
annotations.summary = "https://grafana.nixos.org/d/5LANB9pZk/per-instance-metrics?orgId=1&refresh=30s&var-instance={{ $labels.instance }}";
}
];
}
Expand All @@ -148,13 +151,13 @@ in {
expr = ''node_systemd_unit_state{name=~"^rfc39-sync.service$", state="failed"} == 1'';
for = "30m";
labels.severity = "page";
annotations.summary = "https://status.nixos.org/grafana/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
annotations.summary = "https://grafana.nixos.org/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
}
{
alert = "ChannelUpdateStuck";
expr = ''max_over_time(node_systemd_unit_state{name=~"^update-nix.*.service$",state=~"failed"}[5m]) == 1'';
for = "30m";
annotations.summary = "https://status.nixos.org/grafana/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
annotations.summary = "https://grafana.nixos.org/d/fBW4tL1Wz/scheduled-task-state-channels-website?orgId=1&refresh=10s";
}
];
}
Expand Down Expand Up @@ -311,7 +314,7 @@ in {
static_configs = [
{
targets = [
"status.nixos.org:9200"
"prometheus.nixos.org:9200"
];
}
];
Expand Down Expand Up @@ -409,8 +412,8 @@ in {
auth.anonymous.enable = true;
users.allowSignUp = true;
addr = "0.0.0.0";
domain = "status.nixos.org";
rootUrl = "https://status.nixos.org/grafana/";
domain = "grafana.nixos.org";
rootUrl = "https://grafana.nixos.org/";
};

systemd.services.prometheus-hydra-exporter = {
Expand Down
4 changes: 2 additions & 2 deletions delft/eris/alertmanager-irc-forwarder.nix
View file
Expand Up @@ -21,7 +21,7 @@

environment = {
FLASK_APP = ./prometheus-alertmanager-irc-notifier.py;
EXTERNAL_URL = "https://status.nixos.org/prometheus/alerts";
EXTERNAL_URL = "https://prometheus.nixos.org/alerts";
};

serviceConfig = {
Expand All @@ -30,4 +30,4 @@
EnvironmentFile = "/run/keys/alertmanager-irc-forwarder.env";
};
};
}
}
87 changes: 0 additions & 87 deletions delft/eris/status-page/index.html
View file

This file was deleted.

45 changes: 0 additions & 45 deletions delft/eris/status-page/status.css
View file

This file was deleted.

0 comments on commit a3f9083

Please sign in to comment.