Add --if-names option to check_interfaces

Sinve version 1.3 check_interfaces supports an option to query ifName instead
of ifDescr, which is helpful eg. FortiOS 5.4 devices.

fixes #5028
fixes #5032

Signed-off-by: Gunnar Beutner <gunnar.beutner@icinga.com>

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index e8345dad0a9b07e1367542e8e87d48da79c3d5a6..773e9a9ee403592cc3eda8a1f9d19d78c2cd296e 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2468,6 +2468,7 @@ interfaces_aliases        | **Optional.** Retrieves the interface description.
 interfaces_match_aliases  | **Optional.** Also match against aliases (Option --aliases automatically enabled).
 interfaces_timeout        | **Optional.** Sets the SNMP timeout (in ms).
 interfaces_sleep          | **Optional.** Sleep between every SNMP query (in ms).
+interfaces_names          | **Optional.** If set to true, use ifName instead of ifDescr.
 
 #### <a id="plugin-contrib-command-nwc_health"></a> nwc_health
 

diff --git a/itl/plugins-contrib.d/network-components.conf b/itl/plugins-contrib.d/network-components.conf
index 0511704a6ffeef2ce28b1e54c5f5dfcb9c4011ae..1199df7dd1cbf6c217dbaa72aa9c8f69fff15390 100644 (file)
--- a/itl/plugins-contrib.d/network-components.conf
+++ b/itl/plugins-contrib.d/network-components.conf
@@ -489,6 +489,10 @@ object CheckCommand "interfaces" {
                        value = "$interfaces_sleep$"
                        description = "Sleep between every SNMP query (in ms)."
                }
+                "--if-names" = {
+                        set_if = "$interfaces_names$"
+                        description = "Use ifName instead of ifDescr."
+                }
        }
 
        vars.interfaces_address = "$check_address$"