Merge branch 'master' into fix/btalbot/studio-sasscleanup

Gemfile

-source :rubygems
+source 'https://rubygems.org'
 gem 'rake', '~> 10.0.3'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

cms/envs/aws.py

@@ -62,3 +62,6 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 MODULESTORE = AUTH_TOKENS['MODULESTORE']
 CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE']
+
+# Datadog for events!
+DATADOG_API = AUTH_TOKENS.get("DATADOG_API")
\ No newline at end of file

cms/one_time_startup.py

+from dogapi import dog_http_api, dog_stats_api
+from django.conf import settings
+
+if hasattr(settings, 'DATADOG_API'):
+    dog_http_api.api_key = settings.DATADOG_API
+    dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)

cms/urls.py

 from django.conf import settings
 from django.conf.urls import patterns, include, url
+from . import one_time_startup
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin

common/djangoapps/heartbeat/views.py

@@ -2,8 +2,9 @@ import json
 from datetime import datetime
 from django.http import HttpResponse
 from xmodule.modulestore.django import modulestore
+from dogapi import dog_stats_api
 
-
+@dog_stats_api.timed('edxapp.heartbeat')
 def heartbeat(request):
     """
     Simple view that a loadbalancer can check to verify that the app is up

common/djangoapps/student/management/commands/pearson_transfer.py

@@ -10,6 +10,7 @@ import paramiko
 import boto
 
 dog_http_api.api_key = settings.DATADOG_API
+dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)
 
 
 class Command(BaseCommand):

github-requirements.txt

@@ -3,4 +3,3 @@
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
 -e git://github.com/MITx/django-wiki.git@e2e84558#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
--e git://github.com/MITx/dogapi.git@003a4fc9#egg=dogapi

lms/one_time_startup.py

+from dogapi import dog_http_api, dog_stats_api
+from django.conf import settings
+
+if hasattr(settings, 'DATADOG_API'):
+    dog_http_api.api_key = settings.DATADOG_API
+    dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)

lms/urls.py

@@ -3,6 +3,9 @@ from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.conf.urls.static import static
 from django.views.generic import RedirectView
+
+from . import one_time_startup
+
 import django.contrib.auth.views
 
 # Uncomment the next two lines to enable the admin:

requirements.txt

@@ -58,3 +58,4 @@ ipython==0.13.1
 xmltodict==0.4.1
 paramiko==1.9.0
 Pillow==1.7.8
+dogapi==1.2.1