diff --git a/CHANGELOG b/CHANGELOG index bca3021e91e22a5cbf249d2f40c516a693b742fa..7d6fcc488a269ab6ea88236697bec4da56d0ac6d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,4 +37,9 @@ 2023-06-11: set upper cmk version to 2.2.0b1 for bgp_peer-2.0.1-20230611.mkp 2023-06-11: moved wato file to check_parameters sub directory removed declare_invtable_view from view definition on cmk 2.2 (see werk 15493) +<<<<<<< HEAD 2023-06-13: added huawei metrics from huawei_bgp_peer +======= +2023-08-17: fix removed internal_item form check_default_parameters (THX mail[at]bastian-kuhn[dot]de) + added warning if internal_item is missing in params +>>>>>>> c8f94f1 (update project) diff --git a/README.md b/README.md index dfa7e4cd340be174c5996e52282e288b93f2c083..91c737e275e12e45c11a132c55a6929fc7b76b71 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[PACKAGE]: ../../raw/master/bgp_peer-2.2.2-20230817.mkp "bgp_peer-2.2.2-20230817.mkp" # BGP Peer Check plugin to monitor the status of BGP peers and inventory plugin for static BGP peer data. diff --git a/agent_based/bgp_peer.py b/agent_based/bgp_peer.py index c54b89f804cb2da298cbe1eac4b9d2dc2f278883..3aba7558d45ef5906354f9e6fe77dd23a78aca44 100644 --- a/agent_based/bgp_peer.py +++ b/agent_based/bgp_peer.py @@ -32,6 +32,8 @@ # fix type error in discovery (CMK2.1 GUI only) # 2023-02-20: fix crash if metric data is None # 2023-03-26: optimized output of metrics, GetRateError will not be set to 0 anymore +# 2023-08-17: fix removed internal_item form check_default_parameters (THX mail[at]bastian-kuhn[dot]de) +# added warning if internal_item is missing in params # Example Agent Output: # BGP4-MIB @@ -122,7 +124,16 @@ def discovery_bgp_peer(params, section: Dict[str, BgpPeer]) -> DiscoveryResult: def check_bgp_peer(item, params, section: Dict[str, BgpPeer]) -> CheckResult: - item = params.get('internal_item', item) + if not params.get('internal_item'): + yield Result( + state=State.WARN, + summary='This service is using old parameters (see details)', + details='This service is using old parameters. To refresh the parameters you need to do a "Tabula rasa" ' + '(Discover services -> Remove all and find new)', + ) + else: + item = params['internal_item'] + neighborstate = params['neighborstate'] peer_not_found_state = params['peernotfound'] @@ -253,8 +264,6 @@ register.check_plugin( 'peernotfound': 2, 'admindown': 1, 'noprefixlimit': 1, - # 'accepted_prefixes_upper_levels': (None, None), # Type error in discovery (cmk2.1 GUI only) - # 'accepted_prefixes_lower_levels': (None, None), # Type error in discovery (cmk2.1 GUI only) 'neighborstate': { '1': 2, # idle '2': 1, # connect @@ -263,7 +272,6 @@ register.check_plugin( '5': 1, # openconfirm '6': 0, # established }, - 'internal_item': None, }, check_ruleset_name='bgp_peer', ) diff --git a/bgp_peer-2.2.2-20230817.mkp b/bgp_peer-2.2.2-20230817.mkp new file mode 100644 index 0000000000000000000000000000000000000000..40206de4045e84f626a5951f0a38def19e84e6d1 Binary files /dev/null and b/bgp_peer-2.2.2-20230817.mkp differ diff --git a/bgp_peer.mkp b/bgp_peer.mkp deleted file mode 100644 index 3c53f65ebcc6e1433c3b1812710ab6ee1af8f708..0000000000000000000000000000000000000000 Binary files a/bgp_peer.mkp and /dev/null differ diff --git a/packages/bgp_peer b/packages/bgp_peer index 80fcc2625d80db1af78684b0286aff2c23f90929..d11ad2248f9de72d36c34d6926133c061ae66827 100644 --- a/packages/bgp_peer +++ b/packages/bgp_peer @@ -37,7 +37,7 @@ 'wato/check_parameters/inv_bgp_peer.py']}, 'name': 'bgp_peer', 'title': 'BGP Peer', - 'version': '2.2.1-20230613', + 'version': '2.2.2-20230817', 'version.min_required': '2.2.0b1', - 'version.packaged': '2.2.0p2', + 'version.packaged': '2.2.0p7', 'version.usable_until': None}