Some es-rollover fixes

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
jaegertracing · Sep 11, 2021 · dbd0e3a · dbd0e3a
1 parent dbe6749
commit dbd0e3a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 18 deletions.
diff --git a/cmd/es-rollover/app/flags.go b/cmd/es-rollover/app/flags.go
@@ -49,7 +49,7 @@ func AddFlags(flags *flag.FlagSet) {
 	flags.String(username, "", "The username required by storage")
 	flags.String(password, "", "The password required by storage")
 	flags.Bool(useILM, false, "Use ILM to manage jaeger indices")
-	flags.String(ilmPolicyName, "", "The name of the ILM policy to use if ILM is active")
+	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")
 }
 

diff --git a/cmd/es-rollover/app/index_options.go b/cmd/es-rollover/app/index_options.go
@@ -35,18 +35,18 @@ func RolloverIndices(archive bool, prefix string) []IndexOption {
 		return []IndexOption{
 			{
 				Prefix:       strings.TrimLeft(fmt.Sprintf("%s-jaeger-span-archive", prefix), "-"),
-				TemplateName: strings.TrimLeft(fmt.Sprintf("%s-jaeger-span", prefix), "-"),
+				TemplateName: "jaeger-span",
 			},
 		}
 	}
 	return []IndexOption{
 		{
 			Prefix:       strings.TrimLeft(fmt.Sprintf("%s-jaeger-span", prefix), "-"),
-			TemplateName: strings.TrimLeft(fmt.Sprintf("%s-jaeger-span", prefix), "-"),
+			TemplateName: "jaeger-span",
 		},
 		{
 			Prefix:       strings.TrimLeft(fmt.Sprintf("%s-jaeger-service", prefix), "-"),
-			TemplateName: strings.TrimLeft(fmt.Sprintf("%s-jaeger-service", prefix), "-"),
+			TemplateName: "jaeger-service",
 		},
 	}
 }

