Skip to content

Commit e83cd91

Browse files
[8.1] Update is_xpack_template() in wupe_cluster()
Co-authored-by: Seth Michael Larson <[email protected]>
1 parent a0a7263 commit e83cd91

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

test_elasticsearch/utils.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -416,26 +416,24 @@ def wait_for_cluster_state_updates_to_finish(client, timeout=30):
416416

417417

418418
def is_xpack_template(name):
419-
if ".monitoring-" in name:
419+
if name.startswith(".monitoring-"):
420420
return True
421-
if ".watch" in name or ".triggered_watches" in name:
421+
elif name.startswith(".watch") or name.startswith(".triggered_watches"):
422422
return True
423-
if ".data-frame-" in name:
423+
elif name.startswith(".data-frame-"):
424424
return True
425-
if ".ml-" in name:
425+
elif name.startswith(".ml-"):
426426
return True
427-
if ".transform-" in name:
427+
elif name.startswith(".transform-"):
428+
return True
429+
elif name.startswith(".deprecation-"):
428430
return True
429431
if name in {
430432
".watches",
431-
"logstash-index-template",
432-
".logstash-management",
433433
"security_audit_log",
434434
".slm-history",
435435
".async-search",
436-
".geoip_databases",
437436
"saml-service-provider",
438-
"ilm-history",
439437
"logs",
440438
"logs-settings",
441439
"logs-mappings",
@@ -446,6 +444,9 @@ def is_xpack_template(name):
446444
"synthetics-settings",
447445
"synthetics-mappings",
448446
".snapshot-blob-cache",
447+
"ilm-history",
448+
"logstash-index-template",
449+
"security-index-template",
449450
"data-streams-mappings",
450451
}:
451452
return True

0 commit comments

Comments
 (0)