Update graceful handling for missing indices to accommodate the new f…

…leet system indices plugin (#205) (#231) * Update the no index found handling to accommodate the new fleet system indices plugin * Add logging (cherry picked from commit 85d0ebf) Co-authored-by: Aleksandr Maus <[email protected]>
elastic · Apr 13, 2021 · c5e7d9a · c5e7d9a
1 parent a4be496
commit c5e7d9a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/internal/pkg/dl/actions.go b/internal/pkg/dl/actions.go
@@ -6,10 +6,13 @@ package dl
 
 import (
 	"context"
+	"errors"
 
 	"github.com/elastic/fleet-server/v7/internal/pkg/bulk"
 	"github.com/elastic/fleet-server/v7/internal/pkg/dsl"
+	"github.com/elastic/fleet-server/v7/internal/pkg/es"
 	"github.com/elastic/fleet-server/v7/internal/pkg/model"
+	"github.com/rs/zerolog/log"
 )
 
 const (
@@ -83,6 +86,10 @@ func FindActions(ctx context.Context, bulker bulk.Bulk, tmpl *dsl.Tmpl, params m
 func findActions(ctx context.Context, bulker bulk.Bulk, tmpl *dsl.Tmpl, index string, params map[string]interface{}) ([]model.Action, error) {
 	res, err := Search(ctx, bulker, tmpl, index, params)
 	if err != nil {
+		if errors.Is(err, es.ErrIndexNotFound) {
+			log.Debug().Str("index", index).Msg(es.ErrIndexNotFound.Error())
+			err = nil
+		}
 		return nil, err
 	}
 

diff --git a/internal/pkg/dl/policies_leader.go b/internal/pkg/dl/policies_leader.go
@@ -7,12 +7,15 @@ package dl
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"sync"
+	"time"
+
 	"github.com/elastic/fleet-server/v7/internal/pkg/bulk"
 	"github.com/elastic/fleet-server/v7/internal/pkg/dsl"
 	"github.com/elastic/fleet-server/v7/internal/pkg/es"
 	"github.com/elastic/fleet-server/v7/internal/pkg/model"
-	"sync"
-	"time"
+	"github.com/rs/zerolog/log"
 )
 
 var (
@@ -48,6 +51,10 @@ func SearchPolicyLeaders(ctx context.Context, bulker bulk.Bulk, ids []string, op
 	}
 	res, err := bulker.Search(ctx, []string{o.indexName}, data)
 	if err != nil {
+		if errors.Is(err, es.ErrIndexNotFound) {
+			log.Debug().Str("index", o.indexName).Msg(es.ErrIndexNotFound.Error())
+			err = nil
+		}
 		return
 	}