Merge pull request #3161 from peterbe/bug-1240107-move-healthcheck-url

fixes bug 1240107 - move /healthcheck URL

webapp-django/crashstats/crashstats/tests/test_views.py

@@ -571,48 +571,6 @@ def test_contribute_json(self):
         ok_(json.loads(''.join(response.streaming_content)))
         eq_(response['Content-Type'], 'application/json')
 
-    def test_healthcheck_elb(self):
-        response = self.client.get('/healthcheck', {'elb': 'true'})
-        eq_(response.status_code, 200)
-        eq_(json.loads(response.content)['ok'], True)
-
-        # This time, ignoring the results, make sure that running
-        # this does not cause an DB queries.
-        self.assertNumQueries(
-            0,
-            self.client.get,
-            '/healthcheck',
-            {'elb': 'true'}
-        )
-
-    @mock.patch('crashstats.crashstats.views.elasticsearch')
-    def test_healthcheck(self, mocked_elasticsearch):
-
-        es_instance = mock.MagicMock()
-
-        def fake_es_instance(**config):
-            eq_(
-                config['hosts'],
-                settings.SOCORRO_IMPLEMENTATIONS_CONFIG
-                ['elasticsearch']['elasticsearch_urls']
-            )
-            return es_instance
-
-        mocked_elasticsearch.Elasticsearch.side_effect = fake_es_instance
-        response = self.client.get('/healthcheck')
-        eq_(response.status_code, 200)
-        eq_(json.loads(response.content)['ok'], True)
-
-        es_instance.info.assert_called_with()
-
-        self.assertNumQueries(
-            1,
-            self.client.get,
-            '/healthcheck',
-        )
-
-        eq_(es_instance.info.call_count, 2)
-
     @mock.patch('requests.get')
     def test_handler500(self, rget):
         root_urlconf = __import__(

webapp-django/crashstats/crashstats/urls.py

@@ -26,9 +26,6 @@
     url('^robots\.txt$',
         views.robots_txt,
         name='robots_txt'),
-    url('^healthcheck$',
-        views.healthcheck,
-        name='healthcheck'),
     url('^home' + products + '$',
         views.home,
         name='home'),

webapp-django/crashstats/crashstats/views.py

@@ -1,7 +1,6 @@
 import copy
 import json
 import datetime
-import elasticsearch
 import logging
 import math
 import urllib
@@ -18,7 +17,6 @@
 from django.core.urlresolvers import reverse
 from django.contrib.auth.decorators import permission_required
 from django.core.cache import cache
-from django.contrib.auth.models import Permission
 from django.utils.http import urlquote
 from django.contrib import messages
 
@@ -102,28 +100,6 @@ def robots_txt(request):
     )
 
 
-def healthcheck(request):
-    if not request.GET.get('elb') in ('1', 'true'):
-        # Perform some really basic DB queries.
-        # There will always be permissions created
-        assert Permission.objects.all().count() > 0
-
-        # We should also be able to set and get a cache value
-        cache_key = '__healthcheck__'
-        cache.set(cache_key, 1, 10)
-        assert cache.get(cache_key)
-        cache.delete(cache_key)
-
-        # Do a really basic Elasticsearch query
-        es_settings = settings.SOCORRO_IMPLEMENTATIONS_CONFIG['elasticsearch']
-        es = elasticsearch.Elasticsearch(
-            hosts=es_settings['elasticsearch_urls']
-        )
-        es.info()  # will raise an error if there's a problem with the cluster
-
-    return http.JsonResponse({'ok': True})
-
-
 def has_builds(product, versions):
     contains_builds = False
     prod_versions = []

webapp-django/crashstats/monitoring/templates/monitoring/index.html

@@ -10,6 +10,8 @@
     <ul>
         <li><a href="{{ url('monitoring:crash_analysis_health') }}">Crash Analysis health</a></li>
         <li><a href="{{ url('monitoring:crontabber_status') }}">Crontabber Status</a></li>
+        <li><a href="{{ url('monitoring:healthcheck') }}">Healthcheck</a></li>
+        <li><a href="{{ url('monitoring:healthcheck') }}?elb=true">Healthcheck (for ELB)</a></li>
     </ul>
 </body>
 

webapp-django/crashstats/monitoring/tests/test_views.py

@@ -238,3 +238,50 @@ def mocked_get(url, **options):
         eq_(response.status_code, 200)
         data = json.loads(response.content)
         eq_(data['status'], 'Stale')
+
+
+class TestHealthcheckViews(BaseTestViews):
+
+    def test_healthcheck_elb(self):
+        url = reverse('monitoring:healthcheck')
+        response = self.client.get(url, {'elb': 'true'})
+        eq_(response.status_code, 200)
+        eq_(json.loads(response.content)['ok'], True)
+
+        # This time, ignoring the results, make sure that running
+        # this does not cause an DB queries.
+        self.assertNumQueries(
+            0,
+            self.client.get,
+            url,
+            {'elb': 'true'}
+        )
+
+    @mock.patch('crashstats.monitoring.views.elasticsearch')
+    def test_healthcheck(self, mocked_elasticsearch):
+
+        es_instance = mock.MagicMock()
+
+        def fake_es_instance(**config):
+            eq_(
+                config['hosts'],
+                settings.SOCORRO_IMPLEMENTATIONS_CONFIG
+                ['elasticsearch']['elasticsearch_urls']
+            )
+            return es_instance
+
+        mocked_elasticsearch.Elasticsearch.side_effect = fake_es_instance
+        url = reverse('monitoring:healthcheck')
+        response = self.client.get(url)
+        eq_(response.status_code, 200)
+        eq_(json.loads(response.content)['ok'], True)
+
+        es_instance.info.assert_called_with()
+
+        self.assertNumQueries(
+            1,
+            self.client.get,
+            url,
+        )
+
+        eq_(es_instance.info.call_count, 2)

webapp-django/crashstats/monitoring/urls.py

@@ -13,4 +13,7 @@
     url(r'^crontabber/$',
         views.crontabber_status,
         name='crontabber_status'),
+    url(r'^healthcheck/$',
+        views.healthcheck,
+        name='healthcheck'),
 )

webapp-django/crashstats/monitoring/views.py

@@ -1,12 +1,15 @@
 import datetime
 import urlparse
 
+import elasticsearch
 import isodate
 import requests
 
 from django.shortcuts import render
 from django.conf import settings
 from django.utils import timezone
+from django.contrib.auth.models import Permission
+from django.core.cache import cache
 
 from crashstats.crashstats import utils
 from crashstats.crashstats.models import CrontabberState
@@ -140,3 +143,26 @@ def crontabber_status(request):
         context['broken'] = broken
         context['blocked'] = blocked
     return context
+
+
+@utils.json_view
+def healthcheck(request):
+    if not request.GET.get('elb') in ('1', 'true'):
+        # Perform some really basic DB queries.
+        # There will always be permissions created
+        assert Permission.objects.all().count() > 0
+
+        # We should also be able to set and get a cache value
+        cache_key = '__healthcheck__'
+        cache.set(cache_key, 1, 10)
+        assert cache.get(cache_key)
+        cache.delete(cache_key)
+
+        # Do a really basic Elasticsearch query
+        es_settings = settings.SOCORRO_IMPLEMENTATIONS_CONFIG['elasticsearch']
+        es = elasticsearch.Elasticsearch(
+            hosts=es_settings['elasticsearch_urls']
+        )
+        es.info()  # will raise an error if there's a problem with the cluster
+
+    return {'ok': True}