File tree Expand file tree Collapse file tree 18 files changed +12
-35
lines changed
edx_django_service/templates/edx/app/nginx/sites-available/concerns Expand file tree Collapse file tree 18 files changed +12
-35
lines changed Original file line number Diff line number Diff line change 3
3
become : True
4
4
gather_facts : True
5
5
vars :
6
- ENABLE_NEWRELIC : True
6
+ ENABLE_NEWRELIC : False
7
7
CLUSTER_NAME : ' designer'
8
8
roles :
9
9
- role : aws
14
14
- designer
15
15
- role : splunkforwarder
16
16
when : COMMON_ENABLE_SPLUNKFORWARDER
17
- - role : newrelic_infrastructure
18
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
19
17
- role : hermes
20
18
HERMES_TARGET_SERVICE : ' designer'
21
19
when : DESIGNER_HERMES_ENABLED
Original file line number Diff line number Diff line change 14
14
# - aws
15
15
- neo4j
16
16
- role : splunkforwarder
17
- when : COMMON_ENABLE_SPLUNKFORWARDER
18
- - role : newrelic_infrastructure
19
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
17
+ when : COMMON_ENABLE_SPLUNKFORWARDER
Original file line number Diff line number Diff line change @@ -34,8 +34,6 @@ analytics_api_code_dir: "{{ analytics_api_home }}/{{ analytics_api_service_name
34
34
analytics_api_wsgi_name : " analyticsdataserver"
35
35
analytics_api_hostname : " analytics-api"
36
36
37
- analytics_api_newrelic_appname : ' analytics-api'
38
-
39
37
#
40
38
# OS packages
41
39
#
@@ -182,8 +180,6 @@ analytics_api_service_config_overrides:
182
180
ANALYTICS_API_USERS :
183
181
" dummy-api-user " : " changeme"
184
182
185
- ANALYTICS_API_ENABLE_NEWRELIC_DISTRIBUTED_TRACING : false
186
-
187
183
# Remote config
188
184
ANALYTICS_API_HERMES_ENABLED : " {{ COMMON_HERMES_ENABLED }}"
189
185
Original file line number Diff line number Diff line change @@ -42,13 +42,13 @@ dependencies:
42
42
edx_django_service_secret_key : ' {{ ANALYTICS_API_SECRET_KEY }}'
43
43
edx_django_service_wsgi_name : ' {{ analytics_api_wsgi_name }}'
44
44
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 }}'
46
46
edx_django_service_automated_users : ' {{ ANALYTICS_API_AUTOMATED_USERS }}'
47
47
edx_django_service_cors_whitelist : ' {{ ANALYTICS_API_CORS_ORIGIN_WHITELIST }}'
48
48
edx_django_service_allow_cors_headers : ' {{ ANALYTICS_API_ALLOW_CORS_HEADERS }}'
49
49
edx_django_service_allow_cors_credentials : ' {{ ANALYTICS_API_ALLOW_CORS_CREDENTIALS }}'
50
50
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 }}'
52
52
edx_django_service_decrypt_config_enabled : ' {{ ANALYTICS_API_DECRYPT_CONFIG_ENABLED }}'
53
53
edx_django_service_copy_config_enabled : ' {{ ANALYTICS_API_COPY_CONFIG_ENABLED }}'
54
54
edx_django_datadog_service : ' {{ analytics_api_datadog_service_name }}'
Original file line number Diff line number Diff line change @@ -106,11 +106,8 @@ COMMON_ENABLE_DATADOG_APP_SERVICES: []
106
106
COMMON_ENABLE_DATADOG_PROFILING : False
107
107
COMMON_ENABLE_NGINXTRA : False
108
108
COMMON_ENABLE_SPLUNKFORWARDER : False
109
- COMMON_ENABLE_NEWRELIC : False
110
- COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE : False
111
109
# enables app reporting, you must enable newrelic
112
110
# as well
113
- COMMON_ENABLE_NEWRELIC_APP : False
114
111
COMMON_ENABLE_MINOS : False
115
112
COMMON_ENABLE_INSIGHTVM_AGENT : False
116
113
COMMON_TAG_EC2_INSTANCE : False
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ dependencies:
47
47
edx_django_service_automated_users : ' {{ CREDENTIALS_AUTOMATED_USERS }}'
48
48
edx_django_service_cors_whitelist : ' {{ CREDENTIALS_CORS_ORIGIN_WHITELIST }}'
49
49
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 }}'
51
51
edx_django_service_decrypt_config_enabled : ' {{ CREDENTIALS_DECRYPT_CONFIG_ENABLED }}'
52
52
edx_django_service_copy_config_enabled : ' {{ CREDENTIALS_COPY_CONFIG_ENABLED }}'
53
53
EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION : ' {{ CREDENTIALS_ENABLE_ADMIN_URLS_RESTRICTION }}'
Original file line number Diff line number Diff line change @@ -44,6 +44,6 @@ dependencies:
44
44
edx_django_service_automated_users : ' {{ DESIGNER_AUTOMATED_USERS }}'
45
45
edx_django_service_cors_whitelist : ' {{ DESIGNER_CORS_ORIGIN_WHITELIST }}'
46
46
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 }}'
48
48
edx_django_service_decrypt_config_enabled : ' {{ DESIGNER_DECRYPT_CONFIG_ENABLED }}'
49
49
edx_django_service_copy_config_enabled : ' {{ DESIGNER_COPY_CONFIG_ENABLED }}'
Original file line number Diff line number Diff line change @@ -37,7 +37,6 @@ ECOMMERCE_ADD_EXTRA_REQUIREMENTS_TO_REQUIREMENTS_FILE: false
37
37
38
38
# depends upon Newrelic being enabled via COMMON_ENABLE_NEWRELIC
39
39
# and a key being provided via NEWRELIC_LICENSE_KEY
40
- ECOMMERCE_NEWRELIC_APPNAME : " {{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ ecommerce_service_name }}"
41
40
ECOMMERCE_PIP_EXTRA_ARGS : " -i {{ COMMON_PYPI_MIRROR_URL }}"
42
41
ECOMMERCE_NGINX_PORT : 18130
43
42
ECOMMERCE_SSL_NGINX_PORT : 48130
@@ -311,7 +310,7 @@ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION: false
311
310
ECOMMERCE_ADMIN_URLS :
312
311
- admin
313
312
314
- ECOMMERCE_ENABLE_NEWRELIC_APP : true
313
+ ECOMMERCE_ENABLE_NEWRELIC_APP : false
315
314
ECOMMERCE_ENABLE_NEWRELIC_DISTRIBUTED_TRACING : false
316
315
317
316
# Python 3 conversion
Original file line number Diff line number Diff line change @@ -63,8 +63,8 @@ dependencies:
63
63
- payment
64
64
- \.well-known/apple-developer-merchantid-domain-association
65
65
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 }}'
68
68
edx_django_service_decrypt_config_enabled : ' {{ ECOMMERCE_DECRYPT_CONFIG_ENABLED }}'
69
69
edx_django_service_copy_config_enabled : ' {{ ECOMMERCE_COPY_CONFIG_ENABLED }}'
70
70
EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION : ' {{ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION }}'
Original file line number Diff line number Diff line change @@ -34,9 +34,6 @@ location @proxy_to_app {
34
34
{% endif %}
35
35
{% endif %}
36
36
37
- # newrelic-specific header records the time when nginx handles a request.
38
- proxy_set_header X-Queue-Start "t=${msec}";
39
-
40
37
proxy_set_header Host $http_host;
41
38
42
39
proxy_redirect off;
You can’t perform that action at this time.
0 commit comments