Skip to content

Commit e4ae1d0

Browse files
Bhavani GudditiBhavani Gudditi
authored andcommitted
chore(edx-dx-services): remove new relic infrastructure and app references
1 parent 2d809d4 commit e4ae1d0

File tree

18 files changed

+12
-35
lines changed

18 files changed

+12
-35
lines changed

playbooks/designer.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
become: True
44
gather_facts: True
55
vars:
6-
ENABLE_NEWRELIC: True
6+
ENABLE_NEWRELIC: False
77
CLUSTER_NAME: 'designer'
88
roles:
99
- role: aws
@@ -14,8 +14,6 @@
1414
- designer
1515
- role: splunkforwarder
1616
when: COMMON_ENABLE_SPLUNKFORWARDER
17-
- role: newrelic_infrastructure
18-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
1917
- role: hermes
2018
HERMES_TARGET_SERVICE: 'designer'
2119
when: DESIGNER_HERMES_ENABLED

playbooks/neo4j.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,4 @@
1414
# - aws
1515
- neo4j
1616
- role: splunkforwarder
17-
when: COMMON_ENABLE_SPLUNKFORWARDER
18-
- role: newrelic_infrastructure
19-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
17+
when: COMMON_ENABLE_SPLUNKFORWARDER

playbooks/roles/analytics_api/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ analytics_api_code_dir: "{{ analytics_api_home }}/{{ analytics_api_service_name
3434
analytics_api_wsgi_name: "analyticsdataserver"
3535
analytics_api_hostname: "analytics-api"
3636

37-
analytics_api_newrelic_appname: 'analytics-api'
38-
3937
#
4038
# OS packages
4139
#
@@ -182,8 +180,6 @@ analytics_api_service_config_overrides:
182180
ANALYTICS_API_USERS:
183181
"dummy-api-user": "changeme"
184182

185-
ANALYTICS_API_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
186-
187183
# Remote config
188184
ANALYTICS_API_HERMES_ENABLED: "{{ COMMON_HERMES_ENABLED }}"
189185

playbooks/roles/analytics_api/meta/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ dependencies:
4242
edx_django_service_secret_key: '{{ ANALYTICS_API_SECRET_KEY }}'
4343
edx_django_service_wsgi_name: '{{ analytics_api_wsgi_name }}'
4444
edx_django_service_hostname: '~^((stage|prod)-)?{{ analytics_api_hostname }}.*'
45-
edx_django_service_newrelic_appname: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ analytics_api_newrelic_appname }}'
45+
#edx_django_service_newrelic_appname: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ analytics_api_newrelic_appname }}'
4646
edx_django_service_automated_users: '{{ ANALYTICS_API_AUTOMATED_USERS }}'
4747
edx_django_service_cors_whitelist: '{{ ANALYTICS_API_CORS_ORIGIN_WHITELIST }}'
4848
edx_django_service_allow_cors_headers: '{{ ANALYTICS_API_ALLOW_CORS_HEADERS }}'
4949
edx_django_service_allow_cors_credentials: '{{ ANALYTICS_API_ALLOW_CORS_CREDENTIALS }}'
5050
edx_django_service_basic_auth_exempted_paths_extra: '{{ ANALYTICS_API_BASIC_AUTH_EXEMPTED_PATHS }}'
51-
edx_django_service_enable_newrelic_distributed_tracing: '{{ ANALYTICS_API_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
51+
#edx_django_service_enable_newrelic_distributed_tracing: '{{ ANALYTICS_API_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
5252
edx_django_service_decrypt_config_enabled: '{{ ANALYTICS_API_DECRYPT_CONFIG_ENABLED }}'
5353
edx_django_service_copy_config_enabled: '{{ ANALYTICS_API_COPY_CONFIG_ENABLED }}'
5454
edx_django_datadog_service: '{{ analytics_api_datadog_service_name }}'

playbooks/roles/common_vars/defaults/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,8 @@ COMMON_ENABLE_DATADOG_APP_SERVICES: []
106106
COMMON_ENABLE_DATADOG_PROFILING: False
107107
COMMON_ENABLE_NGINXTRA: False
108108
COMMON_ENABLE_SPLUNKFORWARDER: False
109-
COMMON_ENABLE_NEWRELIC: False
110-
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: False
111109
# enables app reporting, you must enable newrelic
112110
# as well
113-
COMMON_ENABLE_NEWRELIC_APP: False
114111
COMMON_ENABLE_MINOS: False
115112
COMMON_ENABLE_INSIGHTVM_AGENT: False
116113
COMMON_TAG_EC2_INSTANCE: False

