Adding parser for xfunctions in rule validation

Signed-off-by: Paurush Garg <[email protected]>

Author: PaurushGarg

pkg/ruler/manager.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"strings"
 	"sync"
 	"time"
 
@@ -24,6 +25,7 @@ import (
 	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context/ctxhttp"
 
+	"github.com/cortexproject/cortex/pkg/parser"
 	"github.com/cortexproject/cortex/pkg/ring/client"
 	"github.com/cortexproject/cortex/pkg/ruler/rulespb"
 )
@@ -457,19 +459,41 @@ func (*DefaultMultiTenantManager) ValidateRuleGroup(g rulefmt.RuleGroup) []error
 	}
 
 	for i, r := range g.Rules {
+		// Use Cortex parser for expression validation (supports XFunctions)
+		if r.Expr != "" {
+			if _, err := parser.ParseExpr(r.Expr); err != nil {
+				var ruleName string
+				if r.Alert != "" {
+					ruleName = r.Alert
+				} else {
+					ruleName = r.Record
+				}
+				errs = append(errs, &rulefmt.Error{
+					Group:    g.Name,
+					Rule:     i,
+					RuleName: ruleName,
+					Err:      rulefmt.WrappedError{},
+				})
+			}
+		}
+		
+		// Validate other rule fields using Prometheus validation
 		for _, err := range r.Validate(rulefmt.RuleNode{}) {
-			var ruleName string
-			if r.Alert != "" {
-				ruleName = r.Alert
-			} else {
-				ruleName = r.Record
+			// Skip expression validation errors since we handle them above
+			if !strings.Contains(err.Error(), "could not parse expression") {
+				var ruleName string
+				if r.Alert != "" {
+					ruleName = r.Alert
+				} else {
+					ruleName = r.Record
+				}
+				errs = append(errs, &rulefmt.Error{
+					Group:    g.Name,
+					Rule:     i,
+					RuleName: ruleName,
+					Err:      err,
+				})
 			}
-			errs = append(errs, &rulefmt.Error{
-				Group:    g.Name,
-				Rule:     i,
-				RuleName: ruleName,
-				Err:      err,
-			})
 		}
 	}
 

pkg/ruler/xfunction_validation_test.go

@@ -0,0 +1,51 @@
+package ruler
+
+import (
+	"testing"
+
+	"github.com/prometheus/prometheus/model/rulefmt"
+)
+
+func TestValidateRuleGroup_AcceptsXFunctions(t *testing.T) {
+	manager := &DefaultMultiTenantManager{}
+
+	// Test rule with XFunction (should now pass)
+	ruleGroupWithXFunc := rulefmt.RuleGroup{
+		Name: "test_group",
+		Rules: []rulefmt.Rule{
+			{
+				Alert: "TestAlert",
+				Expr:  "xrate(cpu_usage[5m]) > 0.8", // XFunction
+			},
+		},
+	}
+
+	errs := manager.ValidateRuleGroup(ruleGroupWithXFunc)
+	
+	// Should have no validation errors now
+	if len(errs) != 0 {
+		t.Fatalf("Expected no validation errors for XFunction after fix, got: %v", errs)
+	}
+}
+
+func TestValidateRuleGroup_AcceptsStandardFunctions(t *testing.T) {
+	manager := &DefaultMultiTenantManager{}
+
+	// Test rule with standard function (should pass)
+	ruleGroupStandard := rulefmt.RuleGroup{
+		Name: "test_group",
+		Rules: []rulefmt.Rule{
+			{
+				Alert: "TestAlert", 
+				Expr:  "rate(cpu_usage[5m]) > 0.8", // Standard function
+			},
+		},
+	}
+
+	errs := manager.ValidateRuleGroup(ruleGroupStandard)
+	
+	// Should have no validation errors
+	if len(errs) != 0 {
+		t.Fatalf("Expected no validation errors for standard function, got: %v", errs)
+	}
+}