Merge branch 'main' into dependabot/go_modules/github.com/spf13/cobra-1.10.2

Author: sni

.golangci.yml

@@ -167,20 +167,12 @@ linters:
         text: variable name 'ok' is too short
       - path: (.+)\.go$
         text: Function 'setListenTLSConfig' has too many statements
-      - path: (.+)\.go$
-        text: Function 'ParseArgs' has too many statements
-      - path: (.+)\.go$
-        text: 'cyclomatic complexity 45 of func `.*\.parseArgs` is high'
-      - path: (.+)\.go$
-        text: Function 'parseArgs' has too many statements
       - path: (.+)\.go$
         text: Function 'parseAnyArg' has too many statements
       - path: (.+)\.go$
         text: complexity.*setListenTLSConfig
       - path: (.+)\.go$
         text: complexity.*checkFlags
-      - path: (.+)\.go$
-        text: complexity.*ParseArgs
       - path: (.+)\.go$
         text: Function 'readConfiguration' has too many statements
       - path: (.+)\.go$

Changes

@@ -2,6 +2,8 @@ This file documents the revision history for the SNClient agent.
 
 next
          - change minimum golang requirement to 1.25.5
+         - add support for recursive `script path`
+         - add support for cyclic alias check
 
 0.39     Tue Nov 18 14:22:01 CET 2025
          - optionally send HSTS header in HTTP response

docs/checks/external_commands/_index.md

@@ -110,6 +110,20 @@ restart_service = NET START "$ARG1$"
 
 If your scripts are located within the `${scripts}` folder, you can specify them using relative paths, as demonstrated in the examples. SNClient will automatically obtain the absolute path for these scripts and use it for execution. Prior to running the scripts, SNClient configures the working directory to be ${shared-dir}.
 
+
+#### Script Discovery
+
+```
+; Load all scripts in a given folder - Load all (${script path}/*) scripts in a given directory and use them as commands.
+; Any executable file is considered a script. They do not have end with an script like extension.
+; In windows, executable files cannot be discerned. It will add every file under the directory.
+; Links are followed, and if they end up under script path, they will be added as a script.
+; If path ends with ** its subdirectories will be searched as well.
+script path = ${scripts}/autoinclude
+```
+
+Scripts can also be automatically discovered and added, without defining them individually. This uses the `script path` setting. There is no way to change the alias, as they will use the scripts name and extension for their alias.
+
 #### Wrapped Scripts
 
 Specify script templates used to define script commands. These templates are expanded by scripts located in the Wrapped Scripts section. Use `%SCRIPT%` to represent the actual script and `%ARGS%` for any provided arguments.

packaging/snclient.ini

@@ -346,7 +346,11 @@ allow nasty characters = false
 ; Script root folder - Root path where all scripts are contained (You can not upload/download scripts outside this folder).
 script root = ${scripts}
 
