check_logfile: improve detection of required macros

Author: sni

Changes

@@ -4,6 +4,7 @@ next:
          - fix plugin output ending in chinese characters (#261)
          - chore: update dependencies
          - improve logging of invalid http requests
+         - check_logfile: improve detection of required macros
          - add list-combine option
 
 0.37     Sun Sep  7 11:41:00 CEST 2025

pkg/snclient/check_logfile.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/consol-monitoring/snclient/pkg/convert"
@@ -278,22 +279,22 @@ func (c *CheckLogFile) getCustomSplitFunction() bufio.SplitFunc {
 }
 
 func (c *CheckLogFile) getRequiredColumnNumbers(check *CheckData) []int {
-	// get all thresholds with prefix column
-	allThresh := append(check.warnThreshold, check.critThreshold...)
-
 	// extract all required threshold numbers
 	columnNumbers := []int{}
-	for _, thresh := range allThresh {
-		if !strings.HasPrefix(thresh.keyword, "column") {
+	for _, macro := range check.AllRequiredMacros() {
+		if !strings.HasPrefix(macro, "column") {
 			continue
 		}
-		match := numReg.FindString(thresh.keyword)
+		match := numReg.FindString(macro)
 		if match == "" {
 			continue
 		}
 		index := convert.Int(match)
 		columnNumbers = append(columnNumbers, index)
 	}
 
+	slices.Sort(columnNumbers)
+	columnNumbers = slices.Compact(columnNumbers)
+
 	return columnNumbers
 }

pkg/snclient/checkdata.go

@@ -944,6 +944,26 @@ func (cd *CheckData) HasMacro(name string) bool {
 	return false
 }
 
+// AllRequiredMacros returns a list of all required macros in the syntax attributes and thresholds.
+func (cd *CheckData) AllRequiredMacros() []string {
+	var allMacros []string
+
+	// extract macros from syntax templates
+	for _, syntax := range []string{cd.detailSyntax, cd.topSyntax, cd.okSyntax, cd.emptySyntax, cd.perfSyntax} {
+		macros := MacroNames(syntax)
+		allMacros = append(allMacros, macros...)
+	}
+
+	// append macros from all conditions
+	allMacros = append(allMacros, cd.GetAllThresholdKeywords()...)
+
+	// make list unique
+	slices.Sort(allMacros)
+	allMacros = slices.Compact(allMacros)
+
+	return allMacros
+}
+
 // 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() {
@@ -984,10 +1004,28 @@ func (cd *CheckData) HasThreshold(name string) bool {
 	if cd.hasThresholdCond(cd.critThreshold, name) {
 		return true
 	}
+	if cd.hasThresholdCond(cd.okThreshold, name) {
+		return true
+	}
 
 	return false
 }
 
+// GetAllThresholdKeywords returns a list of all keywords used in warn/crit/ok thresholds.
+func (cd *CheckData) GetAllThresholdKeywords() []string {
+	keywords := []string{}
+
+	keywords = append(keywords, cd.getAllThresholdKeywords(cd.warnThreshold)...)
+	keywords = append(keywords, cd.getAllThresholdKeywords(cd.critThreshold)...)
+	keywords = append(keywords, cd.getAllThresholdKeywords(cd.okThreshold)...)
+
+	// make list unique
+	slices.Sort(keywords)
+	keywords = slices.Compact(keywords)
+
+	return keywords
+}
+
 // hasThresholdCond returns true is the given list of conditions uses the given name at least once.
 func (cd *CheckData) hasThresholdCond(condList ConditionList, name string) bool {
 	for _, cond := range condList {
@@ -1003,6 +1041,21 @@ func (cd *CheckData) hasThresholdCond(condList ConditionList, name string) bool
 	return false
 }
 
+// hasThresholdCond returns true is the given list of conditions uses the given name at least once.
+func (cd *CheckData) getAllThresholdKeywords(condList ConditionList) []string {
+	keywords := []string{}
+
+	for _, cond := range condList {
+		if len(cond.group) > 0 {
+			keywords = append(keywords, cd.getAllThresholdKeywords(cond.group)...)
+		}
+
+		keywords = append(keywords, cond.keyword)
+	}
+
+	return keywords
+}
+
 // SetDefaultThresholdUnit sets default unit for all threshold conditions matching
 // the name and not having a unit already
 func (cd *CheckData) SetDefaultThresholdUnit(defaultUnit string, names []string) {