Set SENTRY_CURRENT_ENV everywhere

This sets the current environment for Sentry to the value currently used for errbit, so either integration/staging/production (getsentry/sentry-ruby#736).
alphagov · Aug 21, 2017 · 61764ea · 61764ea
1 parent cd7bab4
commit 61764ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -682,6 +682,7 @@ govuk_containers::app::config::global_envvars:
   - "RACK_ENV=production"
   - "RAILS_ENV=production"
   - "ERRBIT_ENVIRONMENT_NAME=%{hiera('govuk::deploy::config::errbit_environment_name')}"
+  - "SENTRY_CURRENT_ENV=%{hiera('govuk::deploy::config::errbit_environment_name')}"
   - "GOVUK_APP_DOMAIN=%{hiera('app_domain')}"
   - "GOVUK_ASSET_HOST=%{hiera('govuk::deploy::config::asset_root')}"
   - "GOVUK_ASSET_ROOT=%{hiera('govuk::deploy::config::asset_root')}"

diff --git a/hieradata/development.yaml b/hieradata/development.yaml
@@ -199,6 +199,7 @@ govuk_containers::app::config::global_envvars:
   - "RACK_ENV=development"
   - "RAILS_ENV=development"
   - "ERRBIT_ENVIRONMENT_NAME=%{hiera('govuk::deploy::config::errbit_environment_name')}"
+  - "SENTRY_CURRENT_ENV=%{hiera('govuk::deploy::config::errbit_environment_name')}"
   - "GOVUK_APP_DOMAIN=%{hiera('app_domain')}"
   - "GOVUK_ASSET_HOST=%{hiera('govuk::deploy::config::asset_root')}"
   - "GOVUK_ASSET_ROOT=%{hiera('govuk::deploy::config::asset_root')}"

diff --git a/hieradata_aws/common.yaml b/hieradata_aws/common.yaml
@@ -719,6 +719,7 @@ govuk_containers::app::config::global_envvars:
   - "RACK_ENV=production"
   - "RAILS_ENV=production"
   - "ERRBIT_ENVIRONMENT_NAME=%{hiera('govuk::deploy::config::errbit_environment_name')}"
+  - "SENTRY_CURRENT_ENV=%{hiera('govuk::deploy::config::errbit_environment_name')}"
   - "GOVUK_APP_DOMAIN=%{hiera('app_domain')}"
   - "GOVUK_ASSET_HOST=%{hiera('govuk::deploy::config::asset_root')}"
   - "GOVUK_ASSET_ROOT=%{hiera('govuk::deploy::config::asset_root')}"

diff --git a/modules/govuk/manifests/deploy/config.pp b/modules/govuk/manifests/deploy/config.pp
@@ -85,6 +85,7 @@
     'RAILS_ENV': value => $govuk_env;
 
     'ERRBIT_ENVIRONMENT_NAME': value   => $errbit_environment_name;
+    'SENTRY_CURRENT_ENV': value        => $errbit_environment_name;
     'GOVUK_APP_DOMAIN': value          => $app_domain;
     'GOVUK_ASSET_HOST': value          => $asset_root;
     'GOVUK_ASSET_ROOT': value          => $asset_root;