From 93ff2fa01105c4bc30feb1df1e7ba008f9175b8f Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Tue, 6 Aug 2024 18:32:40 +0000 Subject: [PATCH] Switch from _cat/indices to {index}/_count for reliable doc count Signed-off-by: Peter Nied --- .../integ_test/common_operations.py | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/common_operations.py b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/common_operations.py index b1168a67e..c74ca3e9c 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/common_operations.py +++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/common_operations.py @@ -16,16 +16,16 @@ DEFAULT_INDEX_IGNORE_LIST = ["test_", ".", "searchguard", "sg7", "security-auditlog", "reindexed-logs"] EXPECTED_BENCHMARK_DOCS = { - "geonames": {"docs.count": "1000"}, - "logs-221998": {"docs.count": "1000"}, - "logs-211998": {"docs.count": "1000"}, - "logs-231998": {"docs.count": "1000"}, - "logs-241998": {"docs.count": "1000"}, - "logs-181998": {"docs.count": "1000"}, - "logs-201998": {"docs.count": "1000"}, - "logs-191998": {"docs.count": "1000"}, - "sonested": {"docs.count": "2977"}, - "nyc_taxis": {"docs.count": "1000"} + "geonames": {"count": "1000"}, + "logs-221998": {"count": "1000"}, + "logs-211998": {"count": "1000"}, + "logs-231998": {"count": "1000"}, + "logs-241998": {"count": "1000"}, + "logs-181998": {"count": "1000"}, + "logs-201998": {"count": "1000"}, + "logs-191998": {"count": "1000"}, + "sonested": {"count": "1000"}, + "nyc_taxis": {"count": "1000"} } @@ -124,10 +124,11 @@ def get_all_index_details(cluster: Cluster, index_prefix_ignore_list=None, **kwa all_index_details = execute_api_call(cluster=cluster, path="/_cat/indices?format=json", **kwargs).json() index_dict = {} for index_details in all_index_details: - valid_index = not index_matches_ignored_index(index_name=index_details['index'], + index_name = index_details['index'] + valid_index = not index_matches_ignored_index(index_name, index_prefix_ignore_list=index_prefix_ignore_list) if index_prefix_ignore_list is None or valid_index: - index_dict[index_details['index']] = index_details + index_dict[index_name] = execute_api_call(cluster=cluster, path=f"/{index_name}/_count?format=json", **kwargs).json() return index_dict