[checkmk-commits] storeonce_servicesets: minor cleanup

Module: check_mk Branch: master Commit: 9d0ded6973c50e0ac54da07835208efd50e841c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0ded6973c50e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 8 15:39:09 2019 +0200 storeonce_servicesets: minor cleanup Change-Id: Ica1c25d45ce85a47f7df5c0dbfdc2a07e9ad7e03 --- checks/storeonce_servicesets | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index 9d4ca2c..c54f242 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -71,9 +71,13 @@ # combinedUserBytes 265622218292968 +def _get_item(data): + return data["ServiceSet ID"] + + def inventory_storeonce_servicesets(parsed): for values in parsed.itervalues(): - yield (values["ServiceSet ID"], {}) + yield _get_item(values), {} def check_storeonce_servicesets(item, params, parsed): @@ -109,20 +113,14 @@ check_info['storeonce_servicesets'] = { } -def inventory_storeonce_servicesets_capacity(parsed): - for values in parsed.itervalues(): - yield (values["ServiceSet ID"], {}) - - def check_storeonce_servicesets_capacity(item, params, parsed): for values in parsed.itervalues(): - if not item == values["ServiceSet ID"]: - continue - yield check_storeonce_space(item, params, values) + if _get_item(values) == item: + return check_storeonce_space(item, params, values) check_info['storeonce_servicesets.capacity'] = { - 'inventory_function': inventory_storeonce_servicesets_capacity, + 'inventory_function': inventory_storeonce_servicesets, 'check_function': check_storeonce_servicesets_capacity, 'service_description': "ServiceSet %s Capacity", 'has_perfdata': True,