Add interfacetable CheckCommand options --trafficwithpkt and --snmp-maxmsgsize

fixes #12468

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>

diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index 35ce9f3614226dae609550f4bcf28ab7deadee71..9d582718ad463cddd77d22c4571fcfe1331eb3db 100644 (file)
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2258,6 +2258,7 @@ interfacetable_includetraffic       | **Optional.** Comma separated list of inte
 interfacetable_warningtraffic       | **Optional.** Interface traffic load percentage leading to a warning alert.
 interfacetable_criticaltraffic      | **Optional.** Interface traffic load percentage leading to a critical alert.
 interfacetable_pkt                  | **Optional.** Add unicast/non-unicast pkt stats for each interface.
+interfacetable_trafficwithpkt       | **Optional.** Enable traffic calculation using pkt counters instead of octet counters. Useful when using 32-bit counters to track the load on > 1GbE interfaces. Defaults to false.
 interfacetable_trackproperty        | **Optional.** List of tracked properties.
 interfacetable_excludeproperty      | **Optional.** Comma separated list of interfaces excluded from the property tracking.
 interfacetable_includeproperty      | **Optional.** Comma separated list of interfaces included in the property tracking.
@@ -2274,6 +2275,7 @@ interfacetable_64bits               | **Optional.** Use SNMP 64-bits counters. D
 interfacetable_maxrepetitions       | **Optional.** Increasing this value may enhance snmp query performances by gathering more results at one time.
 interfacetable_snmptimeout          | **Optional.** Define the Transport Layer timeout for the snmp queries.
 interfacetable_snmpretries          | **Optional.** Define the number of times to retry sending a SNMP message.
+interfacetable_snmpmaxmsgsize       | **Optional.** Size of the SNMP message in octets, usefull in case of too long responses. Be carefull with network filters. Range 484 - 65535. Apply only to netsnmp perl bindings. The default is 1472 octets for UDP/IPv4, 1452 octets for UDP/IPv6, 1460 octets for TCP/IPv4, and 1440 octets for TCP/IPv6.
 interfacetable_unixsnmp             | **Optional.** Use unix snmp utilities for snmp requests. Defaults to false, which means use the perl bindings.
 interfacetable_enableperfdata       | **Optional.** Enable port performance data. Defaults to false.
 interfacetable_perfdataformat       | **Optional.** Define which performance data will be generated. Possible values are "full" (default), "loadonly", "globalonly".

diff --git a/itl/plugins-contrib.d/network-components.conf b/itl/plugins-contrib.d/network-components.conf
index 4bc7b81b09b52c925193fd4b2971b2fe675b88c1..9c87296be464b903870c72d6d7b334233c1c1051 100644 (file)
--- a/itl/plugins-contrib.d/network-components.conf
+++ b/itl/plugins-contrib.d/network-components.conf
@@ -71,6 +71,10 @@ object CheckCommand "interfacetable" {
                        set_if = "$interfacetable_pkt$"
                        description = "Add unicast/non-unicast pkt stats for each interface"
                }
+               "--trafficwithpkt" = {
+                       set_if = "$interfacetable_trafficwithpkt$"
+                       description = "Enable traffic calculation using pkt counters instead of octet counters. Useful when using 32-bit counters to track the load on > 1GbE interfaces."
+               }
                "--tp" = {
                        value = "$interfacetable_trackproperty$"
                        description = "List of tracked properties"
@@ -143,6 +147,10 @@ object CheckCommand "interfacetable" {
                        value = "$interfacetable_snmpretries$"
                        description = "Define the number of times to retry sending a SNMP message"
                }
+               "--snmp-maxmsgsize" = {
+                       value = "$interfacetable_snmpmaxmsgsize$"
+                       description = "Size of the SNMP message in octets, usefull in case of too long responses. Be carefull with network filters. Range 484 - 65535. Apply only to netsnmp perl bindings. The default is 1472 octets for UDP/IPv4, 1452 octets for UDP/IPv6, 1460 octets for TCP/IPv4, and 1440 octets for TCP/IPv6."
+               }
                "--unixsnmp" = {
                        set_if = "$interfacetable_unixsnmp$"
                        description = "Use unix snmp utilities for snmp requests"
@@ -276,6 +284,7 @@ object CheckCommand "interfacetable" {
        vars.interfacetable_outputshort = false
        vars.interfacetable_aliasmatching = false
        vars.interfacetable_pkt = false
+       vars.interfacetable_trafficwithpkt = false
        vars.interfacetable_snmpv2 = false
        vars.interfacetable_64bits = false
        vars.interfacetable_unixsnmp = false