fix(es): Treat index date separator as literal

Signed-off-by: viiccwen <vicwen@apache.org>

Author: viiccwen

cmd/es-index-cleaner/app/index_filter.go

@@ -41,7 +41,8 @@ func (i *IndexFilter) filterByPattern(indices []esclient.Index) []esclient.Index
 	case i.Rollover:
 		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies|sampling)-\\d{6}", i.IndexPrefix))
 	default:
-		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies|sampling)-\\d{4}%s\\d{2}%s\\d{2}", i.IndexPrefix, i.IndexDateSeparator, i.IndexDateSeparator))
+		dateSeparator := regexp.QuoteMeta(i.IndexDateSeparator)
+		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies|sampling)-\\d{4}%s\\d{2}%s\\d{2}", i.IndexPrefix, dateSeparator, dateSeparator))
 	}
 
 	var filtered []esclient.Index

cmd/es-index-cleaner/app/index_filter_test.go

@@ -63,6 +63,16 @@ func runIndexFilterTest(t *testing.T, prefix string) {
 			CreationTime: time.Date(2020, time.August, 5, 15, 0, 0, 0, time.UTC),
 			Aliases:      map[string]bool{},
 		},
+		{
+			Index:        prefix + "jaeger-span-2020.08.05",
+			CreationTime: time.Date(2020, time.August, 5, 15, 0, 0, 0, time.UTC),
+			Aliases:      map[string]bool{},
+		},
+		{
+			Index:        prefix + "jaeger-span-2020x08x05",
+			CreationTime: time.Date(2020, time.August, 5, 15, 0, 0, 0, time.UTC),
+			Aliases:      map[string]bool{},
+		},
 		{
 			Index:        prefix + "jaeger-span-archive",
 			CreationTime: time.Date(2020, time.August, 1, 15, 0, 0, 0, time.UTC),
@@ -192,6 +202,23 @@ func runIndexFilterTest(t *testing.T, prefix string) {
 				},
 			},
 		},
+		{
+			name: "normal indices with dot separator match separator literally",
+			filter: &IndexFilter{
+				IndexPrefix:          prefix,
+				IndexDateSeparator:   ".",
+				Archive:              false,
+				Rollover:             false,
+				DeleteBeforeThisDate: time20200807.Add(-time.Hour * 24 * time.Duration(1)),
+			},
+			expected: []esclient.Index{
+				{
+					Index:        prefix + "jaeger-span-2020.08.05",
+					CreationTime: time.Date(2020, time.August, 5, 15, 0, 0, 0, time.UTC),
+					Aliases:      map[string]bool{},
+				},
+			},
+		},
 		{
 			name: "normal indices, remove older 0 days - it should remove all indices",
 			filter: &IndexFilter{