From 3a1b080338a6f0e96d3b2b25d7837957322b5f0b Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 27 Jan 2023 16:21:40 +0100 Subject: [PATCH] ITL: let check_disk choose sane default units by itself so it is responsible for output readability, prefdata precision and SI vs. IEC on its own. --- doc/10-icinga-template-library.md | 2 +- itl/command-plugins.conf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index 0e064ce37..724d86793 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -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\_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\_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\_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 diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf index d3f380e65..a2a6c2238 100644 --- a/itl/command-plugins.conf +++ b/itl/command-plugins.conf @@ -1460,7 +1460,7 @@ object CheckCommand "disk" { } "-u" = { value = "$disk_units$" - description = "Choose bytes, kB, MB, GB, TB (default: MB)" + description = "Choose bytes, kB, MB, GB, TB" } "-X" = { value = "$disk_exclude_type$" @@ -1476,7 +1476,6 @@ object CheckCommand "disk" { vars.disk_wfree = "20%" vars.disk_cfree = "10%" - vars.disk_megabytes = true vars.disk_exclude_type = [ "none", "tmpfs",