Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions playbooks/authn_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@
- role: authn
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
4 changes: 1 addition & 3 deletions playbooks/blockstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'blockstore'
roles:
- role: aws
Expand All @@ -14,8 +14,6 @@
- blockstore
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: hermes
HERMES_TARGET_SERVICE: 'blockstore'
when: BLOCKSTORE_HERMES_ENABLED
4 changes: 1 addition & 3 deletions playbooks/commerce_coordinator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'commerce_coordinator'
REGISTRAR_ENABLED: True
roles:
Expand All @@ -15,8 +15,6 @@
- commerce_coordinator
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: hermes
HERMES_TARGET_SERVICE: 'commerce_coordinator'
when: COMMERCE_COORDINATOR__HERMES_ENABLED
2 changes: 0 additions & 2 deletions playbooks/common_edx_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG

2 changes: 1 addition & 1 deletion playbooks/conductor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: False
ENABLE_NEWRELIC: False # Already disabled
CLUSTER_NAME: 'conductor'
NGINX_OVERRIDE_DEFAULT_MAP_HASH_SIZE: True
NGINX_MAP_HASH_MAX_SIZE: 4096
Expand Down
4 changes: 1 addition & 3 deletions playbooks/credentials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
- role: datadog
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
when: COMMON_ENABLE_SPLUNKFORWARDE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
- role: hermes
Expand Down
4 changes: 1 addition & 3 deletions playbooks/designer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'designer'
roles:
- role: aws
Expand All @@ -14,8 +14,6 @@
- designer
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: hermes
HERMES_TARGET_SERVICE: 'designer'
when: DESIGNER_HERMES_ENABLED
2 changes: 0 additions & 2 deletions playbooks/discovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
- role: hermes
Expand Down
2 changes: 0 additions & 2 deletions playbooks/forum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 1 addition & 1 deletion playbooks/insights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
gather_facts: True
vars:
ENABLE_DATADOG: False
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'insights'
roles:
- role: aws
Expand Down
5 changes: 0 additions & 5 deletions playbooks/jenkins_data_engineering.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,13 @@
gather_facts: True
vars:
COMMON_ENABLE_SPLUNKFORWARDER: False
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: True
COMMON_SECURITY_UPDATES: yes
SECURITY_UPGRADE_ON_ANSIBLE: true

roles:
- role: aws
when: COMMON_ENABLE_AWS_ROLE
- jenkins_data_engineering
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
tags:
- newreliconly
- role: aws_cloudwatch_agent
tags:
- cloudwatch
5 changes: 0 additions & 5 deletions playbooks/jenkins_data_engineering_new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
gather_facts: True
vars:
COMMON_ENABLE_SPLUNKFORWARDER: False
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: True
COMMON_SECURITY_UPDATES: yes
SECURITY_UPGRADE_ON_ANSIBLE: true
ansible_distribution_release: focal
Expand All @@ -30,10 +29,6 @@
when: COMMON_ENABLE_AWS_ROLE
- docker-tools
- jenkins_data_engineering_new
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
tags:
- newreliconly
- role: aws_cloudwatch_agent
tags:
- cloudwatch
2 changes: 1 addition & 1 deletion playbooks/jenkins_it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
become: True
gather_facts: True
vars:
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: True
COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE: False
COMMON_SECURITY_UPDATES: yes
SECURITY_UPGRADE_ON_ANSIBLE: true

Expand Down
3 changes: 1 addition & 2 deletions playbooks/learner_dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
MFE_VERSION: '{{ LEARNER_DASHBOARD_MFE_VERSION }}'
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE

3 changes: 1 addition & 2 deletions playbooks/learner_portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@
- learner_portal
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE

