Add: feature toggle to control if to report query results count

tanayuk · Oct 5, 2016 · d6dd95d · d6dd95d
1 parent a8fa68a
commit d6dd95d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/settings.rst b/docs/settings.rst
@@ -52,7 +52,7 @@ The follow is a list of settings and what they control:
 - **REDASH_ALLOW_SCRIPTS_IN_USER_INPUT**: disable sanitization of text input, allowing full HTML, *default "true"*
 - **REDASH_DATE_FORMAT**: *default "DD/MM/YY"*
 - **REDASH_FEATURE_ALLOW_ALL_TO_EDIT**: *default "true"*
-- **REDASH_FEATURE_TABLES_PERMISSIONS**: *default "false"*
+- **REDASH_FEATURE_SHOW_QUERY_RESULTS_COUNT**: disable/enable showing count of query results in status, *default "true"*
 - **REDASH_VERSION_CEHCK**: *default "true"*
 - **REDASH_FEATURE_DISABLE_REFRESH_QUERIES**: disable scheduled query execution, *default "false"*
 - **REDASH_BIGQUERY_HTTP_TIMEOUT**: *default "600"*

diff --git a/redash/monitor.py b/redash/monitor.py
@@ -1,4 +1,4 @@
-from redash import redis_connection, models, __version__
+from redash import redis_connection, models, __version__, settings
 
 
 def get_status():
@@ -7,8 +7,9 @@ def get_status():
     status['redis_used_memory'] = info['used_memory_human']
     status['version'] = __version__
     status['queries_count'] = models.Query.select().count()
-    status['query_results_count'] = models.QueryResult.select().count()
-    status['unused_query_results_count'] = models.QueryResult.unused().count()
+    if settings.FEATURE_SHOW_QUERY_RESULTS_COUNT:
+        status['query_results_count'] = models.QueryResult.select().count()
+        status['unused_query_results_count'] = models.QueryResult.unused().count()
     status['dashboards_count'] = models.Dashboard.select().count()
     status['widgets_count'] = models.Widget.select().count()
 

diff --git a/redash/settings.py b/redash/settings.py
@@ -202,6 +202,7 @@ def all_settings():
 FEATURE_ALLOW_ALL_TO_EDIT_QUERIES = parse_boolean(os.environ.get("REDASH_FEATURE_ALLOW_ALL_TO_EDIT", "true"))
 VERSION_CHECK = parse_boolean(os.environ.get("REDASH_VERSION_CHECK", "true"))
 FEATURE_DISABLE_REFRESH_QUERIES = parse_boolean(os.environ.get("REDASH_FEATURE_DISABLE_REFRESH_QUERIES", "false"))
+FEATURE_SHOW_QUERY_RESULTS_COUNT = parse_boolean(os.environ.get("REDASH_FEATURE_SHOW_QUERY_RESULTS_COUNT", "true"))
 
 # BigQuery
 BIGQUERY_HTTP_TIMEOUT = int(os.environ.get("REDASH_BIGQUERY_HTTP_TIMEOUT", "600"))