Use find by regex for archive index in index cleaner (#1693)

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Jul 26, 2019 · f6fc248 · f6fc248
1 parent 5cd5752
commit f6fc248
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plugin/storage/es/esCleaner.py b/plugin/storage/es/esCleaner.py
@@ -83,9 +83,10 @@ def filter_main_indices_rollover(ilo, prefix):
 def filter_archive_indices_rollover(ilo, prefix):
     # Remove only rollover archive indices
     # Do not remove active write archive index
+    ilo.filter_by_regex(kind='regex', value=prefix + "jaeger-span-archive-\d{6}")
+    empty_list(ilo, "No indices to delete")
     ilo.filter_by_alias(aliases=[prefix + 'jaeger-span-archive-write'], exclude=True)
     empty_list(ilo, "No indices to delete")
-    ilo.filter_by_alias(aliases=[prefix + 'jaeger-span-archive-read'])
     ilo.filter_by_age(source='creation_date', direction='older', unit='days', unit_count=int(sys.argv[1]))