From 08bcd7412f90b39a4a2b74300f025798df927585 2019-03-17 13:47:04 From: Marcin Lulek Date: 2019-03-17 13:47:04 Subject: [PATCH] logs: fix for common values --- diff --git a/backend/src/appenlight/views/logs.py b/backend/src/appenlight/views/logs.py index cb409b5..196c956 100644 --- a/backend/src/appenlight/views/logs.py +++ b/backend/src/appenlight/views/logs.py @@ -198,14 +198,17 @@ def common_values(request): filter_settings = build_filter_settings_from_query_dict(request, config) resources = list(filter_settings["resource"]) tag_name = filter_settings["tags"][0]["value"][0] + + and_part = [ + {"terms": {"resource_id": list(resources)}}, + ] + if filter_settings["namespace"]: + and_part.append({"terms": {"namespace": filter_settings["namespace"]}}) query = { "query": { "filtered": { "filter": { - "and": [ - {"terms": {"resource_id": list(resources)}}, - {"terms": {"namespace": filter_settings["namespace"]}}, - ] + "and": and_part } } }