[checkmk-commits] 6991 FIX genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices

Module: check_mk Branch: master Commit: 90e0e6c4b968c50fd2d92d9491e44a9f2f02f083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e0e6c4b968c5… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Dec 17 13:19:06 2018 +0100 6991 FIX genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices Change-Id: If5e8ad975331803d5f09d6af5f704a30964f1406 --- .werks/6991 | 11 +++++++++++ checkman/genua_carp | 4 ++-- checkman/genua_fan | 6 +++--- checkman/genua_pfstate | 8 ++++---- checkman/genua_state_correlation | 6 +++--- checkman/genua_vpn | 5 ++++- checks/genua.include | 37 +++++++++++++++++++++++++++++++++++++ checks/genua_carp | 3 ++- checks/genua_fan | 4 ++-- checks/genua_pfstate | 3 ++- checks/genua_state_correlation | 4 ++-- checks/genua_vpn | 3 ++- 12 files changed, 74 insertions(+), 20 deletions(-) diff --git a/.werks/6991 b/.werks/6991 new file mode 100644 index 0000000..0f61217 --- /dev/null +++ b/.werks/6991 @@ -0,0 +1,11 @@ +Title: genua_carp, genua_fan, genua_pfstate, genua_state_correlation, genua_vpn: Also discover Genubox and Genuscript devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545047502 + + diff --git a/checkman/genua_carp b/checkman/genua_carp index 7b78fad..2014f2a 100644 --- a/checkman/genua_carp +++ b/checkman/genua_carp @@ -1,4 +1,4 @@ -title: Genuscreen: State of Carp Interfaces on Carp Clusters and Nodes +title: Genua: State of Carp Interfaces on Carp Clusters and Nodes agents: snmp catalog: hw/network/genua license: GPL @@ -20,7 +20,7 @@ description: inventory: The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) - and if the name of this OID contains "genuscreen" (case insensitive). + and if the name of this OID contains "genuscreen", "genuscript" or "genubox" (case insensitive). If this is true the system is inventorized. item: diff --git a/checkman/genua_fan b/checkman/genua_fan index 1c26cf5..f447534 100644 --- a/checkman/genua_fan +++ b/checkman/genua_fan @@ -1,4 +1,4 @@ -title: Genuscreen: Fan State and RPM +title: Genua: Fan State and RPM agents: snmp catalog: hw/network/genua license: GPL @@ -13,8 +13,8 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If this is true and a fan is found, then the it is inventorized. item: diff --git a/checkman/genua_pfstate b/checkman/genua_pfstate index 979961a..b634cf0 100644 --- a/checkman/genua_pfstate +++ b/checkman/genua_pfstate @@ -1,4 +1,4 @@ -title: Genuscreen: State of Packetfilter Engine +title: Genua: State of Packetfilter Engine agents: snmp catalog: hw/network/genua license: GPL @@ -17,7 +17,7 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). If it also contains valid pf state output, the device is - inventorized. + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If it also contains valid + pf state output, the device is inventorized. diff --git a/checkman/genua_state_correlation b/checkman/genua_state_correlation index d910ec0..ff2f18c 100644 --- a/checkman/genua_state_correlation +++ b/checkman/genua_state_correlation @@ -1,4 +1,4 @@ -title: Genuscreen: Correlation of the State of Carp Interfaces +title: Genua: Correlation of the State of Carp Interfaces agents: snmp catalog: hw/network/genua license: GPL @@ -13,7 +13,7 @@ description: inventory: The inventory process checks if the device has a system description OID - of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen" - (case insensitive). + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). If this is true and at least two carp interfaces are found, then the system is inventorized. diff --git a/checkman/genua_vpn b/checkman/genua_vpn index ba35bc7..dc13777 100644 --- a/checkman/genua_vpn +++ b/checkman/genua_vpn @@ -1,4 +1,4 @@ -title: Genuscreen: VPN state +title: Genua: VPN state agents: snmp catalog: hw/network/genua license: GPL @@ -10,4 +10,7 @@ item: The VPN id. inventory: + The inventory process checks if the device has a system description OID + of .1.3.6.1.2.1.1.2.0 and if the name of this OID contains "genuscreen", + "genuscript" or "genubox" (case insensitive). One service per VPN is created. diff --git a/checks/genua.include b/checks/genua.include new file mode 100644 index 0000000..ac5473b --- /dev/null +++ b/checks/genua.include @@ -0,0 +1,37 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def scan_genua(oid): + sys_descr = oid(".1.3.6.1.2.1.1.1.0").lower() + for type_ in [ + "genuscreen", + "genubox", + "genucrypt", + ]: + if type_ in sys_descr: + return True + return False diff --git a/checks/genua_carp b/checks/genua_carp index 57a9863..27efb1a 100644 --- a/checks/genua_carp +++ b/checks/genua_carp @@ -151,5 +151,6 @@ check_info['genua_carp'] = { "1.7", # "ifCarpState" ]), ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_fan b/checks/genua_fan index 6a64e44..7604fc2 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -89,7 +89,7 @@ check_info['genua_fan'] = { "4" # "fanState" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function": scan_genua, + "includes": ["genua.include", "fan.include"], "default_levels_variable": "genua_fan_default_levels", - "includes": ["fan.include"], } diff --git a/checks/genua_pfstate b/checks/genua_pfstate index f397453..61dd672 100644 --- a/checks/genua_pfstate +++ b/checks/genua_pfstate @@ -112,5 +112,6 @@ check_info['genua_pfstate'] = { 3, # "pfstateStatus" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_state_correlation b/checks/genua_state_correlation index 3ffee08..baf9d5a 100644 --- a/checks/genua_state_correlation +++ b/checks/genua_state_correlation @@ -115,6 +115,6 @@ check_info['genua_state_correlation'] = { "1.7", # "ifCarpState" ]) ], - "snmp_scan_function": lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() - #"snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.3717.2.1.2.1.7") is not None + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], } diff --git a/checks/genua_vpn b/checks/genua_vpn index be3f516..99c7bd5 100644 --- a/checks/genua_vpn +++ b/checks/genua_vpn @@ -83,5 +83,6 @@ check_info['genua_vpn'] = { "5", # vpn remote "6", # vpn status (2:OK, 1:FAULT) ]), - 'snmp_scan_function': lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function": scan_genua, + "includes": ["genua.include"], }