Skip to content

Commit 2a69016

Browse files
authored
Merge pull request #426 from jdno/onboard-oncall-team
Onboard crates.io on-call team to Datadog
2 parents 4a43cc4 + 5f0a344 commit 2a69016

File tree

3 files changed

+77
-2
lines changed

3 files changed

+77
-2
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
locals {
2+
crates_io_oncall = {
3+
"andrei_listochkin" = local.users.andrei_listochkin
4+
"felix_gilcher" = local.users.felix_gilcher
5+
"florian_gilcher" = local.users.florian_gilcher
6+
"pietro_albini" = local.users.pietro_albini
7+
"sebastian_ziebell" = local.users.sebastian_ziebell
8+
"thepang_mbambo" = local.users.tshepang_mbambo
9+
}
10+
}
11+
12+
resource "datadog_role" "crates_io_oncall" {
13+
name = "crates.io on-call"
14+
15+
dynamic "permission" {
16+
for_each = toset([
17+
data.datadog_permissions.all.permissions.logs_read_index_data,
18+
data.datadog_permissions.all.permissions.logs_read_data,
19+
data.datadog_permissions.all.permissions.logs_live_tail,
20+
])
21+
22+
content {
23+
id = permission.value
24+
}
25+
}
26+
}
27+
28+
resource "datadog_team" "crates_io_oncall" {
29+
name = "crates.io on-call"
30+
description = "The on-call team for crates.io"
31+
handle = "crates-io-oncall"
32+
}
33+
34+
resource "datadog_team_membership" "crates_io_oncall" {
35+
for_each = local.crates_io_oncall
36+
37+
team_id = datadog_team.crates_io_oncall.id
38+
user_id = datadog_user.users[each.key].id
39+
}

terraform/team-members-datadog/crates-io.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
locals {
22
crates_io = {
3-
"adam" = local.users.adam
4-
"tobias" = local.users.tobias
3+
"adam" = local.users.adam
4+
"carol" = local.users.carols10cents
5+
"jtgeibel" = local.users.jtgeibel
6+
"tobias" = local.users.tobias
57
}
68
}
79

@@ -16,6 +18,7 @@ resource "datadog_role" "crates_io" {
1618
data.datadog_permissions.all.permissions.logs_write_pipelines,
1719
data.datadog_permissions.all.permissions.logs_write_processors,
1820
data.datadog_permissions.all.permissions.logs_read_archives,
21+
data.datadog_permissions.all.permissions.logs_write_processors,
1922
data.datadog_permissions.all.permissions.dashboards_write,
2023
])
2124

terraform/team-members-datadog/users.tf

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@ locals {
88
login = "admin@rust-lang.org"
99
name = "Rust Admin"
1010
}
11+
"andrei_listochkin" = {
12+
login = "andrei.listochkin@ferrous-systems.com"
13+
name = "Andrei Listochkin"
14+
}
15+
"carols10cents" = {
16+
login = "carol.nichols@gmail.com"
17+
name = "Carol Nichols"
18+
}
19+
"felix_gilcher" = {
20+
login = "felix.gilcher@ferrous-systems.com"
21+
name = "Felix Gilcher"
22+
}
23+
"florian_gilcher" = {
24+
login = "florian.gilcher@ferrous-systems.com"
25+
name = "Florian Gilcher"
26+
}
1127
"jakub" = {
1228
login = "berykubik@gmail.com"
1329
name = "Jakub Beránek"
@@ -20,6 +36,10 @@ locals {
2036
login = "joelmarcey@rustfoundation.org"
2137
name = "Joel Marcey"
2238
}
39+
"jtgeibel" = {
40+
login = "jtgeibel@gmail.com"
41+
name = "Justin Geibel"
42+
}
2343
"mark" = {
2444
login = "mark.simulacrum@gmail.com"
2545
name = "Mark Rousskov"
@@ -40,10 +60,18 @@ locals {
4060
login = "pietro@pietroalbini.org"
4161
name = "Pietro Albini"
4262
}
63+
"pietro_albini" = {
64+
login = "pietro.albini@ferrous-systems.com"
65+
name = "Pietro Albini"
66+
}
4367
"rustfoundation" = {
4468
login = "infra@rustfoundation.org"
4569
name = "Rust Foundation Infrastructure"
4670
}
71+
"sebastian_ziebell" = {
72+
login = "sebastian.ziebell@ferrous-systems.com"
73+
name = "Sebastian Ziebell"
74+
}
4775
"seth" = {
4876
login = "smarkle.aws@gmail.com"
4977
name = "Seth Markle"
@@ -52,6 +80,10 @@ locals {
5280
login = "tobiasbieniek@rustfoundation.org"
5381
name = "Tobias Bieniek"
5482
}
83+
"tshepang_mbambo" = {
84+
login = "tshepang.mbambo@ferrous-systems.com"
85+
name = "Tshepang Mbambo"
86+
}
5587
"walter" = {
5688
login = "walterpearce@rustfoundation.org"
5789
name = "Walter Pearce"
@@ -71,6 +103,7 @@ locals {
71103
_do_not_use_all_teams = [
72104
{ for name, user in local.crater : name => merge(user, { roles = [datadog_role.crater.name] }) },
73105
{ for name, user in local.crates_io : name => merge(user, { roles = [datadog_role.crates_io.name] }) },
106+
{ for name, user in local.crates_io_oncall : name => merge(user, { roles = [datadog_role.crates_io_oncall.name] }) },
74107
{ for name, user in local.foundation : name => merge(user, { roles = [datadog_role.foundation.name] }) },
75108
{ for name, user in local.foundation_board : name => merge(user, { roles = [datadog_role.board_member.name] }) },
76109
{ for name, user in local.infra : name => merge(user, { roles = [datadog_role.infra.name] }) },

0 commit comments

Comments
 (0)