Module: check_mk Branch: master Commit: f8433892cdec1b69c744fd5e299b998e5dd7269c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8433892cdec1b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 15 15:31:32 2014 +0200 FIX fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' --- .werks/635 | 8 ++++++++ ChangeLog | 3 ++- checkman/fc_port | 8 +++++--- checks/fc_port | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/635 b/.werks/635 new file mode 100644 index 0000000..126a95c --- /dev/null +++ b/.werks/635 @@ -0,0 +1,8 @@ +Title: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405431040 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8120397..daaef7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,8 +46,9 @@ * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... * 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on - * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running + * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... + * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checkman/fc_port b/checkman/fc_port index 75ace6b..12e37ae 100644 --- a/checkman/fc_port +++ b/checkman/fc_port @@ -96,6 +96,8 @@ perfdata: inventory: The inventory creates checks for all operational ports. It can be configured (see CONFIGURATION VARIABLES) how operational ports are defined. + Ports with the admininstrative state of 1 (unkown) or 3 (offline) are not + inventorized. [parameters] parameters (dict): This check works with dictionary based parameters. The @@ -134,11 +136,11 @@ fc_port_no_inventory_types(list): List of port types not to be inventorized. fc_port_no_inventory_phystates(list): List of physical states for which ports will not be inventorized. The default is an empty list. -fc_port_inventory_opstates(list): List of operational states for which ports +fc_port_no_inventory_opstates(list): List of operational states for which ports will not be inventorized. The default is an empty list. -fc_port_inventory_admstates(list): List of administrative states for which ports - will not be inventorized. The default is an empty list. +fc_port_no_inventory_admstates(list): List of administrative states for which ports + will not be inventorized. The default is [ 1, 3 ] fc_port_inventory_use_portname(boolean): If you set this to {True}, configured names of the ports appear in the service descripion (and thus can diff --git a/checks/fc_port b/checks/fc_port index a251ee8..743c74f 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -66,7 +66,7 @@ porttype_list = ( 'unknown', 'unknown', 'other', 'not-present', 'hub-port', 'n-p # settings for inventory: which ports should not be inventorized fc_port_no_inventory_types = [ 3 ] -fc_port_no_inventory_admstates = [ ] +fc_port_no_inventory_admstates = [ 1, 3 ] fc_port_no_inventory_opstates = [ ] fc_port_no_inventory_phystates = [ ] fc_port_inventory_use_portname = False # use connUnitPortName as service description