Merge pull request #6139 from Icinga/itl/disk-docker-types

itl/disk: Ignore overlay and netfs filesystems

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 91c3c23a40e1bd72051615ca505f7c5ff9b299e0..4fe53a250387e38f6d3dd6201fa2ee33a144a5ee 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -343,7 +343,7 @@ disk\_ignore\_eregi\_path | **Optional.** Regular expression to ignore selected
 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\_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".
+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".
 
 ### disk_smb <a id="plugin-check-command-disk-smb"></a>
 
@@ -2486,7 +2486,7 @@ It uses the Dell OpenManage Server Administrator (OMSA) software, which must be
 the monitored system. check_openmanage can be used remotely with SNMP or locally with icinga2 agent,
 check_by_ssh or similar, whichever suits your needs and particular taste.
 
-The plugin checks the health of the storage subsystem, power supplies, memory modules, 
+The plugin checks the health of the storage subsystem, power supplies, memory modules,
 temperature probes etc., and gives an alert if any of the components are faulty or operate outside normal parameters.
 
 Custom attributes passed as [command parameters](03-monitoring-basics.md#command-passing-parameters):

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 2963efb06508b9615de24d1ec63651825a79d0ae..0bf297fd156cc20e2d90531156a91497281bec31 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -1480,7 +1480,23 @@ object CheckCommand "disk" {
        vars.disk_wfree = "20%"
        vars.disk_cfree = "10%"
        vars.disk_megabytes = true
-       vars.disk_exclude_type = [ "none", "tmpfs", "sysfs", "proc", "configfs", "devtmpfs", "devfs", "mtmfs", "tracefs", "cgroup", "fuse.gvfsd-fuse", "fuse.gvfs-fuse-daemon", "fdescfs" ]
+       vars.disk_exclude_type = [
+               "none",
+               "tmpfs",
+               "sysfs",
+               "proc",
+               "configfs",
+               "devtmpfs",
+               "devfs",
+               "mtmfs",
+               "tracefs",
+               "cgroup",
+               "fuse.gvfsd-fuse",
+               "fuse.gvfs-fuse-daemon",
+               "fdescfs",
+               "overlay",
+               "nsfs"
+       ]
 }
 
 object CheckCommand "disk_smb" {