Add 2 more aarch64 nodes, update macOS IPs, improve prometheus monitoring
graham christensen committed
Dec 15, 2018 at 16:54 UTC
ba58d582dacc7f0c0d22051e69959a1e4aed2806
2 files changed
+60
-27
delft/eris.nix
+23
-4
@@ -10,6 +10,8 @@ in { deployment.targetEnv = "hetzner";
10
147.75.98.145 packet-t2-4
11
147.75.65.54 packet-t2a-1
12
147.75.79.198 packet-t2a-2
13
+ 147.75.198.170 packet-t2a-3
14
+ 147.75.111.30 packet-t2a-4
15
'' + (let
16
nums = lib.lists.range 1 9;
17
name = num: ''
@@ -46,13 +48,29 @@ in { deployment.targetEnv = "hetzner";
48
scrapeConfigs = [
49
{ job_name = "node";
50
static_configs = [
51
+ {
52
+ targets = [
53
+ "chef:9100"
54
+ ];
55
+ labels.role = "hydra";
56
+ }
57
{
58
targets = [
59
"packet-epyc-1:9100" "packet-t2-4:9100" "packet-t2a-1:9100"
52
- "packet-t2a-2:9100" "chef:9100"
53
- ]
54
- ++ (builtins.map (n: "mac${toString n}-host:6010") (lib.lists.range 1 9))
55
- ++ (builtins.map (n: "mac${toString n}-guest:6010") (lib.lists.range 1 9));
60
+ "packet-t2a-2:9100" "packet-t2a-3:9100" "packet-t2a-4:9100"
61
+ "chef:9100"
62
+ ];
63
+ labels.role = "builder";
64
+ }
65
+ {
66
+ targets = builtins.map (n: "mac${toString n}-host:6010") (lib.lists.range 1 9);
67
+ labels.mac = "host";
68
+ labels.role = "macos-hypervisor";
69
+ }
70
+ {
71
+ targets = builtins.map (n: "mac${toString n}-guest:6010") (lib.lists.range 1 9);
72
+ labels.mac = "guest";
73
+ labels.role = "builder";
74
}
75
];
76
}
@@ -73,6 +91,7 @@ in { deployment.targetEnv = "hetzner";
91
services.grafana = {
92
enable = true;
93
auth.anonymous.enable = true;
94
+ users.allowSignUp = true;
95
addr = "0.0.0.0";
96
domain = "status.nixos.org";
97
rootUrl = "https://status.nixos.org/grafana/";
delft/hydra.nix
+37
-23
@@ -82,48 +82,48 @@ in
82
ServerAliveInterval 120
83
TCPKeepAlive yes
84
85
- Host mac1
86
- Hostname 213.125.166.74
85
+ Host mac1-guest
86
+ Hostname 37.153.215.191
87
Port 6001
88
Compression yes
89
90
- Host mac2
90
+ Host mac2-guest
91
Hostname 37.153.215.191
92
Port 6002
93
Compression yes
94
95
- Host mac3
95
+ Host mac3-guest
96
Hostname 37.153.215.191
97
Port 6003
98
Compression yes
99
100
- Host mac4
101
- Hostname 213.125.166.74
100
+ Host mac4-guest
101
+ Hostname 37.153.215.191
102
Port 6004
103
Compression yes
104
105
- Host mac5
106
- Hostname 213.125.166.74
105
+ Host mac5-guest
106
+ Hostname 37.153.215.191
107
Port 6005
108
Compression yes
109
110
- Host mac6
110
+ Host mac6-guest
111
Hostname 37.153.215.191
112
Port 6006
113
Compression yes
114
115
- Host mac7
115
+ Host mac7-guest
116
Hostname 37.153.215.191
117
Port 6007
118
Compression yes
119
120
- Host mac8
121
- Hostname 213.125.166.74
120
+ Host mac8-guest
121
+ Hostname 37.153.215.191
122
Port 6008
123
Compression yes
124
125
- Host mac9
126
- Hostname 213.125.166.74
125
+ Host mac9-guest
126
+ Hostname 37.153.215.191
127
Port 6009
128
Compression yes
129
@@ -147,6 +147,14 @@ in
147
Hostname 147.75.79.198
148
Compression yes
149
150
+ Host packet-t2a-3
151
+ Hostname 147.75.198.170
152
+ Compression yes
153
+
154
+ Host packet-t2a-4
155
+ Hostname 147.75.111.30
156
+ Compression yes
157
+
158
Host packet-epyc-1
159
Hostname 147.75.198.47
160
Compression yes
@@ -155,15 +163,15 @@ in
163
services.openssh.knownHosts =
164
[
165
{ hostNames = [ "83.87.124.39" ]; publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVTkY4tQ6V29XTW1aKtoFJoF4uyaEy0fms3HqmI56av8UCg3MN5G6CL6EDIvbe46mBsI3++V3uGiOr0pLPbM9fkWC92LYGk5f7fNvCoy9bvuZy5bHwFQ5b5S9IJ1o3yDlCToc9CppmPVbFMMMLgKF06pQiGBeMCUG/VoCfiUBq+UgEGhAifWcuWIOGmdua6clljH5Dcc+7S0HTLoVtrxmPPXBVZUvW+lgAJTM6FXYIZiIqMSC2uZHGVstY87nPcZFXIbzhlYQqxx5H0um2bL3mbS7vdKhSsIWWaUZeck9ghNyUV1fVRLUhuXkQHe/8Z58cAhTv5dDd42YLB0fgjETV"; }
158
- { hostNames = [ "[213.125.166.74]:6001" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP7xnlcQ4Ymnl+Ewz+6Kmhz72bqBay6KydBx4wsScIYReX8QiqvPH2ozeyl6yQ8rsYC75Z/aPwNzLoemMBmaPzE= "; }
159
- { hostNames = [ "[37.153.215.191]:6002" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMIW/QHCa5004DddnUHgWCHLGnNBnTti7GFezhcO6ss5ZYwS7+xAeTlvB9PjPdc1Mgl8m4ZXMyZavrew/jVmAWM="; }
160
- { hostNames = [ "[37.153.215.191]:6003" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBI4Spb70BF3+J09YseyNRxREwlaVdgNcPpZAARQAk01qScfinGeoPZiUyunM5PGpYyTxE67+neGIFdr+DXS2f0w="; }
161
- { hostNames = [ "[213.125.166.74]:6004" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD2XQ+bjuEfNdFnpCcusD6JW5jT5qdepo2vKb4W5Pt9DdxwNuaIbzWNaiTmvip2lF+43oM274CeE7Do3XdeO1S0= "; }
162
- { hostNames = [ "[213.125.166.74]:6005" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNMoN47gtth42f4MCduo5QclW9dyW+R8GEQDb5m+w3h2soBtDvLLSokYemmyn/3vkbuswQcA8ZthsiqkHJS3pq8= "; }
163
- { hostNames = [ "[37.153.215.191]:6006" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCvvTr79TPi+3IS1s+x9524Gb8PtfKdfGTDroyyU0N5CrkxH/CEKbzh4yFguZdo1hh9tqZsweFTr89/H3tFIILo="; }
164
- { hostNames = [ "[37.153.215.191]:6007" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP5HdFzNXCNSRsdMA/6HUVTCWLDKV9vdtvcacbhlUXOdYNASTIAuU9E6fp3Zj5ATZAsJpffbLoy3YpMGcdW3jcg="; }
165
- { hostNames = [ "[213.125.166.74]:6008" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP5ip9sIKANIVux/aXG4lpUmlaMKqT+GgVEshJxC5ddi2glXkmo6v+VrRs3kTixat1jUHzaYM3mPU90JFJOrg+U= "; }
166
- { hostNames = [ "[213.125.166.74]:6009" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOa5gL7S5MBSsTBRh0eeJKK7qPmJj2o3cfI7bZBc9VQIcjHEkETxc7Bv9ap0rkThU2Skzx95YLyndq954cONH/Q= "; }
166
+
167
+ # (for i in $(seq 6000 6010); do ssh-keyscan -t ssh-ed25519 -p $i 37.153.215.191 2> /dev/null; done) | sed -e 's/^/ { hostNames = [ "/' -e 's/ ssh/" ]; publicKey = "ssh/' -e 's/$/"; }/'; echo
168
+ { hostNames = [ "[37.153.215.191]:6002" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJSLxndBO2SqMklTT4dWsv54CtKVMHDOhXl7v1tC38v"; }
169
+ { hostNames = [ "[37.153.215.191]:6003" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdzP9scGjJ31wwDJdcXcO4+wayvrHkFAefP/0I7UB0r"; }
170
+ { hostNames = [ "[37.153.215.191]:6004" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAaK44azT14aWHTE2fMYJFeJBTg1hQg2n2KAEgu8qlII"; }
171
+ { hostNames = [ "[37.153.215.191]:6005" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgJ2Mh0vkrBcIBcWgFoEPsYG9dyPOAUgL0GOhhBoRcD"; }
172
+ { hostNames = [ "[37.153.215.191]:6006" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICyjTqJsNioHUP0HMmGVfDpej9dCIQH0Bdn5aNbe8oYU"; }
173
+ { hostNames = [ "[37.153.215.191]:6008" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHJF0dXSTvZwWtPjN/iUBp2A5pHCPuOUVOvBkjXw+Eu"; }
174
+
175
{ hostNames = [ "208.78.106.251" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKrwg2592DfDUG1U0LZxJcBaT35YfEsuKo4helEAzeoujvzOo4DIaBrTCX7+LxcYZlGoi4WvsnwxUG11GY12l2A="; }
176
{ hostNames = [ "208.78.106.252" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLV1p6f6Rk3rKwNJbcqvG68wjfT3wPcJfChc1LFU9A3tTFslUDr47FHLmT+FTr+ChkoqD6Gsl+jtSnvkYnTlpGY="; }
177
{ hostNames = [ "hydra.ewi.tudelft.nl" "131.180.119.69" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIS6QYRKqOt9zfvFej4WWaswLE8Mhq7dOk8enWi/AzoK"; }
@@ -183,6 +191,12 @@ in
191
# packet-t2a-2
192
{ hostNames = [ "147.75.79.198" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCo+z5d8C6SpCyvC8KAPMAcMEtd5J74tRsk+7sm2KgD"; }
193
194
+ # packet-t2a-3
195
+ { hostNames = [ "147.75.198.170" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPieDw5aeaN88HMIye2t4tL6DBqgJwQbXH0PzPd0HOVl"; }
196
+
197
+ # packet-t2a-4
198
+ { hostNames = [ "147.75.111.30" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy1RCBg3iTzruHzYxHdy3KgTytZdmXgQPHjlB/ZjAQe"; }
199
+
200
# packet-epyc-1
201
{ hostNames = [ "147.75.198.47" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAt76Jw/xXqvYcrNZSa+BEfKfLCFyvY50LZJuGBWtJwx"; }
202