Unverified Commit a587c0e2 by Kevin Falcone Committed by GitHub

Merge pull request #4461 from edx/jibsheet/xqueue_newrelic_config

Pass New Relic configuration down to the xqueue config
parents 9e75536b 9941ad95
......@@ -2,7 +2,8 @@
- Removed RabbitMQ in earlier changes in XQueue itself, we don't need any of the configuration
XQUEUE_RABBITMQ_USER XQUEUE_RABBITMQ_PASS XQUEUE_RABBITMQ_VHOST XQUEUE_RABBITMQ_HOSTNAME
XQUEUE_RABBITMQ_PORT XQUEUE_RABBITMQ_TLS
- Added NEWRELIC_APPNAME and NEWRELIC_LICENSE_KEY to the configuration files consumed by XQueue.
Useful for external utilities that are reporting NR metrics.
- Role edx_django_service
- Added maintenance page under the flag EDX_DJANGO_SERVICE_ENABLE_S3_MAINTENANCE.
......
......@@ -91,6 +91,7 @@ xqueue_env_config:
LOCAL_LOGLEVEL: "{{ XQUEUE_LOCAL_LOGLEVEL }}"
UPLOAD_BUCKET: "{{ XQUEUE_UPLOAD_BUCKET }}"
UPLOAD_PATH_PREFIX: "{{ XQUEUE_UPLOAD_PATH_PREFIX }}"
NEWRELIC_APPNAME: "{{ XQUEUE_NEWRELIC_APPNAME }}"
xqueue_auth_config:
AWS_ACCESS_KEY_ID: "{{ XQUEUE_AWS_ACCESS_KEY_ID }}"
......@@ -115,6 +116,7 @@ xqueue_auth_config:
ATOMIC_REQUESTS: True
CONN_MAX_AGE: "{{ XQUEUE_MYSQL_CONN_MAX_AGE }}"
OPTIONS: "{{ XQUEUE_MYSQL_OPTIONS }}"
NEWRELIC_LICENSE_KEY: "{{ NEWRELIC_LICENSE_KEY | default('') }}"
xqueue_source_repo: "https://github.com/edx/xqueue.git"
xqueue_version: 'master'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment