fix xid errors

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

health-events-analyzer/pkg/config/rules.go

@@ -20,17 +20,11 @@ import (
 	"github.com/nvidia/nvsentinel/commons/pkg/configmanager"
 )
 
-type SequenceStep struct {
-	Criteria   map[string]interface{} `toml:"criteria"`
-	ErrorCount int                    `toml:"errorCount"`
-}
-
 type HealthEventsAnalyzerRule struct {
-	Name              string         `toml:"name"`
-	Description       string         `toml:"description"`
-	TimeWindow        string         `toml:"time_window"`
-	Sequence          []SequenceStep `toml:"sequence"`
-	RecommendedAction string         `toml:"recommended_action"`
+	Name              string   `toml:"name"`
+	Description       string   `toml:"description"`
+	Stage             []string `toml:"stage"`
+	RecommendedAction string   `toml:"recommended_action"`
 }
 
 type TomlConfig struct {

health-events-analyzer/pkg/parser/parser.go

@@ -25,6 +25,80 @@ import (
 	datamodels "github.com/nvidia/nvsentinel/data-models/pkg/model"
 )
 
+// ParseSequenceStage parses a JSON stage string and replaces "this." references with actual event values
+func ParseSequenceStage(stage string, event datamodels.HealthEventWithStatus) (map[string]interface{}, error) {
+	var stageMap map[string]interface{}
+	if err := json.Unmarshal([]byte(stage), &stageMap); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal stage '%s': %w", stage, err)
+	}
+
+	for key, value := range stageMap {
+		processedValue, err := processValue(value, event)
+		if err != nil {
+			return nil, err
+		}
+
+		stageMap[key] = processedValue
+	}
+
+	return stageMap, nil
+}
+
+// processValue recursively processes any value type and replaces "this." references with actual event values
+func processValue(value interface{}, event datamodels.HealthEventWithStatus) (interface{}, error) {
+	switch v := value.(type) {
+	case string:
+		if strings.HasPrefix(v, "this.") {
+			fieldPath := strings.TrimPrefix(v, "this.")
+
+			resolvedValue, err := getValueFromPath(fieldPath, event)
+			if err != nil {
+				return nil, fmt.Errorf("error in getting value from path '%s': %w", fieldPath, err)
+			}
+
+			return resolvedValue, nil
+		}
+
+		return v, nil
+	case map[string]interface{}:
+		return processMapValue(v, event)
+	case []interface{}:
+		return processArrayValue(v, event)
+	default:
+		return v, nil
+	}
+}
+
+func processMapValue(v map[string]interface{}, event datamodels.HealthEventWithStatus) (map[string]interface{}, error) {
+	result := make(map[string]interface{})
+
+	for key, val := range v {
+		processedVal, err := processValue(val, event)
+		if err != nil {
+			return nil, err
+		}
+
+		result[key] = processedVal
+	}
+
+	return result, nil
+}
+
+func processArrayValue(v []interface{}, event datamodels.HealthEventWithStatus) ([]interface{}, error) {
+	result := make([]interface{}, len(v))
+
+	for i, val := range v {
+		processedVal, err := processValue(val, event)
+		if err != nil {
+			return nil, err
+		}
+
+		result[i] = processedVal
+	}
+
+	return result, nil
+}
+
 // ParseSequenceString converts a criteria map into a database filter map
 // This uses the same map[string]interface{} type as store-client filters
 func ParseSequenceString(