From 1bb60d0d07e7efcad9e9e2cfda779e2bb126796f Mon Sep 17 00:00:00 2001 From: zzzk1 Date: Sat, 18 Jan 2025 22:03:47 +0800 Subject: [PATCH] revert Signed-off-by: zzzk1 --- cmd/es-rollover/app/flags.go | 2 +- plugin/storage/integration/elasticsearch_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/es-rollover/app/flags.go b/cmd/es-rollover/app/flags.go index a364c585bb22..d3c54080f43f 100644 --- a/cmd/es-rollover/app/flags.go +++ b/cmd/es-rollover/app/flags.go @@ -47,7 +47,7 @@ func AddFlags(flags *flag.FlagSet) { flags.Bool(archive, false, "Handle archive indices") flags.String(username, "", "The username required by storage") flags.String(password, "", "The password required by storage") - flags.Bool(useILM, true, "Use ILM to manage jaeger indices") + flags.Bool(useILM, false, "Use ILM to manage jaeger indices") flags.String(ilmPolicyName, "jaeger-ilm-policy", "The name of the ILM policy to use if ILM is active") flags.Int(timeout, 120, "Number of seconds to wait for master node response") flags.Bool(skipDependencies, false, "Disable rollover for dependencies index") diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go index 3bab9cc41800..11754f6d2b9f 100644 --- a/plugin/storage/integration/elasticsearch_test.go +++ b/plugin/storage/integration/elasticsearch_test.go @@ -90,7 +90,6 @@ func (s *ESStorageIntegration) initializeES(t *testing.T, c *http.Client, allTag }) require.NoError(t, err) s.initSpanstore(t, allTagsAsFields) - s.CleanUp = func(t *testing.T) { s.esCleanUp(t) }