check_temperature: return sensors sorted

Author: sni

pkg/snclient/check_temperature.go

@@ -58,6 +58,7 @@ func (l *CheckTemperature) Build() *CheckData {
 			{name: "max", description: "max value supplied from sensor"},
 			{name: "min", description: "min value supplied from sensor"},
 		},
+		listSorted: []string{"label"},
 		exampleDefault: `
     check_temperature
     OK - Package id 0: 65.0 °C, Core 0: 62.0 °C, Core 1: 61.0 °C, Core 2: 65.0 °C |...

pkg/snclient/checkdata.go

@@ -124,6 +124,7 @@ type CheckData struct {
 	output                 string
 	implemented            Implemented
 	attributes             []CheckAttribute
+	listSorted             []string // sort result list by this keys
 	exampleDefault         string
 	exampleArgs            string
 	timezone               *time.Location // timezone used for date output set by --timezone
@@ -148,6 +149,7 @@ func (cd *CheckData) Finalize() (*CheckResult, error) {
 
 	// apply final filter
 	cd.listData = cd.Filter(cd.filter, cd.listData)
+	cd.listData = cd.sortList(cd.listData, cd.listSorted)
 
 	if cd.result == nil {
 		cd.result = &CheckResult{}
@@ -550,6 +552,35 @@ func (cd *CheckData) Filter(conditions ConditionList, data []map[string]string)
 	return result
 }
 
+func (cd *CheckData) sortList(listData []map[string]string, keys []string) []map[string]string {
+	if len(keys) == 0 {
+		return listData
+	}
+
+	slices.SortStableFunc(listData, func(a, b map[string]string) int {
+		sortA := []string{}
+		sortB := []string{}
+		for _, k := range keys {
+			sortA = append(sortA, a[k])
+			sortB = append(sortB, b[k])
+		}
+
+		strA := utils.ReplaceNumbersWithZeroPadded(strings.Join(sortA, ";"), 10)
+		strB := utils.ReplaceNumbersWithZeroPadded(strings.Join(sortB, ";"), 10)
+
+		switch {
+		case strA == strB:
+			return 0
+		case strA > strB:
+			return 1
+		default:
+			return -1
+		}
+	})
+
+	return listData
+}
+
 // parseStateString translates string naemon state to int64
 func (cd *CheckData) parseStateString(state string) int64 {
 	switch strings.ToLower(state) {

pkg/utils/utils.go

@@ -664,3 +664,14 @@ func ReplaceCommonPasswordPattern(str string) string {
 
 	return str
 }
+
+func ReplaceNumbersWithZeroPadded(s string, padding int) string {
+	format := fmt.Sprintf("%%0%dd", padding)
+	re := regexp.MustCompile(`\d+`)
+
+	return re.ReplaceAllStringFunc(s, func(numStr string) string {
+		num, _ := strconv.Atoi(numStr)
+
+		return fmt.Sprintf(format, num)
+	})
+}