set default systems indices config

Author: anton.voskresensky

commands/snapshot-manual.go

@@ -31,7 +31,7 @@ func runSnapshotManual(cmd *cobra.Command, args []string) error {
 	kind := cfg.GetSnapshotManualKind()
 	value := cfg.GetSnapshotManualValue()
 	name := cfg.GetSnapshotManualName()
-	system := cfg.GetSnapshotManualSystem()
+	systemFlag := cfg.GetSnapshotManualSystem()
 
 	if value == "" {
 		return fmt.Errorf("value is required")
@@ -41,7 +41,20 @@ func runSnapshotManual(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("name is required for regex patterns")
 	}
 
-	logger.Info(fmt.Sprintf("Starting manual snapshot creation kind=%s value=%s name=%s system=%t", kind, value, name, system))
+	tempConfig := config.IndexConfig{
+		Kind:   kind,
+		Value:  value,
+		Name:   name,
+		System: systemFlag,
+	}
+
+	system := systemFlag
+	systemStr := cfg.SnapshotManualSystem
+	if systemStr == "" {
+		system = utils.IsSystem(tempConfig, value)
+	}
+
+	logger.Info(fmt.Sprintf("Starting manual snapshot creation kind=%s value=%s name=%s system=%t (auto-detected=%t)", kind, value, name, system, cfg.SnapshotManualSystem == ""))
 
 	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {

commands/snapshots.go

@@ -63,7 +63,7 @@ func runSnapshot(cmd *cobra.Command, args []string) error {
 	regularConfigs := make([]config.IndexConfig, 0)
 
 	for _, indexConfig := range indicesConfig {
-		if indexConfig.System {
+		if utils.IsSystem(indexConfig, indexConfig.Value) {
 			systemConfigs = append(systemConfigs, indexConfig)
 		} else {
 			regularConfigs = append(regularConfigs, indexConfig)

example/config-example/osctlindicesconfig.yaml

@@ -9,15 +9,13 @@ indices:
   - kind: prefix
     value: infra-elklogs
     days_count: 30
-    snapshot: false
   - kind: prefix
     value: d8-ingress
     days_count: 7
     snapshot: true
     snapshot_count_s3: 7
   - kind: prefix
     value: .kibana
-    system: true
     days_count: 30
     snapshot: true
   - kind: prefix

example/helm-example/values.yaml

@@ -88,38 +88,30 @@ osctl:
   # indices:
   #   - kind: prefix
   #     value: filebeat
-  #     system: false
   #     days_count: 5
   #     snapshot: true
   #   - kind: prefix
   #     value: d8
-  #     system: false
   #     days_count: 7
   #     snapshot: true
   #     snapshot_count_s3: 7
   #   - kind: prefix
   #     value: eventrouter
-  #     system: false
   #     days_count: 7
-  #     snapshot: false
   #   - kind: prefix
   #     value: mongo
-  #     system: false
   #     days_count: 5
   #     snapshot: true
   #   - kind: prefix
   #     value: infra
-  #     system: false
   #     days_count: 5
   #     snapshot: true
   #   - kind: prefix
   #     value: opp-fix
-  #     system: false
   #     days_count: 5
   #     snapshot: true
   #   - kind: prefix
   #     value: pim
-  #     system: false
   #     days_count: 5
   #     snapshot: true
   #   - kind: prefix

pkg/config/osctlindicesconfig.go

@@ -106,6 +106,9 @@ func ValidateOsctlIndicesConfig(config *OsctlIndicesConfig, dateFormat string) e
 			if indexConfig.Name == "" {
 				return fmt.Errorf("index config #%d: regex pattern '%s' must have 'name' field specified", i+1, indexConfig.Value)
 			}
+			if indexConfig.System {
+				return fmt.Errorf("index config #%d: regex pattern '%s' cannot have system: true (regex patterns cannot be system indices)", i+1, indexConfig.Value)
+			}
 		}
 	}
 	return nil

pkg/utils/indices.go

@@ -17,12 +17,38 @@ func IndexInfosToNames(list []opensearch.IndexInfo) []string {
 	return names
 }
 
-func MatchesIndex(indexName string, indexConfig config.IndexConfig) bool {
+func IsSystem(indexConfig config.IndexConfig, nameOrPattern string) bool {
+	if indexConfig.Kind == "regex" {
+		return false
+	}
+
+	if indexConfig.System {
+		return true
+	}
+
+	if indexConfig.Kind == "prefix" && strings.HasPrefix(nameOrPattern, ".") {
+		return true
+	}
+
+	return false
+}
 
+func MatchesIndex(indexName string, indexConfig config.IndexConfig) bool {
 	if !indexConfig.System && ShouldSkipIndex(indexName) {
 		return false
 	}
 
+	isSystemIndex := IsSystem(indexConfig, indexName)
+	isSystemConfig := IsSystem(indexConfig, indexConfig.Value)
+
+	if isSystemConfig && !isSystemIndex {
+		return false
+	}
+
+	if !isSystemConfig && isSystemIndex {
+		return false
+	}
+
 	switch indexConfig.Kind {
 	case "prefix":
 		return strings.HasPrefix(indexName, indexConfig.Value)