From bf77711211adde8e2493f05b8cf772031cf31608 Mon Sep 17 00:00:00 2001 From: Evgenia Badiyanova Date: Tue, 23 Mar 2021 14:31:19 -0400 Subject: [PATCH] Fix chart-name filter Relates to: https://github.com/elastic/rally/pull/1213 --- esrally/chart_generator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/esrally/chart_generator.py b/esrally/chart_generator.py index cdc8fb128..6b3906169 100644 --- a/esrally/chart_generator.py +++ b/esrally/chart_generator.py @@ -868,7 +868,7 @@ def gc(title, environment, race_config): "template": "{{message}}", "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") AND ((NOT _exists_:chart) OR chart:gc) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -961,7 +961,7 @@ def merge_time(title, environment, race_config): "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") " f"AND ((NOT _exists_:chart) OR chart:merge_times) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -1048,7 +1048,7 @@ def merge_count(title, environment, race_config): "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") " f"AND ((NOT _exists_:chart) OR chart:merge_count) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -1140,7 +1140,7 @@ def io(title, environment, race_config): "template": "{{message}}", "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") AND ((NOT _exists_:chart) OR chart:io) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -1255,7 +1255,7 @@ def segment_memory(title, environment, race_config): "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") " f"AND ((NOT _exists_:chart) OR chart:segment_memory) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -1417,7 +1417,7 @@ def query(environment, race_config, q): "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{race_config.track}\") " f"AND ((NOT _exists_:chart) OR chart:query) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp", @@ -1511,7 +1511,7 @@ def index(environment, race_configs, title): "index_pattern": "rally-annotations", "query_string": f"((NOT _exists_:track) OR track:\"{t}\") " f"AND ((NOT _exists_:chart) OR chart:indexing) " - f"AND ((NOT _exists_:chart_name) OR chart:\"{title}\") AND environment:\"{environment}\"", + f"AND ((NOT _exists_:chart-name) OR chart-name:\"{title}\") AND environment:\"{environment}\"", "id": str(uuid.uuid4()), "color": "rgba(102,102,102,1)", "time_field": "race-timestamp",