Merge branch 'jarv/new-beats' into 'master'

Jarv/new beats See merge request !381

Merge branch 'jarv/new-beats' into 'master'
Jarv/new beats See merge request !381
518c7757 · John Jarvis · 4dd83dd4 · 970c180e · 518c7757 · 518c7757
Commit 518c7757 authored May 24, 2018 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

environments/gprd/variables.tf environments/gprd/variables.tf +2 -2

environments/gstg/variables.tf environments/gstg/variables.tf +2 -2

No files found.
--- a/environments/gprd/variables.tf
+++ b/environments/gprd/variables.tf
@@ -113,8 +113,8 @@ variable "pubsubbeats" {
  type = "map"

  default = {
-    "names"         = ["gitaly", "haproxy", "pages", "postgres", "production", "system", "workhorse", "geo", "sidekiq", "api"]
-    "machine_types" = ["n1-standard-8", "n1-standard-8", "n1-standard-4", "n1-standard-4", "n1-standard-8", "n1-standard-8", "n1-standard-8", "n1-standard-4", "n1-standard-8", "n1-standard-4"]
+    "names"         = ["gitaly", "haproxy", "pages", "postgres", "production", "system", "workhorse", "geo", "sidekiq", "api", "nginx", "gitlab-shell"]
+    "machine_types" = ["n1-standard-8", "n1-standard-8", "n1-standard-4", "n1-standard-4", "n1-standard-8", "n1-standard-8", "n1-standard-8", "n1-standard-4", "n1-standard-8", "n1-standard-4", "n1-standard-1", "n1-standard-1"]
  }
 }


--- a/environments/gstg/variables.tf
+++ b/environments/gstg/variables.tf
@@ -24,8 +24,8 @@ variable "pubsubbeats" {
  type = "map"

  default = {
-    "names"         = ["gitaly", "haproxy", "pages", "postgres", "production", "system", "workhorse", "geo", "sidekiq", "api"]
-    "machine_types" = ["n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-4", "n1-standard-1"]
+    "names"         = ["gitaly", "haproxy", "pages", "postgres", "production", "system", "workhorse", "geo", "sidekiq", "api", "nginx", "gitlab-shell"]
+    "machine_types" = ["n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-1", "n1-standard-4", "n1-standard-1", "n1-standard-1", "n1-standard-1"]
  }
 }