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

[icinga2] / itl / command-plugins.conf

diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index bc92fe004099e5eaa1e2dc5c48e22e57431a28da..0bf297fd156cc20e2d90531156a91497281bec31 100644 (file)
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -176,13 +176,6 @@ object CheckCommand "fping6" {
        vars.fping_address = "$address6$"
 }
 
-object CheckCommand "passive" {
-       import "dummy"
-
-       vars.dummy_state = 3
-       vars.dummy_text = "No Passive Check Result Received."
-}
-
 object CheckCommand "tcp" {
        import "ipv4-or-ipv6"
 
@@ -1376,10 +1369,12 @@ object CheckCommand "disk" {
                "-W" = {
                        value = "$disk_inode_wfree$"
                        description = "Exit with WARNING status if less than PERCENT of inode space is free"
+                       order = -3
                }
                "-K" = {
                        value = "$disk_inode_cfree$"
                        description = "Exit with CRITICAL status if less than PERCENT of inode space is free"
+                       order = -3
                }
                "-p" = {
                        value = "$disk_partitions$"
@@ -1443,6 +1438,7 @@ object CheckCommand "disk" {
                "-A" = {
                        set_if = "$disk_all$"
                        description = "Explicitly select all paths. This is equivalent to -R .*"
+                       order = 1
                }
                "-R" = {
                        value = "$disk_eregi_path$"
@@ -1484,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" {
@@ -2204,6 +2216,10 @@ object CheckCommand "by_ssh" {
                        set_if = "$by_ssh_ipv6$"
                        description = "Use IPv6 only"
                }
+               "-E" = {
+                       value = "$by_ssh_skip_stderr$"
+                       description = "Ignore all or (if specified) first n lines on STDERR [optional]"
+               }
        }
 
        vars.by_ssh_address = "$check_address$"