Skip to content

Commit 22c1709

Browse files
committed
Revert "Moving infra-agent canaries to sandbox account (#36)"
This reverts commit f31a62c.
1 parent d303a6b commit 22c1709

File tree

1 file changed

+73
-86
lines changed

1 file changed

+73
-86
lines changed

terraform/otel-ec2/vars.tf

Lines changed: 73 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ variable "ec2_otels" {
6969
default = {
7070
"amd64:ubuntu24.04" = {
7171
ami = "ami-09040d770ffe2224f"
72-
subnet = "subnet-0c2046d7a0595aa2c"
73-
security_groups = ["sg-075f379cc5612e984"]
72+
subnet = "subnet-09b64de757828cdd4"
73+
security_groups = ["sg-044ef7bc34691164a"]
7474
key_name = "caos-dev-arm"
7575
instance_type = "t3a.small"
7676
username = "ubuntu"
@@ -82,8 +82,8 @@ variable "ec2_otels" {
8282
}
8383
"arm64:ubuntu24.04" = {
8484
ami = "ami-0acb327475c6fd498"
85-
subnet = "subnet-0c2046d7a0595aa2c"
86-
security_groups = ["sg-075f379cc5612e984"]
85+
subnet = "subnet-09b64de757828cdd4"
86+
security_groups = ["sg-044ef7bc34691164a"]
8787
key_name = "caos-dev-arm"
8888
instance_type = "t4g.small"
8989
username = "ubuntu"
@@ -95,8 +95,8 @@ variable "ec2_otels" {
9595
}
9696
"amd64:ubuntu22.04" = {
9797
ami = "ami-0aeb7c931a5a61206"
98-
subnet = "subnet-0c2046d7a0595aa2c"
99-
security_groups = ["sg-075f379cc5612e984"]
98+
subnet = "subnet-09b64de757828cdd4"
99+
security_groups = ["sg-044ef7bc34691164a"]
100100
key_name = "caos-dev-arm"
101101
instance_type = "t3a.small"
102102
username = "ubuntu"
@@ -108,8 +108,8 @@ variable "ec2_otels" {
108108
}
109109
"arm64:ubuntu22.04" = {
110110
ami = "ami-0717cbd2f49a61ed0"
111-
subnet = "subnet-0c2046d7a0595aa2c"
112-
security_groups = ["sg-075f379cc5612e984"]
111+
subnet = "subnet-09b64de757828cdd4"
112+
security_groups = ["sg-044ef7bc34691164a"]
113113
key_name = "caos-dev-arm"
114114
instance_type = "t4g.small"
115115
username = "ubuntu"
@@ -120,9 +120,9 @@ variable "ec2_otels" {
120120
}
121121
}
122122
"amd64:centos-stream" = {
123-
ami = "ami-0066ed1647780b41f"
124-
subnet = "subnet-0c2046d7a0595aa2c"
125-
security_groups = ["sg-075f379cc5612e984"]
123+
ami = "ami-01529018e3919dace"
124+
subnet = "subnet-09b64de757828cdd4"
125+
security_groups = ["sg-044ef7bc34691164a"]
126126
key_name = "caos-dev-arm"
127127
instance_type = "t3a.small"
128128
username = "ec2-user"
@@ -133,9 +133,9 @@ variable "ec2_otels" {
133133
}
134134
}
135135
"arm64:centos-stream" = {
136-
ami = "ami-00c97145c04ff4c85"
137-
subnet = "subnet-0c2046d7a0595aa2c"
138-
security_groups = ["sg-075f379cc5612e984"]
136+
ami = "ami-0e98f9d5c9841c9ad"
137+
subnet = "subnet-09b64de757828cdd4"
138+
security_groups = ["sg-044ef7bc34691164a"]
139139
key_name = "caos-dev-arm"
140140
instance_type = "t4g.small"
141141
username = "ec2-user"
@@ -147,8 +147,8 @@ variable "ec2_otels" {
147147
}
148148
"amd64:sles-12.5" = {
149149
ami = "ami-0314425a95f19ff16"
150-
subnet = "subnet-0c2046d7a0595aa2c"
151-
security_groups = ["sg-075f379cc5612e984"]
150+
subnet = "subnet-09b64de757828cdd4"
151+
security_groups = ["sg-044ef7bc34691164a"]
152152
key_name = "caos-dev-arm"
153153
instance_type = "t3a.small"
154154
username = "ec2-user"
@@ -160,8 +160,8 @@ variable "ec2_otels" {
160160
}
161161
"amd64:sles-15.2" = {
162162
ami = "ami-0e44499c443e91acd"
163-
subnet = "subnet-0c2046d7a0595aa2c"
164-
security_groups = ["sg-075f379cc5612e984"]
163+
subnet = "subnet-09b64de757828cdd4"
164+
security_groups = ["sg-044ef7bc34691164a"]
165165
key_name = "caos-dev-arm"
166166
instance_type = "t3a.small"
167167
username = "ec2-user"
@@ -172,9 +172,9 @@ variable "ec2_otels" {
172172
}
173173
}
174174
"amd64:sles-15.3" = {
175-
ami = "ami-0b7b425050b12e3f9"
176-
subnet = "subnet-0c2046d7a0595aa2c"
177-
security_groups = ["sg-075f379cc5612e984"]
175+
ami = "ami-0446c700e1dc61753"
176+
subnet = "subnet-09b64de757828cdd4"
177+
security_groups = ["sg-044ef7bc34691164a"]
178178
key_name = "caos-dev-arm"
179179
instance_type = "t3a.small"
180180
username = "ec2-user"
@@ -186,8 +186,8 @@ variable "ec2_otels" {
186186
}
187187
"amd64:sles-15.4" = {
188188
ami = "ami-0baf7d00b43fd908d"
189-
subnet = "subnet-0c2046d7a0595aa2c"
190-
security_groups = ["sg-075f379cc5612e984"]
189+
subnet = "subnet-09b64de757828cdd4"
190+
security_groups = ["sg-044ef7bc34691164a"]
191191
key_name = "caos-dev-arm"
192192
instance_type = "t3a.small"
193193
username = "ec2-user"
@@ -198,9 +198,9 @@ variable "ec2_otels" {
198198
}
199199
}
200200
"arm64:sles-15.4" = {
201-
ami = "ami-0e7c79c3442262e35"
202-
subnet = "subnet-0c2046d7a0595aa2c"
203-
security_groups = ["sg-075f379cc5612e984"]
201+
ami = "ami-052fd3067d337faf6"
202+
subnet = "subnet-09b64de757828cdd4"
203+
security_groups = ["sg-044ef7bc34691164a"]
204204
key_name = "caos-dev-arm"
205205
instance_type = "t4g.small"
206206
username = "ec2-user"
@@ -211,9 +211,9 @@ variable "ec2_otels" {
211211
}
212212
}
213213
"amd64:sles-15.5" = {
214-
ami = "ami-04504b468e262a288"
215-
subnet = "subnet-0c2046d7a0595aa2c"
216-
security_groups = ["sg-075f379cc5612e984"]
214+
ami = "ami-0e03a27c1453107db"
215+
subnet = "subnet-09b64de757828cdd4"
216+
security_groups = ["sg-044ef7bc34691164a"]
217217
key_name = "caos-dev-arm"
218218
instance_type = "t3a.small"
219219
username = "ec2-user"
@@ -225,8 +225,8 @@ variable "ec2_otels" {
225225
}
226226
"amd64:sles-15.6" = {
227227
ami = "ami-0a752653199c4fce6"
228-
subnet = "subnet-0c2046d7a0595aa2c"
229-
security_groups = ["sg-075f379cc5612e984"]
228+
subnet = "subnet-09b64de757828cdd4"
229+
security_groups = ["sg-044ef7bc34691164a"]
230230
key_name = "caos-dev-arm"
231231
instance_type = "t3a.small"
232232
username = "ec2-user"
@@ -237,9 +237,9 @@ variable "ec2_otels" {
237237
}
238238
}
239239
"arm64:sles-15.5" = {
240-
ami = "ami-012bb28fd7e331024"
241-
subnet = "subnet-0c2046d7a0595aa2c"
242-
security_groups = ["sg-075f379cc5612e984"]
240+
ami = "ami-046216af2ce255621"
241+
subnet = "subnet-09b64de757828cdd4"
242+
security_groups = ["sg-044ef7bc34691164a"]
243243
key_name = "caos-dev-arm"
244244
instance_type = "t4g.small"
245245
username = "ec2-user"
@@ -251,8 +251,8 @@ variable "ec2_otels" {
251251
}
252252
"arm64:sles-15.6" = {
253253
ami = "ami-0bce4f43ac4014da1"
254-
subnet = "subnet-0c2046d7a0595aa2c"
255-
security_groups = ["sg-075f379cc5612e984"]
254+
subnet = "subnet-09b64de757828cdd4"
255+
security_groups = ["sg-044ef7bc34691164a"]
256256
key_name = "caos-dev-arm"
257257
instance_type = "t4g.small"
258258
username = "ec2-user"
@@ -264,8 +264,8 @@ variable "ec2_otels" {
264264
}
265265
"amd64:redhat-8.4" = {
266266
ami = "ami-0ba62214afa52bec7"
267-
subnet = "subnet-0c2046d7a0595aa2c"
268-
security_groups = ["sg-075f379cc5612e984"]
267+
subnet = "subnet-09b64de757828cdd4"
268+
security_groups = ["sg-044ef7bc34691164a"]
269269
key_name = "caos-dev-arm"
270270
instance_type = "t3a.small"
271271
username = "ec2-user"
@@ -277,8 +277,8 @@ variable "ec2_otels" {
277277
}
278278
"amd64:redhat-9.0" = {
279279
ami = "ami-078cbc4c2d057c244"
280-
subnet = "subnet-0c2046d7a0595aa2c"
281-
security_groups = ["sg-075f379cc5612e984"]
280+
subnet = "subnet-09b64de757828cdd4"
281+
security_groups = ["sg-044ef7bc34691164a"]
282282
key_name = "caos-dev-arm"
283283
instance_type = "t3a.small"
284284
username = "ec2-user"
@@ -290,8 +290,8 @@ variable "ec2_otels" {
290290
}
291291
"arm64:redhat-9.0" = {
292292
ami = "ami-01089181b0aa3be51"
293-
subnet = "subnet-0c2046d7a0595aa2c"
294-
security_groups = ["sg-075f379cc5612e984"]
293+
subnet = "subnet-09b64de757828cdd4"
294+
security_groups = ["sg-044ef7bc34691164a"]
295295
key_name = "caos-dev-arm"
296296
instance_type = "t4g.small"
297297
username = "ec2-user"
@@ -303,8 +303,8 @@ variable "ec2_otels" {
303303
}
304304
"amd64:debian-bullseye" = {
305305
ami = "ami-08a0dab67e025361b"
306-
subnet = "subnet-0c2046d7a0595aa2c"
307-
security_groups = ["sg-075f379cc5612e984"]
306+
subnet = "subnet-09b64de757828cdd4"
307+
security_groups = ["sg-044ef7bc34691164a"]
308308
key_name = "caos-dev-arm"
309309
instance_type = "t3a.small"
310310
username = "admin"
@@ -316,8 +316,8 @@ variable "ec2_otels" {
316316
}
317317
"arm64:debian-bullseye" = {
318318
ami = "ami-03cabbbc935f5826f"
319-
subnet = "subnet-0c2046d7a0595aa2c"
320-
security_groups = ["sg-075f379cc5612e984"]
319+
subnet = "subnet-09b64de757828cdd4"
320+
security_groups = ["sg-044ef7bc34691164a"]
321321
key_name = "caos-dev-arm"
322322
instance_type = "t4g.small"
323323
username = "admin"
@@ -329,8 +329,8 @@ variable "ec2_otels" {
329329
}
330330
"amd64:debian-bookworm" = {
331331
ami = "ami-02e9e442f629e6834"
332-
subnet = "subnet-0c2046d7a0595aa2c"
333-
security_groups = ["sg-075f379cc5612e984"]
332+
subnet = "subnet-09b64de757828cdd4"
333+
security_groups = ["sg-044ef7bc34691164a"]
334334
key_name = "caos-dev-arm"
335335
instance_type = "t3a.small"
336336
username = "admin"
@@ -342,8 +342,8 @@ variable "ec2_otels" {
342342
}
343343
"arm64:debian-bookworm" = {
344344
ami = "ami-05f312273b2ebaf0b"
345-
subnet = "subnet-0c2046d7a0595aa2c"
346-
security_groups = ["sg-075f379cc5612e984"]
345+
subnet = "subnet-09b64de757828cdd4"
346+
security_groups = ["sg-044ef7bc34691164a"]
347347
key_name = "caos-dev-arm"
348348
instance_type = "t4g.small"
349349
username = "admin"
@@ -355,8 +355,8 @@ variable "ec2_otels" {
355355
}
356356
"amd64:al-2" = {
357357
ami = "ami-077e31c4939f6a2f3"
358-
subnet = "subnet-0c2046d7a0595aa2c"
359-
security_groups = ["sg-075f379cc5612e984"]
358+
subnet = "subnet-09b64de757828cdd4"
359+
security_groups = ["sg-044ef7bc34691164a"]
360360
key_name = "caos-dev-arm"
361361
instance_type = "t3a.small"
362362
username = "ec2-user"
@@ -368,8 +368,8 @@ variable "ec2_otels" {
368368
}
369369
"arm64:al-2" = {
370370
ami = "ami-07a3e3eda401f8caa"
371-
subnet = "subnet-0c2046d7a0595aa2c"
372-
security_groups = ["sg-075f379cc5612e984"]
371+
subnet = "subnet-09b64de757828cdd4"
372+
security_groups = ["sg-044ef7bc34691164a"]
373373
key_name = "caos-dev-arm"
374374
instance_type = "t4g.small"
375375
username = "ec2-user"
@@ -381,8 +381,8 @@ variable "ec2_otels" {
381381
}
382382
"amd64:al-2023" = {
383383
ami = "ami-0103f211a154d64a6"
384-
subnet = "subnet-0c2046d7a0595aa2c"
385-
security_groups = ["sg-075f379cc5612e984"]
384+
subnet = "subnet-09b64de757828cdd4"
385+
security_groups = ["sg-044ef7bc34691164a"]
386386
key_name = "caos-dev-arm"
387387
instance_type = "t3a.small"
388388
username = "ec2-user"
@@ -393,9 +393,9 @@ variable "ec2_otels" {
393393
}
394394
}
395395
"amd64:al-2023-fips" = {
396-
ami = "ami-0ec24135690b4ad82"
397-
subnet = "subnet-0c2046d7a0595aa2c"
398-
security_groups = ["sg-075f379cc5612e984"]
396+
ami = "ami-085fa628e46dcb929"
397+
subnet = "subnet-09b64de757828cdd4"
398+
security_groups = ["sg-044ef7bc34691164a"]
399399
key_name = "caos-dev-arm"
400400
instance_type = "t3a.small"
401401
username = "ec2-user"
@@ -407,8 +407,8 @@ variable "ec2_otels" {
407407
}
408408
"arm64:al-2023" = {
409409
ami = "ami-07d16074c2fdf3a19"
410-
subnet = "subnet-0c2046d7a0595aa2c"
411-
security_groups = ["sg-075f379cc5612e984"]
410+
subnet = "subnet-09b64de757828cdd4"
411+
security_groups = ["sg-044ef7bc34691164a"]
412412
key_name = "caos-dev-arm"
413413
instance_type = "t4g.small"
414414
username = "ec2-user"
@@ -419,9 +419,9 @@ variable "ec2_otels" {
419419
}
420420
}
421421
"arm64:al-2023-fips" = {
422-
ami = "ami-0edddf62c25da5c5e"
423-
subnet = "subnet-0c2046d7a0595aa2c"
424-
security_groups = ["sg-075f379cc5612e984"]
422+
ami = "ami-06014e12b8efb52e2"
423+
subnet = "subnet-09b64de757828cdd4"
424+
security_groups = ["sg-044ef7bc34691164a"]
425425
key_name = "caos-dev-arm"
426426
instance_type = "t4g.small"
427427
username = "ec2-user"
@@ -432,9 +432,9 @@ variable "ec2_otels" {
432432
}
433433
}
434434
"amd64:windows_2016" = {
435-
ami = "ami-0c465d57affbebd78"
436-
subnet = "subnet-0c2046d7a0595aa2c"
437-
security_groups = ["sg-075f379cc5612e984"]
435+
ami = "ami-03d46abfa414238dd"
436+
subnet = "subnet-09b64de757828cdd4"
437+
security_groups = ["sg-044ef7bc34691164a"]
438438
key_name = "caos-dev-arm"
439439
instance_type = "t3a.small"
440440
username = "ansible"
@@ -445,9 +445,9 @@ variable "ec2_otels" {
445445
}
446446
}
447447
"amd64:windows_2019" = {
448-
ami = "ami-08b20395242518494"
449-
subnet = "subnet-0c2046d7a0595aa2c"
450-
security_groups = ["sg-075f379cc5612e984"]
448+
ami = "ami-077e49a076b7e3847"
449+
subnet = "subnet-09b64de757828cdd4"
450+
security_groups = ["sg-044ef7bc34691164a"]
451451
key_name = "caos-dev-arm"
452452
instance_type = "t3a.small"
453453
username = "ansible"
@@ -458,22 +458,9 @@ variable "ec2_otels" {
458458
}
459459
}
460460
"amd64:windows_2022" = {
461-
ami = "ami-0feb3a0caad202bce"
462-
subnet = "subnet-0c2046d7a0595aa2c"
463-
security_groups = ["sg-075f379cc5612e984"]
464-
key_name = "caos-dev-arm"
465-
instance_type = "t3a.small"
466-
username = "ansible"
467-
platform = "windows"
468-
python = ""
469-
tags = {
470-
"otel_role" = "agent"
471-
}
472-
}
473-
"amd64:windows_2025" = {
474-
ami = "ami-059a9049ae7e40d51"
475-
subnet = "subnet-0c2046d7a0595aa2c"
476-
security_groups = ["sg-075f379cc5612e984"]
461+
ami = "ami-0780c2aa3485f2088"
462+
subnet = "subnet-09b64de757828cdd4"
463+
security_groups = ["sg-044ef7bc34691164a"]
477464
key_name = "caos-dev-arm"
478465
instance_type = "t3a.small"
479466
username = "ansible"

0 commit comments

Comments
 (0)