Skip to content

Commit 2d809d4

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

File tree

16 files changed

+12
-104
lines changed

16 files changed

+12
-104
lines changed

playbooks/commerce_coordinator.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: 'commerce_coordinator'
88
REGISTRAR_ENABLED: True
99
roles:
@@ -15,8 +15,6 @@
1515
- commerce_coordinator
1616
- role: splunkforwarder
1717
when: COMMON_ENABLE_SPLUNKFORWARDER
18-
- role: newrelic_infrastructure
19-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
2018
- role: hermes
2119
HERMES_TARGET_SERVICE: 'commerce_coordinator'
2220
when: COMMERCE_COORDINATOR__HERMES_ENABLED

playbooks/credentials.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
- role: datadog
1717
when: COMMON_ENABLE_DATADOG
1818
- role: splunkforwarder
19-
when: COMMON_ENABLE_SPLUNKFORWARDER
20-
- role: newrelic_infrastructure
21-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
19+
when: COMMON_ENABLE_SPLUNKFORWARDE
2220
- role: datadog-uninstall
2321
when: not COMMON_ENABLE_DATADOG
2422
- role: hermes

playbooks/forum.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@
1717
when: COMMON_ENABLE_DATADOG
1818
- role: splunkforwarder
1919
when: COMMON_ENABLE_SPLUNKFORWARDER
20-
- role: newrelic_infrastructure
21-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
2220
- role: datadog-uninstall
2321
when: not COMMON_ENABLE_DATADOG

playbooks/insights.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: True
55
vars:
66
ENABLE_DATADOG: False
7-
ENABLE_NEWRELIC: True
7+
ENABLE_NEWRELIC: False
88
CLUSTER_NAME: 'insights'
99
roles:
1010
- role: aws

playbooks/jenkins_data_engineering.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,13 @@
2020
gather_facts: True
2121
vars:
2222
COMMON_ENABLE_SPLUNKFORWARDER: False
23-
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: True
2423
COMMON_SECURITY_UPDATES: yes
2524
SECURITY_UPGRADE_ON_ANSIBLE: true
2625

2726
roles:
2827
- role: aws
2928
when: COMMON_ENABLE_AWS_ROLE
3029
- jenkins_data_engineering
31-
- role: newrelic_infrastructure
32-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
33-
tags:
34-
- newreliconly
3530
- role: aws_cloudwatch_agent
3631
tags:
3732
- cloudwatch

playbooks/jenkins_it.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
become: True
1212
gather_facts: True
1313
vars:
14-
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: True
14+
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: False
1515
COMMON_SECURITY_UPDATES: yes
1616
SECURITY_UPGRADE_ON_ANSIBLE: true
1717

playbooks/license_manager.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: 'license_manager'
88
REGISTRAR_ENABLED: True
99
roles:
@@ -15,8 +15,6 @@
1515
- license_manager
1616
- role: splunkforwarder
1717
when: COMMON_ENABLE_SPLUNKFORWARDER
18-
- role: newrelic_infrastructure
19-
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
2018
- role: hermes
2119
HERMES_TARGET_SERVICE: 'license_manager'
2220
when: REGISTRAR_HERMES_ENABLED

playbooks/ora_grading.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212
MFE_NAME: ora-grading
1313
- role: splunkforwarder
1414
when: COMMON_ENABLE_SPLUNKFORWARDER
15-
- role: newrelic_infrastructure
16-
when: COMMON_ENABLE_NEWRELICE_INFRASTRUCTURE
15+
1716

playbooks/roles/ecomworker/defaults/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ ECOMMERCE_WORKER_REPOS:
2424
DESTINATION: '{{ ecommerce_worker_code_dir }}'
2525
SSH_KEY: '{{ ECOMMERCE_WORKER_GIT_IDENTITY }}'
2626

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-
3327
# Datadog
3428
ECOMMERCE_WORKER_DATADOG_ENABLE: "{{COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP}}"
3529

playbooks/roles/forum/defaults/main.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ FORUM_OPENSEARCH_PORT: "9202"
4444
FORUM_OPENSEARCH_PROTOCOL: "http"
4545
FORUM_OPENSEARCH_URL: "{{ FORUM_OPENSEARCH_PROTOCOL }}://{{ FORUM_OPENSEARCH_HOST }}:{{ FORUM_OPENSEARCH_PORT }}"
4646

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-
5247
# Datadog CONFIG
5348
FORUM_DD_TAGS: "service:edx-forum version:{{ app_version }}"
5449

@@ -83,9 +78,6 @@ forum_base_env: &forum_base_env
8378
MONGOID_AUTH_SOURCE: "{{ FORUM_MONGO_AUTH_DB }}"
8479
MONGOID_AUTH_MECH: "{{ FORUM_MONGO_AUTH_MECH }}"
8580
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 }}"
8981
WORKER_PROCESSES: "{{ FORUM_WORKER_PROCESSES }}"
9082
DATA_DIR: "{{ forum_data_dir }}"
9183
LISTEN_HOST: "{{ FORUM_LISTEN_HOST }}"

0 commit comments

Comments
 (0)