Newrelic support for lms/cms python

playbooks/roles/edxapp/defaults/main.yml

@@ -211,6 +211,9 @@ EDXAPP_SESSION_COOKIE_DOMAIN: ""
 EDXAPP_XML_FROM_GIT: false
 EDXAPP_XML_S3_BUCKET: !!null
 EDXAPP_XML_S3_KEY: !!null
+
+EDXAPP_ENABLE_NEWRELIC: true
+EDXAPP_NEWRELIC_EXECUTABLE: "/opt/edx/bin/newrelic-admin"
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings

playbooks/roles/edxapp/templates/cms.conf.j2

 [program:cms]
+
+{% if EDXAPP_ENABLE_NEWRELIC %}
+{% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
+{% else %}
+{% set executable = '/opt/edx/bin/newrelic-admin run-program' + edxapp_venv_dir + '/bin/gunicorn' %}
+{% endif %}
+
 {% if ansible_processor|length > 0 %}
-command={{ edxapp_venv_dir }}/bin/gunicorn --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
+command=executable --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
 {% else %}
-command={{ edxapp_venv_dir }}/bin/gunicorn --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
+command=executable --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
 {% endif %}
 
 user={{ common_web_user }}

playbooks/roles/edxapp/templates/lms.conf.j2

 [program:lms]
+
+{% if EDXAPP_ENABLE_NEWRELIC %}
+{% set executable = EDXAPP_NEWRELIC_EXECUTABLE + 'run-program' + edxapp_venv_dir + '/bin/gunicorn' %}
+{% else %}
+{% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
+{% endif %}
+
 {% if ansible_processor|length > 0 %}
-command={{ edxapp_venv_dir }}/bin/gunicorn --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
+command={{ executable }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
 {% else %}
-command={{ edxapp_venv_dir }}/bin/gunicorn --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
+command={{ executable }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
 {% endif %}
 
 user={{ common_web_user }}