Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
a587c0e2
Unverified
Commit
a587c0e2
authored
Apr 10, 2018
by
Kevin Falcone
Committed by
GitHub
Apr 10, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4461 from edx/jibsheet/xqueue_newrelic_config
Pass New Relic configuration down to the xqueue config
parents
9e75536b
9941ad95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
CHANGELOG.md
+2
-1
playbooks/roles/xqueue/defaults/main.yml
+2
-0
No files found.
CHANGELOG.md
View file @
a587c0e2
...
...
@@ -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.
...
...
playbooks/roles/xqueue/defaults/main.yml
View file @
a587c0e2
...
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment