[newrelic] refactor newrelic_enabled

Make sure to enable New Relic in production and staging. Set a default in case it's unset.
GSA · Jan 26, 2021 · a213243 · a213243
1 parent 3529e27
commit a213243
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/ansible/group_vars/all/vars.yml b/ansible/group_vars/all/vars.yml
@@ -162,7 +162,7 @@ newrelic_app_envs: |
   NEW_RELIC_LICENSE_KEY="{{ newrelic_license_key }}"
   NEW_RELIC_LOG=/var/log/new_relic.log
   NEW_RELIC_LOG_LEVEL=info
-  NEW_RELIC_MONITOR_MODE={{ newrelic_enabled | ternary('true', 'false') }}
+  NEW_RELIC_MONITOR_MODE={{ newrelic_enabled | default(False) | ternary('true', 'false') }}
 newrelic_environment: "{{ datagov_environment | default('unknown') }}"
 nrinfragent_config:
   license_key: "{{ newrelic_license_key }}"

diff --git a/ansible/inventories/production/group_vars/all/vars.yml b/ansible/inventories/production/group_vars/all/vars.yml
@@ -229,6 +229,7 @@ inventory_next_postgresql_db_name: "{{ vault_inventory_next_postgresql_db_name }
 inventory_next_datapusher_db_name: "{{ vault_inventory_next_datapusher_db_name }}"
 
 # New Relic
+newrelic_enabled: true
 newrelic_license_key: "{{ vault_newrelic_license_key }}"
 
 

diff --git a/ansible/inventories/sandbox/group_vars/inventory-next/vars.yml b/ansible/inventories/sandbox/group_vars/inventory-next/vars.yml
@@ -30,8 +30,7 @@ inventory_ckan_bucket_prefix: "{{ inventory_next_ckan_s3_bucket_prefix }}"
 ckan_site_domain: "{{ inventory_next_ckan_service_url }}"
 
 inventory_app_repo_branch: inventory-28-with-saml2
-newrelic_app_name: inventory-next-sandbox
-newrelic_enabled: false
+newrelic_app_name: inventory-next
 
 inventory_ckan_plugins_additional: [saml2auth s3filestore]
 

diff --git a/ansible/inventories/staging/group_vars/all/vars.yml b/ansible/inventories/staging/group_vars/all/vars.yml
@@ -219,6 +219,7 @@ inventory_next_postgresql_db_name: "{{ vault_inventory_next_postgresql_db_name }
 inventory_next_datapusher_db_name: "{{ vault_inventory_next_datapusher_db_name }}"
 
 # New Relic
+newrelic_enabled: true
 newrelic_license_key: "{{ vault_newrelic_license_key }}"
 
 

diff --git a/ansible/inventories/staging/group_vars/inventory-next/vars.yml b/ansible/inventories/staging/group_vars/inventory-next/vars.yml
@@ -32,8 +32,7 @@ inventory_ckan_bucket_prefix: "{{ inventory_next_ckan_s3_bucket_prefix }}"
 ckan_site_domain: "{{ inventory_next_ckan_service_url }}"
 
 inventory_app_repo_branch: inventory-28-with-saml2
-newrelic_app_name: inventory-next-staging
-newrelic_enabled: true
+newrelic_app_name: inventory-next
 
 inventory_ckan_plugins_additional: [saml2auth s3filestore]