diff --git a/cmd/es-rollover/app/index_options_test.go b/cmd/es-rollover/app/index_options_test.go
@@ -61,7 +61,7 @@ func TestRolloverIndices(t *testing.T) {
 			expected: []expectedValues{
 				{
 					prefix:               "mytenant-jaeger-span-archive",
-					templateName:         "mytenant-jaeger-span",
+					templateName:         "jaeger-span",
 					readAliasName:        "mytenant-jaeger-span-archive-read",
 					writeAliasName:       "mytenant-jaeger-span-archive-write",
 					initialRolloverIndex: "mytenant-jaeger-span-archive-000001",
@@ -87,14 +87,14 @@ func TestRolloverIndices(t *testing.T) {
 			expected: []expectedValues{
 				{
 					prefix:               "mytenant-jaeger-span",
-					templateName:         "mytenant-jaeger-span",
+					templateName:         "jaeger-span",
 					readAliasName:        "mytenant-jaeger-span-read",
 					writeAliasName:       "mytenant-jaeger-span-write",
 					initialRolloverIndex: "mytenant-jaeger-span-000001",
 				},
 				{
 					prefix:               "mytenant-jaeger-service",
-					templateName:         "mytenant-jaeger-service",
+					templateName:         "jaeger-service",
 					readAliasName:        "mytenant-jaeger-service-read",
 					writeAliasName:       "mytenant-jaeger-service-write",
 					initialRolloverIndex: "mytenant-jaeger-service-000001",

diff --git a/cmd/es-rollover/app/init/action.go b/cmd/es-rollover/app/init/action.go
@@ -142,7 +142,7 @@ func (c Action) init(version uint, indexset app.IndexOption) error {
 		aliases = append(aliases, client.Alias{
 			Index:        index,
 			Name:         writeAlias,
-			IsWriteIndex: true,
+			IsWriteIndex: c.Config.UseILM,
 		})
 	}
 

diff --git a/cmd/es-rollover/app/init/action_test.go b/cmd/es-rollover/app/init/action_test.go
@@ -189,7 +189,7 @@ func TestRolloverAction(t *testing.T) {
 				indexClient.On("GetJaegerIndices", "").Return([]client.Index{}, nil)
 				indexClient.On("CreateAlias", []client.Alias{
 					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-read", IsWriteIndex: false},
-					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-write", IsWriteIndex: true},
+					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-write", IsWriteIndex: false},
 				}).Return(errors.New("error creating aliases"))
 			},
 			expectedErr: errors.New("error creating aliases"),
@@ -209,7 +209,7 @@ func TestRolloverAction(t *testing.T) {
 				indexClient.On("GetJaegerIndices", "").Return([]client.Index{}, nil)
 				indexClient.On("CreateAlias", []client.Alias{
 					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-read", IsWriteIndex: false},
-					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-write", IsWriteIndex: true},
+					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-write", IsWriteIndex: false},
 				}).Return(nil)
 
 			},
@@ -221,6 +221,29 @@ func TestRolloverAction(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "create rollover index with ilm",
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) {
+				clusterClient.On("Version").Return(uint(7), nil)
+				indexClient.On("CreateTemplate", mock.Anything, "jaeger-span").Return(nil)
+				indexClient.On("CreateIndex", "jaeger-span-archive-000001").Return(nil)
+				indexClient.On("GetJaegerIndices", "").Return([]client.Index{}, nil)
+				ilmClient.On("Exists", "jaeger-ilm").Return(true, nil)
+				indexClient.On("CreateAlias", []client.Alias{
+					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-read", IsWriteIndex: false},
+					{Index: "jaeger-span-archive-000001", Name: "jaeger-span-archive-write", IsWriteIndex: true},
+				}).Return(nil)
+
+			},
+			expectedErr: nil,
+			config: Config{
+				Config: app.Config{
+					Archive:       true,
+					UseILM:        true,
+					ILMPolicyName: "jaeger-ilm",
+				},
+			},
+		},
 	}
 
 	for _, test := range tests {

diff --git a/cmd/es-rollover/app/rollover/action.go b/cmd/es-rollover/app/rollover/action.go
@@ -67,5 +67,8 @@ func (a *Action) rollover(indexSet app.IndexOption) error {
 			Name:  readAlias,
 		})
 	}
-	return a.IndicesClient.CreateAlias(aliases)
+	if len(aliases) > 0 {
+		return a.IndicesClient.CreateAlias(aliases)
+	}
+	return nil
 }
diff --git a/cmd/es-rollover/main.go b/cmd/es-rollover/main.go
@@ -16,7 +16,7 @@ package main
 
 import (
 	"flag"
-	"log"
+	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -46,10 +46,11 @@ func main() {
 	// Init command
 	initCfg := &initialize.Config{}
 	initCommand := &cobra.Command{
-		Use:   "init http://HOSTNAME:PORT",
-		Short: "creates indices and aliases",
-		Long:  "creates indices and aliases",
-		Args:  cobra.ExactArgs(1),
+		Use:          "init http://HOSTNAME:PORT",
+		Short:        "creates indices and aliases",
+		Long:         "creates indices and aliases",
+		Args:         cobra.ExactArgs(1),
+		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return app.ExecuteAction(app.ActionExecuteOptions{
 				Args:     args,
@@ -144,7 +145,7 @@ func main() {
 	addSubCommand(v, rootCmd, lookbackCommand, lookbackCfg.AddFlags)
 
 	if err := rootCmd.Execute(); err != nil {
-		log.Fatalln(err)
+		os.Exit(1)
 	}
 }
 

diff --git a/scripts/es-integration-test.sh b/scripts/es-integration-test.sh
@@ -94,7 +94,6 @@ run_integration_test() {
 run_token_propagation_test() {
   local distro=$1
   build_query
-  make test-compile-es-scripts
   setup_query ${distro} &
   local pid=$!
   make token-propagation-integration-test