Merge pull request #9642 from Icinga/9486a

ITL: let check_disk choose sane default units by itself
This commit is contained in:
Julian Brost 2023-01-27 22:22:24 +01:00 committed by GitHub
commit 2ea866248b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -374,7 +374,7 @@ disk\_ereg\_path | **Optional.** Regular expression for path or partiti
disk\_ignore\_eregi\_path | **Optional.** Regular expression to ignore selected path/partition (case insensitive). Multiple regular expression strings must be defined as array. disk\_ignore\_eregi\_path | **Optional.** Regular expression to ignore selected path/partition (case insensitive). Multiple regular expression strings must be defined as array.
disk\_ignore\_ereg\_path | **Optional.** Regular expression to ignore selected path or partition. Multiple regular expression strings must be defined as array. disk\_ignore\_ereg\_path | **Optional.** Regular expression to ignore selected path or partition. Multiple regular expression strings must be defined as array.
disk\_timeout | **Optional.** Seconds before connection times out (default: 10). disk\_timeout | **Optional.** Seconds before connection times out (default: 10).
disk\_units | **Optional.** Choose bytes, kB, MB, GB, TB (default: MB). disk\_units | **Optional.** Choose bytes, kB, MB, GB, TB.
disk\_exclude\_type | **Optional.** Ignore all filesystems of indicated type. Multiple regular expression strings must be defined as array. Defaults to "none", "tmpfs", "sysfs", "proc", "configfs", "devtmpfs", "devfs", "mtmfs", "tracefs", "cgroup", "fuse.gvfsd-fuse", "fuse.gvfs-fuse-daemon", "fdescfs", "overlay", "nsfs", "squashfs". disk\_exclude\_type | **Optional.** Ignore all filesystems of indicated type. Multiple regular expression strings must be defined as array. Defaults to "none", "tmpfs", "sysfs", "proc", "configfs", "devtmpfs", "devfs", "mtmfs", "tracefs", "cgroup", "fuse.gvfsd-fuse", "fuse.gvfs-fuse-daemon", "fdescfs", "overlay", "nsfs", "squashfs".
disk\_include\_type | **Optional.** Check only filesystems of indicated type. Multiple regular expression strings must be defined as array. disk\_include\_type | **Optional.** Check only filesystems of indicated type. Multiple regular expression strings must be defined as array.
disk\_inode\_perfdata | **Optional.** Display inode usage in perfdata disk\_inode\_perfdata | **Optional.** Display inode usage in perfdata

View File

@ -1464,7 +1464,7 @@ object CheckCommand "disk" {
} }
"-u" = { "-u" = {
value = "$disk_units$" value = "$disk_units$"
description = "Choose bytes, kB, MB, GB, TB (default: MB)" description = "Choose bytes, kB, MB, GB, TB"
} }
"-X" = { "-X" = {
value = "$disk_exclude_type$" value = "$disk_exclude_type$"
@ -1480,7 +1480,6 @@ object CheckCommand "disk" {
vars.disk_wfree = "20%" vars.disk_wfree = "20%"
vars.disk_cfree = "10%" vars.disk_cfree = "10%"
vars.disk_megabytes = true
vars.disk_exclude_type = [ vars.disk_exclude_type = [
"none", "none",
"tmpfs", "tmpfs",