From 81305061a06ecc0ba497fc05c58c25a614b047a3 Mon Sep 17 00:00:00 2001 From: Tao Feng Date: Fri, 10 Apr 2020 14:07:57 -0700 Subject: [PATCH] Change default ES dashboard search query (#239) --- databuilder/extractor/neo4j_search_data_extractor.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databuilder/extractor/neo4j_search_data_extractor.py b/databuilder/extractor/neo4j_search_data_extractor.py index fcf2bcfd0..efd79f124 100644 --- a/databuilder/extractor/neo4j_search_data_extractor.py +++ b/databuilder/extractor/neo4j_search_data_extractor.py @@ -82,9 +82,9 @@ class Neo4jSearchDataExtractor(Extractor): OPTIONAL MATCH (db)-[read:READ_BY]->(user:User) OPTIONAL MATCH (db)-[:HAS_QUERY]->(query:Query) with db, dbg, db_descr, dbg_descr, cluster, last_exec, query, SUM(read.read_count) AS total_usage - return dbg.name as dashboard_group, db.name as dashboard_name, cluster.name as cluster, + return dbg.name as group_name, db.name as name, cluster.name as cluster, coalesce(db_descr.description, '') as description, - coalesce(dbg.description, '') as dashboard_group_description, dbg.dashboard_group_url as group_url, + coalesce(dbg.description, '') as group_description, dbg.dashboard_group_url as group_url, db.dashboard_url as url, db.key as uri, 'mode' as product, last_exec.timestamp as last_successful_run_timestamp, COLLECT(DISTINCT query.name) as query_names, diff --git a/setup.py b/setup.py index 445a8efa2..631da4147 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -__version__ = '2.5.2' +__version__ = '2.5.3' requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt') with open(requirements_path) as requirements_file: