Merge pull request #894 from mitodl/server-status-#889

Replaced the status app with django-server-status
mitodl · Mar 14, 2016 · de98b3b · de98b3b
2 parents 72ca6d1 + bc09c24
commit de98b3b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 260 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1 @@
+STATUS_TOKEN=
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,20 +2,24 @@ db:
   image: postgres
   ports:
     - "5432"
+
 redis:
   image: redis
   ports:
     - "6379"
+
 elastic:
   image: elasticsearch
   command: elasticsearch -Des.network.host=0.0.0.0
   ports:
     - "9200"
+
 stats:
   image: kamon/grafana_graphite
   ports:
     - "8125/udp:8125/udp"
     - "8071:80"
+
 web:
   build: .
   mem_limit: 384m
@@ -45,13 +49,15 @@ web:
     CELERY_RESULT_BACKEND: redis://redis:6379/4
     BROKER_URL: redis://redis:6379/4
     HAYSTACK_URL: elastic:9200
+  env_file: .env
   ports:
     - "8070:8070"
   links:
     - db
     - redis
     - elastic
     - stats
+
 celery:
   image: lore_web
   mem_limit: 384m

diff --git a/lore/settings.py b/lore/settings.py
@@ -98,6 +98,7 @@ def get_var(name, default):
     'search',
     'roles',
     'xanalytics',
+    'server_status',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -374,6 +375,7 @@ def get_var(name, default):
 }
 
 # Celery
+USE_CELERY = True
 BROKER_URL = get_var("BROKER_URL", get_var("REDISCLOUD_URL", None))
 CELERY_RESULT_BACKEND = get_var(
     "CELERY_RESULT_BACKEND", get_var("REDISCLOUD_URL", None)
@@ -396,7 +398,8 @@ def get_var(name, default):
 
 XANALYTICS_URL = get_var('XANALYTICS_URL', "")
 
-# Token required to access the status page.
+# server-status
+HEALTH_CHECK = ['CELERY', 'REDIS', 'POSTGRES', 'ELASTIC_SEARCH']
 STATUS_TOKEN = get_var(
     "STATUS_TOKEN",
     "7E17C32A63B2810F0053DE454FC8395CA3262CCB8392D2307887C5E67F132550"

diff --git a/requirements.txt b/requirements.txt
@@ -42,3 +42,4 @@ beautifulsoup4==4.4.1
 
 # Application monitoring requirements
 newrelic==2.58.1.44
+django-server-status==0.3
diff --git a/status/__init__.py b/status/__init__.py
diff --git a/status/tests/__init__.py b/status/tests/__init__.py
diff --git a/status/tests/test_status.py b/status/tests/test_status.py
diff --git a/status/views.py b/status/views.py
diff --git a/ui/urls.py b/ui/urls.py
@@ -20,7 +20,6 @@
 from django.conf.urls import include, url
 from django.contrib import admin
 
-from status.views import status
 from ui.views import (
     welcome,
     create_repo,
@@ -54,7 +53,7 @@
     ),
     url(r'^repositories/(?P<repo_slug>[-\w]+)/import/$',
         upload, name='upload'),
-    url(r'^status/$', status, name='status'),
+    url(r'^status/', include('server_status.urls')),
 ]
 
 if (settings.DEFAULT_FILE_STORAGE ==