Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fix service description (%s) or discovery item.

by Moritz Kiemer

Module: check_mk Branch: master Commit: f563bbbc6a1e9396f283daccb0c0d858af943f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f563bbbc6a1e93… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 14:05:54 2018 +0200 Fix service description (%s) or discovery item. Change-Id: I9b086c2245787c3f549372d13a3b657a74e9d7b4 --- checks/hpux_serviceguard | 2 +- checks/netapp_api_snapshots | 2 +- checks/oracle_crs_version | 4 ++-- checks/oracle_crs_voting | 4 ++-- checks/veeam_client | 2 +- checks/wmi_webservices | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/hpux_serviceguard b/checks/hpux_serviceguard index a4d2579..4b942d6 100644 --- a/checks/hpux_serviceguard +++ b/checks/hpux_serviceguard @@ -70,5 +70,5 @@ def check_hpux_serviceguard(item, _no_params, info): check_info["hpux_serviceguard"] = { 'check_function': check_hpux_serviceguard, 'inventory_function': inventory_hpux_serviceguard, - 'service_description': 'Serviceguard', + 'service_description': 'Serviceguard %s', } diff --git a/checks/netapp_api_snapshots b/checks/netapp_api_snapshots index 8265b4b..2990fb0 100644 --- a/checks/netapp_api_snapshots +++ b/checks/netapp_api_snapshots @@ -83,7 +83,7 @@ check_info["netapp_api_snapshots"] = { 'check_function' : check_netapp_api_snapshots, 'inventory_function' : inventory_netapp_api_snapshots, "default_levels_variable" : "netapp_api_snapshots_default_levels", - 'service_description' : 'Snapshots Volume', + 'service_description' : 'Snapshots Volume %s', 'group' : "netapp_snapshots", 'has_perfdata' : True, 'includes' : ["netapp_api.include"] diff --git a/checks/oracle_crs_version b/checks/oracle_crs_version index d0e6d25..dd0c806 100644 --- a/checks/oracle_crs_version +++ b/checks/oracle_crs_version @@ -26,9 +26,9 @@ def inventory_oracle_crs_version(info): - return [ ('', None) for line in info ] + return [(None, {}) for line in info] -def check_oracle_crs_version(item, params, info): +def check_oracle_crs_version(_no_item, params, info): for line in info: return (0, line[0]) diff --git a/checks/oracle_crs_voting b/checks/oracle_crs_voting index ca41c4a..fd07909 100644 --- a/checks/oracle_crs_voting +++ b/checks/oracle_crs_voting @@ -31,9 +31,9 @@ def inventory_oracle_crs_voting(info): inventory = [] - return [ ('', None) for line in info ] + return [(None, {}) for line in info] -def check_oracle_crs_voting(item, params, info): +def check_oracle_crs_voting(_no_item, params, info): # state = -1 => no data for Service state = -1 infotext = '' diff --git a/checks/veeam_client b/checks/veeam_client index cfbd51d..2189ab1 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -159,7 +159,7 @@ check_info["veeam_client"] = { 'parse_function': parse_veeam_client, 'check_function': check_veeam_client, 'inventory_function': inventory_veeam_client, - 'service_description': 'VEEAM Client', + 'service_description': 'VEEAM Client %s', 'group': 'veeam_backup', 'default_levels_variable' : 'veeam_client', 'has_perfdata': True, diff --git a/checks/wmi_webservices b/checks/wmi_webservices index 38d0610..d697aa0 100644 --- a/checks/wmi_webservices +++ b/checks/wmi_webservices @@ -36,6 +36,6 @@ check_info['wmi_webservices'] = { 'check_function' : check_wmi_webservices, 'parse_function' : parse_wmi_table, 'has_perfdata' : True, - 'service_description' : "Web Service", + 'service_description' : "Web Service %s", 'includes' : ["wmi.include"] }

6 years, 2 months

6123 FIX fsc_sc2_fans, fsc_sc2_power_consumption, fsc_sc2_psu,

by Tom Baerwinkel

fsc_sc2_temp, fsc_sc2_voltage: avoid crashes when values values are missing in the SNMP walk Message-ID: <5b50926e.nrOgfUCsVdxy7h4+%tb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3cc72e34fb97410a14dbf81b7cc0324d8b21307e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cc72e34fb9741… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jul 18 12:10:57 2018 +0200 6123 FIX fsc_sc2_fans, fsc_sc2_power_consumption, fsc_sc2_psu, fsc_sc2_temp, fsc_sc2_voltage: avoid crashes when values values are missing in the SNMP walk Change-Id: I0ad1f5c0ea6a14442c5b6223bc6b783e372f4663 --- .werks/6123 | 10 ++++++++++ checks/fsc_sc2_fans | 30 ++++++++++++++++------------- checks/fsc_sc2_power_consumption | 6 +++++- checks/fsc_sc2_psu | 41 ++++++++++++++++++++-------------------- checks/fsc_sc2_temp | 37 +++++++++++++++++++++--------------- checks/fsc_sc2_voltage | 22 +++++++++++++-------- 6 files changed, 89 insertions(+), 57 deletions(-) diff --git a/.werks/6123 b/.werks/6123 new file mode 100644 index 0000000..9940d78 --- /dev/null +++ b/.werks/6123 @@ -0,0 +1,10 @@ +Title: fsc_sc2_fans, fsc_sc2_power_consumption, fsc_sc2_psu, fsc_sc2_temp, fsc_sc2_voltage: avoid crashes when values values are missing in the SNMP walk +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1531982632 +Class: fix + + diff --git a/checks/fsc_sc2_fans b/checks/fsc_sc2_fans index d357943..48286b3 100644 --- a/checks/fsc_sc2_fans +++ b/checks/fsc_sc2_fans @@ -56,25 +56,29 @@ def inventory_fsc_sc2_fans(info): def check_fsc_sc2_fans(item, params, info): - def get_status_map(status): - return { - '1' : (3, 'Status is unknown'), - '2' : (0, 'Status is disabled'), - '3' : (0, 'Status is ok'), - '4' : (2, 'Status is failed'), - '5' : (1, 'Status is prefailure-predicted'), - '6' : (1, 'Status is redundant-fan-failed'), - '7' : (3, 'Status is not-manageable'), - '8' : (0, 'Status is not-present'), - }.get(status, (3, 'Status is unknown')) + status_map = { + '1': (3, 'Status is unknown'), + '2': (0, 'Status is disabled'), + '3': (0, 'Status is ok'), + '4': (2, 'Status is failed'), + '5': (1, 'Status is prefailure-predicted'), + '6': (1, 'Status is redundant-fan-failed'), + '7': (3, 'Status is not-manageable'), + '8': (0, 'Status is not-present'), + } if type(params) == tuple: params = { 'lower' : params } for designation, status, rpm in info: if designation == item: - yield check_fan(int(rpm), params) - yield get_status_map(status) + # in this case booth values are important + if rpm: + yield check_fan(int(rpm), params) + else: + yield 3, "Device did not deliver rpm values" + + yield status_map.get(status, (3, 'Status is unknown')) check_info["fsc_sc2_fans"] = { diff --git a/checks/fsc_sc2_power_consumption b/checks/fsc_sc2_power_consumption index 74318b8..3774075 100644 --- a/checks/fsc_sc2_power_consumption +++ b/checks/fsc_sc2_power_consumption @@ -45,7 +45,11 @@ def parse_fsc_sc2_power_consumption(info): parsed = {} for designation, value in info: - parsed.setdefault(designation, {"power": int(value)}) + # sometimes the device does not return a value + if not value: + parsed.setdefault(designation, {"device_state": (3,'Error on device while reading value')}) + else: + parsed.setdefault(designation, {"power": int(value)}) return parsed diff --git a/checks/fsc_sc2_psu b/checks/fsc_sc2_psu index 3cfcd0f..2dc13dd 100644 --- a/checks/fsc_sc2_psu +++ b/checks/fsc_sc2_psu @@ -39,29 +39,30 @@ def inventory_fsc_sc2_psu(info): def check_fsc_sc2_psu(item, _no_params, info): - def get_psu_status(status): - return { - '1' : (3, 'Status is unknown'), - '2' : (0, 'Status is not-present'), - '3' : (0, 'Status is ok'), - '4' : (2, 'Status is failed'), - '5' : (2, 'Status is ac-fail'), - '6' : (2, 'Status is dc-fail'), - '7' : (2, 'Status is critical-temperature'), - '8' : (0, 'Status is not-manageable'), - '9' : (1, 'Status is fan-failure-predicted'), - '10': (2, 'Status is fan-failure'), - '11': (1, 'Status is power-safe-mode'), - '12': (1, 'Status is non-redundant-dc-fail'), - '13': (1, 'Status is non-redundant-ac-fail') - }.get(status, (3, 'Status is unknown')) + psu_status = { + '1' : (3, 'Status is unknown'), + '2' : (0, 'Status is not-present'), + '3' : (0, 'Status is ok'), + '4' : (2, 'Status is failed'), + '5' : (2, 'Status is ac-fail'), + '6' : (2, 'Status is dc-fail'), + '7' : (2, 'Status is critical-temperature'), + '8' : (0, 'Status is not-manageable'), + '9' : (1, 'Status is fan-failure-predicted'), + '10': (2, 'Status is fan-failure'), + '11': (1, 'Status is power-safe-mode'), + '12': (1, 'Status is non-redundant-dc-fail'), + '13': (1, 'Status is non-redundant-ac-fail') + } for designation, status, load, nominal in info: if designation == item: - state, infotext = get_psu_status(status) - infotext += ', nominal load: {0} W, actual load: {1} W'.format(nominal, load) - perfdata = [ ('power', int(load)) ] - return state, infotext, perfdata + yield psu_status.get(status, (3, 'Status is unknown')) + + if nominal and load: + yield 0, 'Nominal load: {0} W, Actual load: {1} W'.format(nominal, load), [('power', int(load))] + else: + yield 1, 'Did not receive load data' check_info["fsc_sc2_psu"] = { diff --git a/checks/fsc_sc2_temp b/checks/fsc_sc2_temp index 245139c..1d15492 100644 --- a/checks/fsc_sc2_temp +++ b/checks/fsc_sc2_temp @@ -77,25 +77,32 @@ def inventory_fsc_sc2_temp(info): def check_fsc_sc2_temp(item, params, info): - def get_temp_status(status): - return { - '1' : (3, 'unknown'), - '2' : (0, 'not-available'), - '3' : (0, 'ok'), - '4' : (2, 'sensor-failed'), - '5' : (2, 'failed'), - '6' : (1, 'temperature-warning-toohot'), - '7' : (2, 'temperature-critical-toohot'), - '8' : (0, 'temperature-normal'), - '9' : (1, 'temperature-warning') - }.get(status, (3, 'unknown')) + temp_status = { + '1' : (3, 'unknown'), + '2' : (0, 'not-available'), + '3' : (0, 'ok'), + '4' : (2, 'sensor-failed'), + '5' : (2, 'failed'), + '6' : (1, 'temperature-warning-toohot'), + '7' : (2, 'temperature-critical-toohot'), + '8' : (0, 'temperature-normal'), + '9' : (1, 'temperature-warning') + } for designation, status, temp, dev_warn, dev_crit in info: if designation == item: + if not temp: + return 3, 'Did not receive temperature data' + + dev_status, dev_status_name = temp_status.get(status, (3, 'unknown')) + + if not dev_warn or not dev_crit: + return 3, 'Did not receive device levels' + dev_levels = int(dev_warn), int(dev_crit) - dev_status, dev_status_name = get_temp_status(status) - return check_temperature(int(temp), params, 'temp_{}'.format(item.replace(' ', '_')), \ - 'c', dev_levels, None, dev_status, dev_status_name) + + return check_temperature(int(temp), params, 'temp_{}'.format(item.replace(' ', '_')), + 'c', dev_levels, None, dev_status, dev_status_name) check_info['fsc_sc2_temp'] = { diff --git a/checks/fsc_sc2_voltage b/checks/fsc_sc2_voltage index 002f4c9..3bd6e2e 100644 --- a/checks/fsc_sc2_voltage +++ b/checks/fsc_sc2_voltage @@ -74,14 +74,20 @@ def parse_fsc_sc2_voltage(info): parsed = {} for designation, value, min_value, max_value in info: - value, min_value, max_value = [float(v)/1000 - for v in [value, min_value, max_value]] - dev_state = value - if value < min_value: - dev_state = (value, (2, 'too low, deceeds %.2f V' % min_value)) - elif value >= max_value: - dev_state = (value, (2, 'too high, exceeds %.2f V' % max_value)) - parsed.setdefault(designation, {"voltage": dev_state}) + try: + value = float(value)/1000.0 + min_value = float(min_value)/1000.0 + max_value = float(max_value)/1000.0 + except ValueError: + dev_state = 3, 'Could not get all values' + parsed.setdefault(designation, {"device_state": dev_state}) + else: + dev_state = value + if value < min_value: + dev_state = value, (2, 'too low, deceeds %.2f V' % min_value) + elif value >= max_value: + dev_state = value, (2, 'too high, exceeds %.2f V' % max_value) + parsed.setdefault(designation, {"voltage": dev_state}) return parsed

6 years, 2 months

6124 FIX juniper_bgp_state: avoid crash if peer state or peer status is missing in SNMP walk

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 75e9421e0be676ed83493ca86e3b4adc658d4b9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75e9421e0be676… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jul 19 08:48:57 2018 +0200 6124 FIX juniper_bgp_state: avoid crash if peer state or peer status is missing in SNMP walk Change-Id: I29d2ed992c2d1658a3f28da3360cb6c9df60074e --- .werks/6124 | 10 ++++++++++ checks/juniper_bgp_state | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/6124 b/.werks/6124 new file mode 100644 index 0000000..6e3839d --- /dev/null +++ b/.werks/6124 @@ -0,0 +1,10 @@ +Title: juniper_bgp_state: avoid crash if peer state or peer status is missing in SNMP walk +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1531982891 +Class: fix + + diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index b0c92e5..095a43c 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -47,6 +47,8 @@ def check_juniper_bgp_state(item, _no_params, info): status = 0 for oid_end, bgp_state, bgp_operational_state in info: peering_partner_ip = juniper_bgp_state_create_item(oid_end) + if not bgp_state or not bgp_operational_state: + return 3, "Missing SNMP data" bgp_state = int(bgp_state) bgp_operational_state = int(bgp_operational_state)

6 years, 2 months

6354 FIX Timespecific parameters: List of timeperiods is now sorted

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d5bb5ad766201d83bc77801660d312a5695be1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d5bb5ad766201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 19 09:00:48 2018 +0200 6354 FIX Timespecific parameters: List of timeperiods is now sorted Change-Id: I874004bb32d9b0d913349784c16e0269388e3173 --- .werks/6354 | 11 +++++++++++ cmk/gui/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6354 b/.werks/6354 new file mode 100644 index 0000000..e7815e0 --- /dev/null +++ b/.werks/6354 @@ -0,0 +1,11 @@ +Title: Timespecific parameters: List of timeperiods is now sorted +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531940489 + + diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 5109054..0e8b050 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -8809,7 +8809,7 @@ class TimeperiodSelection(DropdownChoice): if always not in elements: elements.insert(0, always) - return elements + return sorted(elements, key=lambda x: x[1].lower())

6 years, 2 months

6241 FIX SLA configuration: The alert levels did only support integer values

by Andreas Boesl

Module: check_mk Branch: master Commit: 9214259349350db96d7e72f2bfaf396b24842960 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9214259349350d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 10 12:23:43 2018 +0200 6241 FIX SLA configuration: The alert levels did only support integer values Change-Id: Iddbcd22abd79aa5607370a5f6f4278026323b5b7 --- .werks/6241 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6241 b/.werks/6241 new file mode 100644 index 0000000..b201862 --- /dev/null +++ b/.werks/6241 @@ -0,0 +1,11 @@ +Title: SLA configuration: The alert levels did only support integer values +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531218161 + +

6 years, 2 months

Fixed and enabled superfluous-parens warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 18022fe36a94cd6f597d01ac381e9f1ff096e812 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18022fe36a94cd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 17 14:18:46 2018 +0200 Fixed and enabled superfluous-parens warnings. Change-Id: I3287c8c78dce866569b0e4939805b46b73c626fc --- checks/apache_status | 4 ++-- checks/ewon | 2 +- checks/f5_bigip_fans | 2 +- checks/h3c_lanswitch_cpu | 2 +- checks/hitachi_hus.include | 4 ++-- cmk/gui/plugins/visuals/wato.py | 4 ++-- cmk/gui/wato/__init__.py | 2 +- cmk/gui/werks.py | 2 +- cmk/structured_data.py | 6 +++--- cmk_base/discovery.py | 2 +- tests/pylint/pylintrc | 1 - 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/checks/apache_status b/checks/apache_status index 2e58f12..de4f6ef 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -147,11 +147,11 @@ def check_apache_status(item, params, info): if "Total Accesses" in data_dict: data_dict["ReqPerSec"] = get_rate("apache_status_%s_accesses" % item, this_time, data_dict["Total Accesses"]) - del(data_dict["Total Accesses"]) + del data_dict["Total Accesses"] if "Total kBytes" in data_dict: data_dict["BytesPerSec"] = get_rate("apache_status_%s_bytes" % item, this_time, data_dict["Total kBytes"] * 1024) - del(data_dict["Total kBytes"]) + del data_dict["Total kBytes"] data = data_dict.items() diff --git a/checks/ewon b/checks/ewon index fec548c..7137f9c 100644 --- a/checks/ewon +++ b/checks/ewon @@ -143,7 +143,7 @@ def check_oxyreduct(item, params, parsed): if "name" in tag_params: if "condition_flag" in tag_params: condition_tagid = tagid + tag_params["condition_flag"][0] - if not (int(parsed[item][condition_tagid]) & tag_params["condition_flag"][1]): + if not int(parsed[item][condition_tagid]) & tag_params["condition_flag"][1]: continue value = int(value) unit = tag_params.get("unit", "") diff --git a/checks/f5_bigip_fans b/checks/f5_bigip_fans index aa80ed7..4eef77c 100644 --- a/checks/f5_bigip_fans +++ b/checks/f5_bigip_fans @@ -43,7 +43,7 @@ def f5_bigip_fans_genitem(fanid): fantype = "Chassis" else: fantype = "Unknown" - return ("%s %d" % (fantype, fanid)) + return "%s %d" % (fantype, fanid) def inventory_f5_bigip_fans(info): diff --git a/checks/h3c_lanswitch_cpu b/checks/h3c_lanswitch_cpu index 27654d2..c77d729 100644 --- a/checks/h3c_lanswitch_cpu +++ b/checks/h3c_lanswitch_cpu @@ -60,7 +60,7 @@ def h3c_lanswitch_cpu_genitem(item): switchid = 1 cputype = "Unknown" cpunum = cpuid - return ("Switch %d %s %d" % (switchid, cputype, cpunum)) + return "Switch %d %s %d" % (switchid, cputype, cpunum) def inventory_h3c_lanswitch_cpu(info): diff --git a/checks/hitachi_hus.include b/checks/hitachi_hus.include index 5b56882..69362f0 100644 --- a/checks/hitachi_hus.include +++ b/checks/hitachi_hus.include @@ -47,8 +47,8 @@ def scan_hitachi_hus(oid): - return ("hm700" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - "hm800" in oid(".1.3.6.1.2.1.1.1.0").lower() ) + return "hm700" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "hm800" in oid(".1.3.6.1.2.1.1.1.0").lower() def inventory_hitachi_hus(info): diff --git a/cmk/gui/plugins/visuals/wato.py b/cmk/gui/plugins/visuals/wato.py index 04fed17..5867434 100644 --- a/cmk/gui/plugins/visuals/wato.py +++ b/cmk/gui/plugins/visuals/wato.py @@ -49,7 +49,7 @@ class FilterWatoFile(Filter): # This filter is also available on slave sites with disabled WATO # To determine if this site is a slave we check the existance of the distributed_wato.mk # file and the absence of any site configuration - return (config.wato_enabled or watolib.is_wato_slave_site()) + return config.wato_enabled or watolib.is_wato_slave_site() def load_wato_data(self): @@ -83,7 +83,7 @@ class FilterWatoFile(Filter): subfolder += part allowed_folders.add(subfolder) - html.dropdown(self.name, [("", "")] + [ entry for entry in self.selection if (entry[0] in allowed_folders) ]) + html.dropdown(self.name, [("", "")] + [ entry for entry in self.selection if entry[0] in allowed_folders ]) def filter(self, infoname): self.check_wato_data_update() diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 253f6e9..3973ca3 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -10842,7 +10842,7 @@ class ModeRoles(RoleManagement, WatoMode): # Users table.cell(_("Users"), HTML(", ").join([ html.render_a(user.get("alias", user_id), watolib.folder_preserving_link([("mode", "edit_user"), ("edit", user_id)])) - for (user_id, user) in users.items() if (id in user["roles"])])) + for (user_id, user) in users.items() if id in user["roles"]])) # Possibly we could also display the following information diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index 123e34d..c5a55eb 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -72,7 +72,7 @@ def handle_acknowledgement(): load_werks() # reload ack states after modification elif html.var("_ack_all"): - if (html.confirm(_("Do you really want to acknowledge <b>all</b> incompatible werks?"), method="GET")): + if html.confirm(_("Do you really want to acknowledge <b>all</b> incompatible werks?"), method="GET"): num = len(unacknowledged_incompatible_werks()) acknowledge_all_werks() html.message(_("%d incompatible Werks have been acknowledged.") % num) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 6fb678a..adb7fb9 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -112,7 +112,7 @@ class StructuredDataTree(object): def _validate_tree_path(self, tree_path): if not tree_path: raise MKGeneralException("Empty tree path or zero.") - if not (isinstance(tree_path, (str, unicode))): + if not isinstance(tree_path, (str, unicode)): raise MKGeneralException("Wrong tree path format. Must be of type string.") if not (tree_path.endswith(":") or tree_path.endswith(".")): raise MKGeneralException("No valid tree path.") @@ -718,8 +718,8 @@ Format of compared entries: """ new_keys = set(new_entries.keys()) old_keys = set(old_entries.keys()) - new = {k: (None, new_entries[k]) for k in (new_keys - old_keys)} - removed = {k: (old_entries[k], None) for k in (old_keys - new_keys)} + new = {k: (None, new_entries[k]) for k in new_keys - old_keys} + removed = {k: (old_entries[k], None) for k in old_keys - new_keys} identical, changed = {}, {} for k in new_keys.intersection(old_keys): old_v = old_entries[k] diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index a4940f9..37f0201 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -250,7 +250,7 @@ def discover_on_host(mode, hostname, do_snmp_scan, use_caches, on_error="ignore" # Note discovered checks that are shadowed by manual checks will vanish # that way. - if check_source in ("new"): + if check_source == "new": if mode in ("new", "fixall", "refresh") and service_filter(hostname, check_plugin_name, item): counts["added"] += 1 new_items[(check_plugin_name, item)] = paramstring diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a4719e7..769ffa9 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -45,7 +45,6 @@ disable= reimported, relative-import, singleton-comparison, - superfluous-parens, too-few-public-methods, too-many-ancestors, too-many-arguments,

6 years, 2 months

6122 zebra_model, zebra_printer_status: new checks for zebra printers

by Tom Baerwinkel

Module: check_mk Branch: master Commit: df64712f7c67d976e9a23a904df7c7c4f6b7af12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df64712f7c67d9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jul 18 10:59:16 2018 +0200 6122 zebra_model, zebra_printer_status: new checks for zebra printers Change-Id: Ib61e0bbbf864a3c077d89359360e0c71ae97367d --- .werks/6122 | 10 ++++++ checkman/zebra_model | 10 ++++++ checkman/zebra_printer_status | 11 ++++++ checks/zebra_model | 79 +++++++++++++++++++++++++++++++++++++++++++ checks/zebra_printer_status | 54 +++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+) diff --git a/.werks/6122 b/.werks/6122 new file mode 100644 index 0000000..feff0ae --- /dev/null +++ b/.werks/6122 @@ -0,0 +1,10 @@ +Title: zebra_model, zebra_printer_status: new checks for zebra printers +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1531904294 +Class: feature + + diff --git a/checkman/zebra_model b/checkman/zebra_model new file mode 100644 index 0000000..603c544 --- /dev/null +++ b/checkman/zebra_model @@ -0,0 +1,10 @@ +title: Zebra Model +agents: snmp +catalog: hw/printer +license: GPL +distribution: check_mk +description: + This checks shows the model, serial number and firmware version of Zebra printers. The status of the service is always {OK}. + +inventory: + One check per device is created. diff --git a/checkman/zebra_printer_status b/checkman/zebra_printer_status new file mode 100644 index 0000000..4be2b7b --- /dev/null +++ b/checkman/zebra_printer_status @@ -0,0 +1,11 @@ +title: Zebra Printer Status +agents: snmp +catalog: hw/printer +license: GPL +distribution: check_mk +description: + This checks shows the printer status of a Zebra printer. If a printer is offline the status of the check + is {CRITICAL}, if the printer is online, printing or warming up the status is {OK}. + +inventory: + One check per device is created. diff --git a/checks/zebra_model b/checks/zebra_model new file mode 100644 index 0000000..2694318 --- /dev/null +++ b/checks/zebra_model @@ -0,0 +1,79 @@ +#!/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 inventory_zebra_model(info): + if info[0] != [] or info[1] != [] or info[2] != []: + return [(None, {})] + + +def check_zebra_model(_no_item, _no_params, info): + model, serial, release = None, None, None + + if info[0]: + model, serial, release, serial_maybe = info[0][0] + if not serial: + serial = serial_maybe + + if not model: + model = info[2][0][0] + + if not release: + release = info[1][0][0] + + yield 0, "Zebra model: %s" % model + + if serial: + yield 0, "Serial number: %s" % serial + + if release: + yield 0, "Firmware release: %s" % release + + +check_info["zebra_model"] = { + "check_function": + check_zebra_model, + "inventory_function": + inventory_zebra_model, + "service_description": + "Zebra Printer Model", + "snmp_info": [ + ( + ".1.3.6.1.4.1.10642", + ["1.1.0", "200.19.5.0", "1.2.0", "1.9.0"], + ), + ( + ".1.3.6.1.4.1.683.1.9", + ["0"], + ), + ( + ".1.3.6.1.4.1.683.6.2.3.2.1.15", + ["1"], + ), + ], + "snmp_scan_function": + lambda oid: "zebra" in oid(".1.3.6.1.2.1.1.1.0").lower() +} diff --git a/checks/zebra_printer_status b/checks/zebra_printer_status new file mode 100644 index 0000000..6e60b92 --- /dev/null +++ b/checks/zebra_printer_status @@ -0,0 +1,54 @@ +#!/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 inventory_zebra_printer_status(info): + if info[0][0]: + return [(None, {})] + + +def check_zebra_printer_status(item, params, info): + zebra_status = saveint(info[0][0]) + + if zebra_status == 3: + return 0, "Printer is online and ready for the next print job" + elif zebra_status == 4: + return 0, "Printer is printing" + elif zebra_status == 5: + return 0, "Printer is warming up" + elif zebra_status == 1: + return 2, "Printer is offline" + else: + return 3, "Unknown printer status" + + +check_info["zebra_printer_status"] = { + "check_function": check_zebra_printer_status, + "inventory_function": inventory_zebra_printer_status, + "service_description": "Zebra Printer Status", + "snmp_info": (".1.3.6.1.2.1.25.3.5.1.1", ["1"]), + "snmp_scan_function": lambda oid: "zebra" in oid(".1.3.6.1.2.1.1.1.0").lower() +}

