Merge pull request #4640 from edx/jibsheet/xqueue-cloudwatch

Allow us to set a custom cloudwatch dictionary for the metrics

CHANGELOG.md

+- XQueue
+  - Expose CLOUDWATCH_QUEUE_COUNT_METRIC which is defined XQueue's settings.py for further dictionary structure
+
 - nginx:
   - remove nginx_cfg - an internal variable that was really only used for the edx-release nginx site, which served version.{html,json} off of a nonstandard port.  The file it served was never populated.
 

playbooks/roles/xqueue/defaults/main.yml

@@ -70,6 +70,11 @@ XQUEUE_CONSUMER_DELAY: 10
 
 INSIGHTS_CSRF_COOKIE_SECURE: false
 
+# This dictionary is defined in XQueue's settings.py
+# If you want to set up cloudwatch metrics/alarms this allows
+# you a custom setting.
+XQUEUE_CLOUDWATCH_QUEUE_COUNT_METRICS: !!null
+
 # This block of config is dropped into /edx/etc/xqueue.yml
 # and is read in by xqueue.XQUEUE_SETTINGS
 XQUEUE_CONFIG:
@@ -110,6 +115,8 @@ XQUEUE_CONFIG:
       CONN_MAX_AGE: "{{ XQUEUE_MYSQL_CONN_MAX_AGE }}"
       OPTIONS: "{{ XQUEUE_MYSQL_OPTIONS }}"
   NEWRELIC_LICENSE_KEY: "{{ NEWRELIC_LICENSE_KEY | default('') }}"
+  CLOUDWATCH_QUEUE_COUNT_METRICS: "{{ XQUEUE_CLOUDWATCH_QUEUE_COUNT_METRICS }}"
+
 
 XQUEUE_VERSION: "master"
 XQUEUE_GIT_IDENTITY: !!null