4 changes: 1 addition & 3 deletions playbooks/library_authoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
- role: library_authoring
MFE_NAME: library-authoring
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELICE_INFRASTRUCTURE
when: COMMON_ENABLE_SPLUNKFORWARDER
4 changes: 1 addition & 3 deletions playbooks/license_manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'license_manager'
REGISTRAR_ENABLED: True
roles:
Expand All @@ -15,8 +15,6 @@
- license_manager
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: hermes
HERMES_TARGET_SERVICE: 'license_manager'
when: REGISTRAR_HERMES_ENABLED
2 changes: 0 additions & 2 deletions playbooks/mongo_3_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG

2 changes: 0 additions & 2 deletions playbooks/mongo_3_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG

2 changes: 0 additions & 2 deletions playbooks/mongo_3_4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 0 additions & 2 deletions playbooks/mongo_3_6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 0 additions & 2 deletions playbooks/mongo_4_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 0 additions & 2 deletions playbooks/mongo_4_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 0 additions & 2 deletions playbooks/mongo_4_4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
2 changes: 0 additions & 2 deletions playbooks/mongo_5_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
6 changes: 3 additions & 3 deletions playbooks/mongo_6_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
when: not


2 changes: 0 additions & 2 deletions playbooks/mongo_7_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
4 changes: 1 addition & 3 deletions playbooks/neo4j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@
# - aws
- neo4j
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
when: COMMON_ENABLE_SPLUNKFORWARDER
12 changes: 6 additions & 6 deletions playbooks/newrelic_mongo_monitor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

- name: Configure newrelic mongo monitoring
hosts: all
become: True
gather_facts: True
roles:
- mongo_newrelic_monitor
# - name: Configure newrelic mongo monitoring
# hosts: all
# become: True
# gather_facts: True
# roles:
# - mongo_newrelic_monitor
4 changes: 1 addition & 3 deletions playbooks/notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
gather_facts: True
vars:
ENABLE_DATADOG: False
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
roles:
- role: aws
when: COMMON_ENABLE_AWS_ROLE
Expand All @@ -16,8 +16,6 @@
when: COMMON_ENABLE_DATADOG
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: datadog-uninstall
when: not COMMON_ENABLE_DATADOG
- role: hermes
Expand Down
3 changes: 1 addition & 2 deletions playbooks/ora_grading.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
MFE_NAME: ora-grading
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELICE_INFRASTRUCTURE


2 changes: 0 additions & 2 deletions playbooks/profile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
MFE_VERSION: '{{ PROFILE_MFE_VERSION }}'
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
2 changes: 0 additions & 2 deletions playbooks/program_console.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@
- program_console
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
2 changes: 0 additions & 2 deletions playbooks/rabbitmq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
- rabbitmq
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
post_tasks:
- debug:
var: ansible_ec2_instance_id
Expand Down
4 changes: 1 addition & 3 deletions playbooks/registrar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
become: True
gather_facts: True
vars:
ENABLE_NEWRELIC: True
ENABLE_NEWRELIC: False
CLUSTER_NAME: 'registrar'
REGISTRAR_ENABLED: True
roles:
Expand All @@ -15,8 +15,6 @@
- registrar
- role: splunkforwarder
when: COMMON_ENABLE_SPLUNKFORWARDER
- role: newrelic_infrastructure
when: COMMON_ENABLE_NEWRELIC_INFRASTRUCTURE
- role: hermes
HERMES_TARGET_SERVICE: 'registrar'
when: REGISTRAR_HERMES_ENABLED
4 changes: 0 additions & 4 deletions playbooks/roles/analytics_api/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ analytics_api_code_dir: "{{ analytics_api_home }}/{{ analytics_api_service_name
analytics_api_wsgi_name: "analyticsdataserver"
analytics_api_hostname: "analytics-api"

analytics_api_newrelic_appname: 'analytics-api'

#
# OS packages
#
Expand Down Expand Up @@ -182,8 +180,6 @@ analytics_api_service_config_overrides:
ANALYTICS_API_USERS:
"dummy-api-user": "changeme"

ANALYTICS_API_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false

# Remote config
ANALYTICS_API_HERMES_ENABLED: "{{ COMMON_HERMES_ENABLED }}"

Expand Down
Loading