6 years, 2 months

Explicitly delay fixing invalind-name for now.

by Sven Panne

Module: check_mk Branch: master Commit: b54eef60bcfa22ae581520eefe7c5bd50a5ca3d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54eef60bcfa22… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 17 14:00:32 2018 +0200 Explicitly delay fixing invalind-name for now. Change-Id: Iff5002e3edcc4e226f035d5fd89bf7e4dc66dafc --- tests/pylint/pylintrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a3c9ef7..a4719e7 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -30,7 +30,6 @@ disable= global-statement, global-variable-undefined, inconsistent-return-statements, - invalid-name, len-as-condition, line-too-long, logging-not-lazy, @@ -79,6 +78,11 @@ disable= # real bugs. Just some work to do... unused-variable, #--------------------------------------------------------------------------- + # Enabling this would be nice, but not crucial. At the moment, we have quite + # a few violations, so we postpone fixing this. When we do it eventually, we + # probably want to use "include-naming-hint=yes" in the BASIC section. + invalid-name, + #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. # wrong-spelling-in-comment,

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 41e1fb0dd0d247081957cc9dde60139ab5231ca8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41e1fb0dd0d247… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 13 10:10:35 2018 +0200 Minor cleanup Change-Id: Ia228c468551ef77ade51e76b294129e534603206 --- checks/hwg_temp | 120 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 48 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index de9dc7e..caab1e2 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -29,66 +29,90 @@ factory_settings["hwg_temp_defaultlevels"] = { "levels": (30, 35) } -def inventory_hwg_temp(info): - for line in info: - if int(line[2]) != 0 and line[4] in ["1", "2", "3"]: - yield line[0], {} - -def check_hwg_temp(item, params, info): - status_text = { - "0" : "Invalid", - "1" : "Normal", - "2" : "Out Of Range Low", - "3" : "Out Of Range High", - "4" : "Alarm Low", - "5" : "Alarm High", + +def parse_hwg_temp(info): + map_units = { + "1": "c", + "2": "f", + "3": "k", + # Also possible but invalid: "4" + } + + map_dev_states = { + "0" : "invalid", + "1" : "normal", + "2" : "out of range low", + "3" : "out of range high", + "4" : "alarm low", + "5" : "alarm high", } - # Nomenclature in this check: sensorstatus is what the device sends, state is what the check returns. + parsed = {} for index, descr, sensorstatus, current, unit in info: - if index == item: + try: tempval = float(current) - if unit == "2": - dev_unit = "f" - elif unit == "3": - dev_unit = "k" - elif unit == "4": - return - else: - dev_unit = "c" - - state, infotext, perfdata = check_temperature(tempval, params, "hwg_temp_%s" % item, - dev_unit) - if descr: - infotext += " (%s)" % descr - yield state, infotext, perfdata - - if sensorstatus != '1': - if sensorstatus in ['2', '3', '4', '5']: - state = 2 - else: - state = 3 - - yield state, "Status is %s" % status_text.get(sensorstatus, "UNKNOWN") + except ValueError: + tempval = None + + parsed.setdefault(index, { + "description" : descr, + "dev_unit" : map_units.get(unit), + "temperature" : tempval, + "dev_status_name" : map_dev_states.get(sensorstatus, ""), + "dev_status" : sensorstatus, + }) + + return parsed + + +def inventory_hwg_temp(parsed): + for index, attrs in parsed.iteritems(): + if attrs["dev_status_name"] not in ["invalid", ""] \ + and attrs["dev_unit"] in ["c", "f", "k"]: + yield index, {} + + +def check_hwg_temp(item, params, parsed): + if item not in parsed: + return + + map_readable_states = { + "invalid" : 3, + "normal" : 0, + "out of range low" : 2, + "out of range high" : 2, + "alarm low" : 2, + "alarm high" : 2, + } + + attrs = parsed[item] + state = map_readable_states.get(attrs["dev_status"], 3) + state_readable = attrs["dev_status_name"] + temp = attrs["temperature"] + if temp is None: + return state, "Status: %s" % state_readable + else: + state, infotext, perfdata = check_temperature(temp, params, "hwg_temp_%s" % item, + dev_unit=attrs["dev_unit"], dev_status=state, + dev_status_name=state_readable) + descr = attrs["description"] + return state, "%s%s" % ("[%s] " % descr if descr else "", infotext), perfdata check_info['hwg_temp'] = { + 'parse_function' : parse_hwg_temp, "check_function" : check_hwg_temp, "inventory_function" : inventory_hwg_temp, "service_description" : "Temperature %s", "has_perfdata" : True, - "snmp_info" : (".1.3.6.1.4.1.21796.4.1.3", [# sensors index (1-2) - "1.1", - # sensor name string - "1.2", - # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi - "1.3", - # current value string - "1.4", - # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% - "1.7", + "snmp_info" : (".1.3.6.1.4.1.21796.4.1.3", [ # DAMOCLES-MIB.txt + "1.1", # index + "1.2", # sensName + "1.3", # sensState + "1.4", # sensString + "1.7", # sensUnit ]), - "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0", "").lower(), "group" : "temperature", "includes" : [ "temperature.include" ], "default_levels_variable" : "hwg_temp_defaultlevels"

6 years, 2 months

Use a more common naming scheme for our combined file.

by Sven Panne

Module: check_mk Branch: master Commit: 158d0c5437af7c782e23891afbae4d307a1a45ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=158d0c5437af7c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 17 14:00:11 2018 +0200 Use a more common naming scheme for our combined file. Change-Id: I7361e4b74e9c9a273870b77c899e88d2f14a9052 --- tests/pylint/test_pylint_bakery_plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/test_pylint_bakery_plugins.py b/tests/pylint/test_pylint_bakery_plugins.py index fa9a075..e7104b7 100755 --- a/tests/pylint/test_pylint_bakery_plugins.py +++ b/tests/pylint/test_pylint_bakery_plugins.py @@ -7,7 +7,7 @@ from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk def test_pylint_bakery_plugins(pylint_test_dir): - with open(pylint_test_dir + "/cmk-bakery-plugins.py", "w") as f: + with open(pylint_test_dir + "/cmk_bakery_plugins.py", "w") as f: pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py")))

6 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018