playbooks/roles/credentials/meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies:
4747
edx_django_service_automated_users: '{{ CREDENTIALS_AUTOMATED_USERS }}'
4848
edx_django_service_cors_whitelist: '{{ CREDENTIALS_CORS_ORIGIN_WHITELIST }}'
4949
edx_django_service_post_migrate_commands: '{{ credentials_post_migrate_commands }}'
50-
edx_django_service_enable_newrelic_distributed_tracing: '{{ CREDENTIALS_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
50+
# edx_django_service_enable_newrelic_distributed_tracing: '{{ CREDENTIALS_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
5151
edx_django_service_decrypt_config_enabled: '{{ CREDENTIALS_DECRYPT_CONFIG_ENABLED }}'
5252
edx_django_service_copy_config_enabled: '{{ CREDENTIALS_COPY_CONFIG_ENABLED }}'
5353
EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION: '{{ CREDENTIALS_ENABLE_ADMIN_URLS_RESTRICTION }}'

playbooks/roles/designer/meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ dependencies:
4444
edx_django_service_automated_users: '{{ DESIGNER_AUTOMATED_USERS }}'
4545
edx_django_service_cors_whitelist: '{{ DESIGNER_CORS_ORIGIN_WHITELIST }}'
4646
edx_django_service_post_migrate_commands: '{{ designer_post_migrate_commands }}'
47-
edx_django_service_enable_newrelic_distributed_tracing: '{{ DESIGNER_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
47+
# edx_django_service_enable_newrelic_distributed_tracing: '{{ DESIGNER_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
4848
edx_django_service_decrypt_config_enabled: '{{ DESIGNER_DECRYPT_CONFIG_ENABLED }}'
4949
edx_django_service_copy_config_enabled: '{{ DESIGNER_COPY_CONFIG_ENABLED }}'

playbooks/roles/ecommerce/defaults/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ ECOMMERCE_ADD_EXTRA_REQUIREMENTS_TO_REQUIREMENTS_FILE: false
3737

3838
# depends upon Newrelic being enabled via COMMON_ENABLE_NEWRELIC
3939
# and a key being provided via NEWRELIC_LICENSE_KEY
40-
ECOMMERCE_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ ecommerce_service_name }}"
4140
ECOMMERCE_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
4241
ECOMMERCE_NGINX_PORT: 18130
4342
ECOMMERCE_SSL_NGINX_PORT: 48130
@@ -311,7 +310,7 @@ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION: false
311310
ECOMMERCE_ADMIN_URLS:
312311
- admin
313312

314-
ECOMMERCE_ENABLE_NEWRELIC_APP: true
313+
ECOMMERCE_ENABLE_NEWRELIC_APP: false
315314
ECOMMERCE_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
316315

317316
# Python 3 conversion

playbooks/roles/ecommerce/meta/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ dependencies:
6363
- payment
6464
- \.well-known/apple-developer-merchantid-domain-association
6565
edx_django_service_automated_users: '{{ ECOMMERCE_AUTOMATED_USERS }}'
66-
edx_django_service_enable_newrelic_app: '{{ ECOMMERCE_ENABLE_NEWRELIC_APP }}'
67-
edx_django_service_enable_newrelic_distributed_tracing: '{{ ECOMMERCE_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
66+
# edx_django_service_enable_newrelic_app: '{{ ECOMMERCE_ENABLE_NEWRELIC_APP }}'
67+
# edx_django_service_enable_newrelic_distributed_tracing: '{{ ECOMMERCE_ENABLE_NEWRELIC_DISTRIBUTED_TRACING }}'
6868
edx_django_service_decrypt_config_enabled: '{{ ECOMMERCE_DECRYPT_CONFIG_ENABLED }}'
6969
edx_django_service_copy_config_enabled: '{{ ECOMMERCE_COPY_CONFIG_ENABLED }}'
7070
EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION: '{{ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION }}'

playbooks/roles/edx_django_service/templates/edx/app/nginx/sites-available/concerns/proxy-to-app.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ location @proxy_to_app {
3434
{% endif %}
3535
{% endif %}
3636

37-
# newrelic-specific header records the time when nginx handles a request.
38-
proxy_set_header X-Queue-Start "t=${msec}";
39-
4037
proxy_set_header Host $http_host;
4138

4239
proxy_redirect off;

0 commit comments

Comments
 (0)