From ac9d4237c1ae7ee8ab20db35b52c773f2782470b Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Thu, 9 Nov 2017 20:23:28 -0800
Subject: [PATCH] Added /healthcheck endpoint for integrations with envoy
 (#3819)

* fixed mergeconflicts

* fixed mergeconflicts forreal this time

* added healthcheck test
---
 superset/views/core.py | 3 +++
 tests/core_tests.py    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/superset/views/core.py b/superset/views/core.py
index 73daeac6ad6ba..19827b1a8eb14 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -582,6 +582,9 @@ class LogModelView(SupersetModelView):
 def health():
     return "OK"
 
+@app.route('/healthcheck')
+def healthcheck():
+    return "OK"
 
 @app.route('/ping')
 def ping():
diff --git a/tests/core_tests.py b/tests/core_tests.py
index c7c2ff9a1625e..75c9871adc212 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -271,6 +271,7 @@ def test_doctests(self):
 
     def test_misc(self):
         assert self.get_resp('/health') == "OK"
+        assert self.get_resp('/healthcheck') == "OK"
         assert self.get_resp('/ping') == "OK"
 
     def test_testconn(self, username='admin'):