fix using condition alias on nested filters

Changes

@@ -5,6 +5,7 @@ next:
          - fix evaluating nested filter conditions
          - fix check_drivesize missing performance data when using free_bytes threshold (#136)
          - fix check_http/check_tcp/check_dns help (#135)
+         - fix using condition alias on nested filters
          - update windows exporter to 0.26.1
 
 0.26     Wed Jul 17 15:23:37 CEST 2024

pkg/snclient/check_service_linux.go

@@ -53,6 +53,11 @@ There is a specific [check_service for windows](../check_service_windows) as wel
 		result: &CheckResult{
 			State: CheckExitOK,
 		},
+		conditionAlias: map[string]map[string]string{
+			"state": {
+				"started": "running",
+			},
+		},
 		args: map[string]CheckArgument{
 			"service": {
 				value:           &l.services,

pkg/snclient/checkdata.go

@@ -851,6 +851,7 @@ func (cd *CheckData) setFallbacks(applyDefaultFilter bool, defaultWarning, defau
 }
 
 // apply condition aliases to all filter/warn/crit/ok conditions.
+// this is useful for example in service checks, when people match for state running / started
 func (cd *CheckData) applyConditionAlias() {
 	if len(cd.conditionAlias) == 0 {
 		return
@@ -862,12 +863,12 @@ func (cd *CheckData) applyConditionAlias() {
 }
 
 // apply condition aliases to given conditions.
-func (cd *CheckData) applyConditionAliasList(cond ConditionList) {
-	for _, cond := range cond {
+func (cd *CheckData) applyConditionAliasList(condList ConditionList) {
+	for _, cond := range condList {
 		if len(cond.group) > 0 {
 			cd.applyConditionAliasList(cond.group)
 
-			return
+			continue
 		}
 
 		for replaceKeyword, aliasMap := range cd.conditionAlias {

pkg/snclient/condition_test.go

@@ -206,3 +206,22 @@ func TestConditionPreCheck(t *testing.T) {
 		assert.Equalf(t, check.expectPre, ok, fmt.Sprintf("final check returned: %v", ok))
 	}
 }
+
+func TestConditionAlias(t *testing.T) {
+	filterStr := `( name = 'xinetd' or name like 'other' ) and state = 'started'`
+	cond, err := NewCondition(filterStr)
+	require.NoError(t, err)
+
+	check := &CheckData{
+		filter: ConditionList{cond},
+		conditionAlias: map[string]map[string]string{
+			"state": {
+				"started": "running",
+			},
+		},
+	}
+	check.applyConditionAlias()
+
+	check.filter[0].original = "" // avoid shortcut String builder
+	assert.Containsf(t, check.filter[0].String(), `state = running`, "filter condition replaced")
+}