File tree Expand file tree Collapse file tree 16 files changed +12
-104
lines changed
hotg/templates/edx/app/hotg
newrelic_infrastructure/defaults
nginx/templates/edx/app/nginx/sites-available Expand file tree Collapse file tree 16 files changed +12
-104
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 : ' commerce_coordinator'
8
8
REGISTRAR_ENABLED : True
9
9
roles :
15
15
- commerce_coordinator
16
16
- role : splunkforwarder
17
17
when : COMMON_ENABLE_SPLUNKFORWARDER
18
- - role : newrelic_infrastructure
19
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
20
18
- role : hermes
21
19
HERMES_TARGET_SERVICE : ' commerce_coordinator'
22
20
when : COMMERCE_COORDINATOR__HERMES_ENABLED
Original file line number Diff line number Diff line change 16
16
- role : datadog
17
17
when : COMMON_ENABLE_DATADOG
18
18
- role : splunkforwarder
19
- when : COMMON_ENABLE_SPLUNKFORWARDER
20
- - role : newrelic_infrastructure
21
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
19
+ when : COMMON_ENABLE_SPLUNKFORWARDE
22
20
- role : datadog-uninstall
23
21
when : not COMMON_ENABLE_DATADOG
24
22
- role : hermes
Original file line number Diff line number Diff line change 17
17
when : COMMON_ENABLE_DATADOG
18
18
- role : splunkforwarder
19
19
when : COMMON_ENABLE_SPLUNKFORWARDER
20
- - role : newrelic_infrastructure
21
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
22
20
- role : datadog-uninstall
23
21
when : not COMMON_ENABLE_DATADOG
Original file line number Diff line number Diff line change 4
4
gather_facts : True
5
5
vars :
6
6
ENABLE_DATADOG : False
7
- ENABLE_NEWRELIC : True
7
+ ENABLE_NEWRELIC : False
8
8
CLUSTER_NAME : ' insights'
9
9
roles :
10
10
- role : aws
Original file line number Diff line number Diff line change 20
20
gather_facts : True
21
21
vars :
22
22
COMMON_ENABLE_SPLUNKFORWARDER : False
23
- COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE : True
24
23
COMMON_SECURITY_UPDATES : yes
25
24
SECURITY_UPGRADE_ON_ANSIBLE : true
26
25
27
26
roles :
28
27
- role : aws
29
28
when : COMMON_ENABLE_AWS_ROLE
30
29
- jenkins_data_engineering
31
- - role : newrelic_infrastructure
32
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
33
- tags :
34
- - newreliconly
35
30
- role : aws_cloudwatch_agent
36
31
tags :
37
32
- cloudwatch
Original file line number Diff line number Diff line change 11
11
become : True
12
12
gather_facts : True
13
13
vars :
14
- COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE : True
14
+ COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE : False
15
15
COMMON_SECURITY_UPDATES : yes
16
16
SECURITY_UPGRADE_ON_ANSIBLE : true
17
17
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 : ' license_manager'
8
8
REGISTRAR_ENABLED : True
9
9
roles :
15
15
- license_manager
16
16
- role : splunkforwarder
17
17
when : COMMON_ENABLE_SPLUNKFORWARDER
18
- - role : newrelic_infrastructure
19
- when : COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
20
18
- role : hermes
21
19
HERMES_TARGET_SERVICE : ' license_manager'
22
20
when : REGISTRAR_HERMES_ENABLED
Original file line number Diff line number Diff line change 12
12
MFE_NAME : ora-grading
13
13
- role : splunkforwarder
14
14
when : COMMON_ENABLE_SPLUNKFORWARDER
15
- - role : newrelic_infrastructure
16
- when : COMMON_ENABLE_NEWRELICE_INFRASTRUCTURE
15
+
17
16
Original file line number Diff line number Diff line change @@ -24,12 +24,6 @@ ECOMMERCE_WORKER_REPOS:
24
24
DESTINATION : ' {{ ecommerce_worker_code_dir }}'
25
25
SSH_KEY : ' {{ ECOMMERCE_WORKER_GIT_IDENTITY }}'
26
26
27
- # Requires that New Relic be enabled via COMMON_ENABLE_NEWRELIC, and that
28
- # a key be provided via NEWRELIC_LICENSE_KEY.
29
- ECOMMERCE_WORKER_NEWRELIC_APPNAME : ' {{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ ecommerce_worker_service_name }}'
30
- ECOMMERCE_WORKER_ENABLE_NEWRELIC_APP : ' {{ COMMON_ENABLE_NEWRELIC_APP }}'
31
- ECOMMERCE_WORKER_ENABLE_NEWRELIC_DISTRIBUTED_TRACING : false
32
-
33
27
# Datadog
34
28
ECOMMERCE_WORKER_DATADOG_ENABLE : " {{COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP}}"
35
29
Original file line number Diff line number Diff line change @@ -44,11 +44,6 @@ FORUM_OPENSEARCH_PORT: "9202"
44
44
FORUM_OPENSEARCH_PROTOCOL : " http"
45
45
FORUM_OPENSEARCH_URL : " {{ FORUM_OPENSEARCH_PROTOCOL }}://{{ FORUM_OPENSEARCH_HOST }}:{{ FORUM_OPENSEARCH_PORT }}"
46
46
47
- # This needs to be a string, set to 'false' to disable
48
- FORUM_NEW_RELIC_ENABLE : ' {{ COMMON_ENABLE_NEWRELIC_APP }}'
49
- FORUM_NEW_RELIC_LICENSE_KEY : ' {{ NEWRELIC_LICENSE_KEY | default("") }}'
50
- FORUM_NEW_RELIC_APP_NAME : " {{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-forum"
51
-
52
47
# Datadog CONFIG
53
48
FORUM_DD_TAGS : " service:edx-forum version:{{ app_version }}"
54
49
@@ -83,9 +78,6 @@ forum_base_env: &forum_base_env
83
78
MONGOID_AUTH_SOURCE : " {{ FORUM_MONGO_AUTH_DB }}"
84
79
MONGOID_AUTH_MECH : " {{ FORUM_MONGO_AUTH_MECH }}"
85
80
HOME : " {{ forum_app_dir }}"
86
- NEW_RELIC_ENABLE : " {{ FORUM_NEW_RELIC_ENABLE }}"
87
- NEW_RELIC_APP_NAME : " {{ FORUM_NEW_RELIC_APP_NAME }}"
88
- NEW_RELIC_LICENSE_KEY : " {{ FORUM_NEW_RELIC_LICENSE_KEY }}"
89
81
WORKER_PROCESSES : " {{ FORUM_WORKER_PROCESSES }}"
90
82
DATA_DIR : " {{ forum_data_dir }}"
91
83
LISTEN_HOST : " {{ FORUM_LISTEN_HOST }}"
You can’t perform that action at this time.
0 commit comments