Skip to content

check_drivesize: improve detection of drives out of the drive argument #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
inqrphl wants to merge 10 commits into
base: main
Choose a base branch
from
+307 −89
Open

check_drivesize: improve detection of drives out of the drive argument #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7f8f3e4
check_drivesize: improve detection of drives out of the drive argumen…
inqrphl Jul 14, 2026
19d5687
citest fixes
Jul 14, 2026
68470dc
Merge branch 'main' of https://github.com/ConSol-Monitoring/snclient …
inqrphl Jul 15, 2026
68ee30a
Merge branch 'check-drivesize-windows-improve-drive-detection-in-cust…
inqrphl Jul 15, 2026
5290cbe
check_drivesize: adjust expected output line and perfdata labels on w…
inqrphl Jul 15, 2026
3ae73f6
Merge remote-tracking branch 'upstream/main' into check-drivesize-win…
inqrphl Jul 15, 2026
4714c74
check_drivesize: address citest issues
Jul 15, 2026
95c7525
check_drivesize: ai-pass fix some of the concerns
Jul 15, 2026
0f46ab2
check_drivesize: fix drives appearing twice with drive=all argument, …
inqrphl Jul 15, 2026
cfd07b7
check_drivesize: ai pass, stop cutting trailing slash on non-windows …
Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/snclient/check_drivesize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,13 +506,16 @@ func (l *CheckDrivesize) addDriveSizeDetails(check *CheckData, drive map[string]
return
}

// volumes without an assigned drive letter have empty drive["drive"]
// use the volume name or id as fallback
l.transformDrivePctMetrics(drive["drive_or_name_or_id"], check)

l.disableGenerallizedConditionsForDrive(drive["drive_or_name_or_id"], drive, check)

l.addMetrics(drive["drive_or_name_or_id"], drive, check, usage, magic)
metricPrefix := drive["drive_or_name_or_id"]
if perfdataPrefix, perfdataPrefixOk := drive["perflabel_prefix"]; perfdataPrefixOk {
metricPrefix = perfdataPrefix
}

l.addMetrics(metricPrefix, drive, check, usage, magic)
}

func (l *CheckDrivesize) getFlagNames(drive map[string]string) []string {
Expand All @@ -536,7 +539,7 @@ func (l *CheckDrivesize) getFlagNames(drive map[string]string) []string {
func (l *CheckDrivesize) tidyThresholdDriveValues(check *CheckData) {
removeTrailingSlashFromDriveValue := func(cond *Condition) (err error) {
if cond.keyword == "drive" && runtime.GOOS != "windows" {
if val, castOK := cond.value.(string); castOK {
if val, castOK := cond.value.(string); castOK && val != "/" {
// Example: '/tmp/' -> '/tmp'
if cut, cutOK := strings.CutSuffix(val, "/"); cutOK {
cond.value = cut
Expand Down
Loading