-; Load all scripts in a given folder - Load all (${script path}/*.*) scripts in a given directory and use them as commands.
+; Load all scripts in a given folder - Load all (${script path}/*) scripts in a given directory and use them as commands.
+; Any executable file is considered a script. They do not have end with an script like extension.
+; In windows, executable files cannot be discerned. It will add every file under the directory.
+; Links are followed, and if they end up under script path, they will be added as a script.
+; If path ends with ** its subdirectories will be searched as well.
 script path =
 
 ; ignore perfdata - Do not parse performance data from the output

pkg/convert/convert.go

@@ -156,6 +156,10 @@ func Int32E(raw any) (int32, error) {
 			return 0, fmt.Errorf("number to large for int32")
 		}
 
+		if num < math.MinInt32 {
+			return 0, fmt.Errorf("number to small for int32")
+		}
+
 		return int32(num), nil
 	}
 }

pkg/humanize/humanize.go

@@ -122,7 +122,12 @@ func NumF(num int64, precision int) string {
 		prefix = "-"
 	}
 
-	return prefix + humanizeBytes(uint64(num), 1000, []string{"", "k", "M", "G", "T", "P", "E"}, precision)
+	// useless but makes gosec G115 happy
+	if num >= 0 {
+		return prefix + humanizeBytes(uint64(num), 1000, []string{"", "k", "M", "G", "T", "P", "E"}, precision)
+	}
+
+	return ""
 }
 
 // Bytes(82854982) -> 83 MB

pkg/humanize/humanize_test.go

@@ -30,7 +30,7 @@ func TestParseBytes(t *testing.T) {
 		} else {
 			require.NoError(t, err)
 		}
-		assert.Equalf(t, int64(tst.res), int64(res), "ParseBytes: %s -> %d", tst.in, res)
+		assert.Equalf(t, tst.res, res, "ParseBytes: %s -> %d", tst.in, res)
 	}
 }
 

pkg/nrpe/nrpe.go

@@ -7,6 +7,8 @@ import (
 	"hash/crc32"
 	"io"
 	"strings"
+
+	"github.com/consol-monitoring/snclient/pkg/convert"
 )
 
 /*
@@ -133,7 +135,11 @@ func BuildPacketV4(packetType, statusCode uint16, statusLine []byte) *Packet {
 	binary.BigEndian.PutUint32(packet.crc32, 0)
 	binary.BigEndian.PutUint16(packet.statusCode, statusCode)
 	binary.BigEndian.PutUint16(packet.alignment, 0)
-	binary.BigEndian.PutUint32(packet.dataLength, uint32(dataLength))
+	dataLength32, err := convert.UInt32E(dataLength)
+	if err != nil {
+		panic("should not happen, size is checked earlier already")
+	}
+	binary.BigEndian.PutUint32(packet.dataLength, dataLength32)
 
 	copy(packet.data, statusLine)
 	packet.data[dataLength-1] = 0 // add null byte

pkg/snclient/check_alias.go

@@ -42,7 +42,7 @@ func (a *CheckAlias) Check(ctx context.Context, snc *Agent, check *CheckData, _
 
 		log.Debugf("command after macros expanded: %s %s", a.command, replacedStr)
 	}
-	statusResult, _ := snc.runCheck(ctx, a.command, cmdArgs, check.timeout, nil, true)
+	statusResult, _ := snc.runCheck(ctx, a.command, cmdArgs, check.timeout, nil, true, true)
 
 	statusResult.ParsePerformanceDataFromOutputCond(a.command, a.config)
 

pkg/snclient/check_alias_test.go

@@ -13,6 +13,8 @@ CheckExternalScripts = enabled
 
 [/settings/external scripts/alias]
 alias_cpu = check_cpu warn=load=101 crit=load=102
+check_memory = check_memory -a type=physical warn="used > 100" crit="used > 100"
+check_uptime = check_uptime "warn=uptime > 3000d" "crit=uptime > 6000d"
 
 [/settings/external scripts/alias/alias_cpu2]
 command = check_cpu warn=load=101 crit=load=102
@@ -37,7 +39,7 @@ allow arguments = yes
 `
 	snc := StartTestAgent(t, config)
 
-	assert.Lenf(t, snc.runSet.cmdAliases, 6, "there should be one alias")
+	assert.Lenf(t, snc.runSet.cmdAliases, 8, "there should be 8 alias entries")
 
 	res := snc.RunCheck("alias_cpu", []string{})
 	assert.Equalf(t, CheckExitOK, res.State, "state OK")
@@ -84,5 +86,20 @@ allow arguments = yes
 	assert.Equalf(t, CheckExitOK, res.State, "state OK")
 	assert.Equalf(t, "test 123 456", string(res.BuildPluginOutput()), "plugin output matches")
 
+	// recursive memory check
+	res = snc.RunCheck("check_memory", []string{})
+	assert.Equalf(t, CheckExitOK, res.State, "state OK")
+	assert.Regexpf(t, `^OK - physical =`, string(res.BuildPluginOutput()), "output matches")
+
+	// help from aliased check
+	res = snc.RunCheck("check_memory", []string{"help"})
+	assert.Equalf(t, CheckExitUnknown, res.State, "state Unknown")
+	assert.Regexpf(t, `There are several types of memory that can be checked`, string(res.BuildPluginOutput()), "output matches")
+
+	// recursive uptime check
+	res = snc.RunCheck("check_uptime", []string{})
+	assert.Equalf(t, CheckExitOK, res.State, "state OK")
+	assert.Regexpf(t, `^OK - uptime:`, string(res.BuildPluginOutput()), "output matches")
+
 	StopTestAgent(t, snc)
 }