Merge branch 'edx-west/release' of github.com:edx/configuration into edx-west/release

playbooks/roles/datadog/files/usr/share/datadog/agent/nginx_log_http_response_counter.py

@@ -76,7 +76,7 @@ def event_example(logger, line):
      'timestamp': 1384313730}
 
     """
-    raise Exception, "Do not use this method."
+    raise Exception, "Do not use this method. It murders their servers."
     import time
     from datetime import datetime
     e = None

playbooks/roles/datadog/tasks/main.yml

@@ -80,7 +80,6 @@
   template: dest=/etc/dd-agent/conf.d/nginx.yaml src=nginx.yaml.j2 owner=root group=root mode=0644
   notify:
     - datadog | restart the datadog service
-  when: nginx_sites is defined
   tags:
     - datadog
 
@@ -99,7 +98,7 @@
     dest="/etc/dd-agent/datadog.conf" 
     "line=hostname:{{ansible_hostname}}.{{environment_tag}}"
     state=present 
-    "regexp=^\#?\s*hostname:.+$"
+    "regexp=^\s*#?\s*hostname\s*:.+$"
   notify:
     - datadog | restart the datadog service
   tags:
@@ -110,20 +109,18 @@
     dest="/etc/dd-agent/datadog.conf" 
     "line=dogstatsd_interval:10"
     state=present 
-    "regexp=^\#?\s*dogstatsd_interval:.+$"
+    "regexp=^\s*#?\s*dogstatsd_interval\s*:.+$"
   notify:
     - datadog | restart the datadog service
   tags:
     - datadog
 
 - name: datadog | update dogstreams
-  lineinfile:
+  lineinfile: 
     dest="/etc/dd-agent/datadog.conf" 
-    "line=dogstreams:{{nginx_log_dir}}/access.log:nginx_log_http_response_counter:count"
+    line='dogstreams:{{nginx_log_dir}}/access.log:nginx_log_http_response_counter:count'
     state=present 
-    insertafter=EOF 
-    "regexp=^\#?\s*dogstreams:.+$"
-  when: nginx_sites is defined
+    regexp='^\s*#?\s*dogstreams\s*:.+$'
   notify:
     - datadog | restart the datadog service
   tags:
@@ -132,7 +129,7 @@
 - name: datadog | update api-key
   lineinfile: 
     dest="/etc/dd-agent/datadog.conf" 
-    "regexp=^api_key:.*"
+    "regexp=^api_key\s*:.*"
     "line=api_key:{{ common_dd_api_key }}"
   notify:
     - datadog | restart the datadog service

playbooks/roles/supervisor/templates/supervisord.conf.j2

@@ -24,8 +24,8 @@ serverurl=unix://{{ supervisor_data_dir }}/supervisor.sock ; use a unix:// URL
 ; interpreted as relative to this file.  Included files *cannot*
 ; include files themselves.
 
-[inet_http_server]
-port = {{ SUPERVISOR_HTTP_BIND_IP }}:{{ supervisor_http_bind_port }}
+;[inet_http_server]
+;port = {{ SUPERVISOR_HTTP_BIND_IP }}:{{ supervisor_http_bind_port }}
 
 [include]
 files = {{ supervisor_cfg_dir }}/*.conf