From b312ba0c75740694e4cb76ef99e1a27dcc327d42 Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pablo@gitlab.com>
Date: Tue, 20 Jun 2017 14:06:03 +0200
Subject: [PATCH 1/6] Add themes (embedded in) to production engineers
---
data/team.yml | 12 ++++++++++++
source/includes/team/member.html.haml | 3 +++
source/team.json.haml | 1 +
3 files changed, 16 insertions(+)
diff --git a/data/team.yml b/data/team.yml
index ea90c2fc65b..64213fced8f 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -632,6 +632,9 @@
picture: pablo.jpg
twitter: psczg
gitlab: pcarranza
+ projects:
+ infrastructure: maintainer
+ gitlab-cog: maintainer
expertise: |
<li>On-call hero!</li>
story: |
@@ -2004,8 +2007,12 @@
picture: daniele.jpg
twitter: escociao
gitlab: omame
+ embedded_in: Cloud Native Build
expertise: |
+ <li>On Call Hero!</li>
<li>Deployment Expert</li>
+ <li>Terraform Expert</li>
+ <li>Cloud Native Expert</li>
story: |
Daniele fell in love with computers when he started to use a Vic 20 very early in his life and never looked back.
In his teenage years he replaced lego with pc components and suddenly his room became a messy computer lab.
@@ -2306,6 +2313,7 @@
reports_to: Production Lead
picture: jtevnan.jpg
gitlab: jtevnan
+ embedded_in: Database
story: |
Jason made his way into IT via the detour of studying metallurgy. After discovering that he understood database query plans much better than the periodic table, he switched majors and never looked back. When not attempting to automate everything, he is an avid cook, tries to be outdoors as much as he can and attempts to brew the perfect beer.
@@ -2342,6 +2350,7 @@
picture: ilya.png
twitter:
gitlab: ilyaf
+ embedded_in: Security
story: |
Ilya is a self-taught UNIX System Administrator with strong interest in computer security. In those rare occasions when he's not
configuring something, he enjoys a company of a good book.
@@ -2479,6 +2488,9 @@
reports_to: Production Lead
picture: victorlopez.jpg
gitlab: victorcete
+ embedded_in: Search
+ expertise: |
+ <li>Elastic Search Expert</li>
story: |
Victor is a technology enthusiast and a very passionate systems administrator.
He enjoys all around automation, monitoring and development of tools that help everyone
diff --git a/source/includes/team/member.html.haml b/source/includes/team/member.html.haml
index f2a40fe11e7..d811caf4c18 100644
--- a/source/includes/team/member.html.haml
+++ b/source/includes/team/member.html.haml
@@ -41,6 +41,9 @@
- if member.expertise
%ul
= member.expertise
+ - if member.embedded_in
+ Embedded in
+ = member.embedded_in
.social
- if member.twitter
diff --git a/source/team.json.haml b/source/team.json.haml
index e4ecef10fe6..2582333b710 100644
--- a/source/team.json.haml
+++ b/source/team.json.haml
@@ -1,4 +1,5 @@
- team_array = []
+<li>Cloud Native
- team = data.team.reject { |t| t.picture == 'logo-extra-whitespace.png' }
- team.each do |member|
- team_array << { picture: image_path("team/#{member.picture}") }
--
GitLab
From 2d741f49909523bb5e8957b20c098bf3262e9cbe Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pablo@gitlab.com>
Date: Wed, 21 Jun 2017 13:40:52 +0200
Subject: [PATCH 2/6] Changed from embedded_in to embedded_with
---
data/team.yml | 14 +++++++++-----
source/includes/team/member.html.haml | 9 ++++++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/data/team.yml b/data/team.yml
index 64213fced8f..3bc95191426 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -2007,7 +2007,8 @@
picture: daniele.jpg
twitter: escociao
gitlab: omame
- embedded_in: Cloud Native Build
+ embedded_with: |
+ <li>Cloud Native Build</li>
expertise: |
<li>On Call Hero!</li>
<li>Deployment Expert</li>
@@ -2313,7 +2314,8 @@
reports_to: Production Lead
picture: jtevnan.jpg
gitlab: jtevnan
- embedded_in: Database
+ embedded_with: |
+ <li>Database</li>
story: |
Jason made his way into IT via the detour of studying metallurgy. After discovering that he understood database query plans much better than the periodic table, he switched majors and never looked back. When not attempting to automate everything, he is an avid cook, tries to be outdoors as much as he can and attempts to brew the perfect beer.
@@ -2350,7 +2352,8 @@
picture: ilya.png
twitter:
gitlab: ilyaf
- embedded_in: Security
+ embedded_with: |
+ <li>Security</li>
story: |
Ilya is a self-taught UNIX System Administrator with strong interest in computer security. In those rare occasions when he's not
configuring something, he enjoys a company of a good book.
@@ -2488,9 +2491,10 @@
reports_to: Production Lead
picture: victorlopez.jpg
gitlab: victorcete
- embedded_in: Search
+ embedded_with: |
+ <li>Search</li>
expertise: |
- <li>Elastic Search Expert</li>
+ <li>Elastic Search Expert</li>
story: |
Victor is a technology enthusiast and a very passionate systems administrator.
He enjoys all around automation, monitoring and development of tools that help everyone
diff --git a/source/includes/team/member.html.haml b/source/includes/team/member.html.haml
index d811caf4c18..5cdaecefe29 100644
--- a/source/includes/team/member.html.haml
+++ b/source/includes/team/member.html.haml
@@ -41,9 +41,12 @@
- if member.expertise
%ul
= member.expertise
- - if member.embedded_in
- Embedded in
- = member.embedded_in
+
+ .embedded_with
+ - if member.embedded_with
+ Embedded With
+ %ul
+ = member.embedded_with
.social
- if member.twitter
--
GitLab
From 8427c29f8590e20d5c98fcb05af35528c3a97f80 Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pablo@gitlab.com>
Date: Wed, 21 Jun 2017 15:07:38 +0200
Subject: [PATCH 3/6] Add node of what embedded with means
---
source/handbook/infrastructure/index.html.md | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/source/handbook/infrastructure/index.html.md b/source/handbook/infrastructure/index.html.md
index 7af4efda640..607c77d0cab 100644
--- a/source/handbook/infrastructure/index.html.md
+++ b/source/handbook/infrastructure/index.html.md
@@ -46,7 +46,7 @@ infrastructure team works on
is in fact the first issue in the gitlab-ce issue tracker; for more on
pingdom see the [monitoring page](/handbook/infrastructure/monitoring/)),
measured per calendar month, and as recorded on
- [pingdom](http://stats.pingdom.com/81vpf8jyr1h9/1902794/history).
+ [pingdom](http://stats.pingdom.com/81vpf8jyr1h9/1902794/history).
1. GitLab.com's performance.
- Current goal: [99% of user requests < 1 second](https://performance.gitlab.net/dashboard/db/transaction-overview?panelId=2&fullscreen&orgId=1)
- Latency here is _currently_ measured via the "Transaction Timings"
@@ -80,6 +80,22 @@ work on the topics listed above, using the principles and methods of [Site
Reliability Engineering](https://landing.google.com/sre/book.html) a little bit
more each day.
+#### Production Engineers Embedded With
+
+Additionally, specific production engineers are work embedded with different
+teams.
+
+Production engineers that are _embedded with_ will:
+
+- Participate in team calls for the team that are embedded with.
+- Keep up to date with the general Production Engineering duties: issues, fires, on-call. In fact, those will still be your priority unless the Lead explicitly says otherwise.
+- be embedded with one or more teams at a time, it depends on the level of involvement that is needed.
+- report to the Production Lead and participate in the Production team meetings as part of the duties, bringing the context from the team embedded with.
+- Help the team embedded with spending time to make their feature set or service "production ready".
+
+Since in our case these things are mostly already in production, then it means that you work on making sure that post factum the feature set or service meets the requirements written in the production readiness review questionnaire.
+
+Including improving the runbooks and documentation, alerting, monitoring, coding for resiliency, etc. Being so good that any other member of the Production Team can tend to the feature set or service as well and the "embedment" stops. At that point we name you an expert in the respective service.
## Production and Staging Access
--
GitLab
From cd43064a6a5cc319d51d7f90eb2c123b135cbe6d Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pablo@gitlab.com>
Date: Wed, 21 Jun 2017 20:20:23 +0200
Subject: [PATCH 4/6] Removed bogus line
---
source/team.json.haml | 1 -
1 file changed, 1 deletion(-)
diff --git a/source/team.json.haml b/source/team.json.haml
index 2582333b710..e4ecef10fe6 100644
--- a/source/team.json.haml
+++ b/source/team.json.haml
@@ -1,5 +1,4 @@
- team_array = []
-<li>Cloud Native
- team = data.team.reject { |t| t.picture == 'logo-extra-whitespace.png' }
- team.each do |member|
- team_array << { picture: image_path("team/#{member.picture}") }
--
GitLab
From c901ac4d35b7af0952993eb230d71bac16095b49 Mon Sep 17 00:00:00 2001
From: ernstvn <ernst@gitlab.com>
Date: Wed, 21 Jun 2017 16:03:01 -0700
Subject: [PATCH 5/6] Edits to description of what it is to be embedded and
fixed typo
---
data/team.yml | 2 +-
source/handbook/infrastructure/index.html.md | 43 ++++++++++++--------
2 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/data/team.yml b/data/team.yml
index 3bc95191426..2a91f7f15f4 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -2494,7 +2494,7 @@
embedded_with: |
<li>Search</li>
expertise: |
- <li>Elastic Search Expert</li>
+ <li>Elasticsearch Expert</li>
story: |
Victor is a technology enthusiast and a very passionate systems administrator.
He enjoys all around automation, monitoring and development of tools that help everyone
diff --git a/source/handbook/infrastructure/index.html.md b/source/handbook/infrastructure/index.html.md
index 607c77d0cab..504436b6bf5 100644
--- a/source/handbook/infrastructure/index.html.md
+++ b/source/handbook/infrastructure/index.html.md
@@ -80,22 +80,33 @@ work on the topics listed above, using the principles and methods of [Site
Reliability Engineering](https://landing.google.com/sre/book.html) a little bit
more each day.
-#### Production Engineers Embedded With
-
-Additionally, specific production engineers are work embedded with different
-teams.
-
-Production engineers that are _embedded with_ will:
-
-- Participate in team calls for the team that are embedded with.
-- Keep up to date with the general Production Engineering duties: issues, fires, on-call. In fact, those will still be your priority unless the Lead explicitly says otherwise.
-- be embedded with one or more teams at a time, it depends on the level of involvement that is needed.
-- report to the Production Lead and participate in the Production team meetings as part of the duties, bringing the context from the team embedded with.
-- Help the team embedded with spending time to make their feature set or service "production ready".
-
-Since in our case these things are mostly already in production, then it means that you work on making sure that post factum the feature set or service meets the requirements written in the production readiness review questionnaire.
-
-Including improving the runbooks and documentation, alerting, monitoring, coding for resiliency, etc. Being so good that any other member of the Production Team can tend to the feature set or service as well and the "embedment" stops. At that point we name you an expert in the respective service.
+#### Embedded Production Engineers
+
+Additionally, specific production engineers can be "embedded" with one or multiple
+different teams for anything from a few weeks to months.
+
+If you are an "embedded" Production Engineers, then you are expected to:
+
+- Participate in team calls for the team that you are embedded with.
+- Keep up to date with the general Production Engineering team and duties:
+ - Take care of issues, fires, and on-call. In fact, those will still be your
+priority unless the Lead explicitly says otherwise.
+ - Continue to report to the Production Lead and participate in the Production
+ team meetings.
+ - Share the context of the team you are embedded with, with the rest of the
+ Production Team.
+- Help the team that you are embedded with to make their feature set or service
+ "production ready".
+
+Since at GitLab most "feature sets or services" are mostly already in
+production, then it means that you work on making sure that the feature set or
+service _post factum_ meets the requirements for Production Readiness [TODO: add
+link to production readiness review questionnaire]. This will typically involve
+improving the runbooks and documentation, alerting, monitoring, coding for
+resiliency, etc. By the time you are done, any other member of the Production
+Team should be able to tend to the feature set or service in production as well
+as you can, and the "embedment" stops. At that point you should be listed as an
+expert in the respective service.
## Production and Staging Access
--
GitLab
From 5db72282d91819c60b936f0da60000e30f5b39d8 Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pablo@gitlab.com>
Date: Thu, 22 Jun 2017 13:51:44 +0200
Subject: [PATCH 6/6] Add infrastructure as a project and some changes to the
team
---
data/projects.yml | 7 +++++++
data/team.yml | 9 ++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/data/projects.yml b/data/projects.yml
index 19b8225d1ea..5668b1a082c 100644
--- a/data/projects.yml
+++ b/data/projects.yml
@@ -73,6 +73,13 @@ gitlab-com-runbooks:
Describes system components, triage procedures, and commands to use in scenarios commonly faced
by Gitlab.com production support engineers
+infrastructure:
+ name: Gitlab.com - infrastructure issue tracker
+ path: gitlab-com/infrastructure
+ link: https://gitlab.com/gitlab-com/infrastructure
+ description: |
+ Used to track the infrastructure work of GitLab.com itself
+
gitlab-cookbooks:
name: Gitlab.com - infrastructure node provisioning by role
path: gitlab-cookbooks
diff --git a/data/team.yml b/data/team.yml
index eb4a17ed4d4..1865f506858 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -634,7 +634,8 @@
gitlab: pcarranza
projects:
infrastructure: maintainer
- gitlab-cog: maintainer
+ gitlab-com-runbooks: maintainer
+ gitlab-cookbooks: maintainer
expertise: |
<li>On-call hero!</li>
story: |
@@ -2012,6 +2013,8 @@
reports_to: Production Lead
picture: daniele.jpg
twitter: escociao
+ projects:
+ gitlab-com-infrastructure: maintainer
gitlab: omame
embedded_with: |
<li>Cloud Native Build</li>
@@ -2320,8 +2323,12 @@
reports_to: Production Lead
picture: jtevnan.jpg
gitlab: jtevnan
+ projects:
+ gitlab-cookbooks: maintainer
embedded_with: |
<li>Database</li>
+ expertise: |
+ <li>On-call hero!</li>
story: |
Jason made his way into IT via the detour of studying metallurgy. After discovering that he understood database query plans much better than the periodic table, he switched majors and never looked back. When not attempting to automate everything, he is an avid cook, tries to be outdoors as much as he can and attempts to brew the perfect beer.
--
GitLab