Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Refactored Event Console modes to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: f7f35f870ab567c973ff6353a5b88fedc8872fa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7f35f870ab567… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:43 2018 +0200 Refactored Event Console modes to WatoMode Change-Id: I2026ea385ebde52f898beb662ac9362ae624a335 --- web/plugins/wato/mkeventd.py | 1804 +++++++++++++++++++++--------------------- 1 file changed, 924 insertions(+), 880 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7f35f870a…

6 years, 2 months

Grouped disabled warnings a tiny bit.

by Sven Panne

Module: check_mk Branch: master Commit: b642a3f0099140d35b5b46607f759f336fb54033 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b642a3f0099140… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 12 08:46:27 2018 +0200 Grouped disabled warnings a tiny bit. Change-Id: Iedf916c475aca0e1fff0a41ea598d1de223c1c2d --- tests/pylint/pylintrc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 2eeb23d..34f2a70 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -24,7 +24,6 @@ disable= c-extension-no-member, cell-var-from-loop, consider-iterating-dictionary, - consider-merging-isinstance, consider-using-enumerate, consider-using-ternary, cyclic-import, @@ -39,13 +38,11 @@ disable= len-as-condition, line-too-long, logging-not-lazy, - misplaced-comparison-constant, missing-docstring, multiple-imports, multiple-statements, no-else-return, no-self-use, - old-style-class, protected-access, redefine-in-handler, redefined-argument-from-local, @@ -53,7 +50,6 @@ disable= redefined-outer-name, reimported, relative-import, - simplifiable-if-statement, singleton-comparison, superfluous-parens, too-few-public-methods, @@ -70,8 +66,6 @@ disable= too-many-statements, ungrouped-imports, unidiomatic-typecheck, - unnecessary-lambda, - unnecessary-pass, unnecessary-semicolon, unneeded-not, unsubscriptable-object, @@ -80,10 +74,20 @@ disable= unused-import, unused-variable, unused-wildcard-import, - useless-super-delegation, wildcard-import, wrong-import-order, wrong-import-position, + #--------------------------------------------------------------------------- + # The 7 warnings below have already been fixed for non-web/ code. When the + # upcoming reorganization of web/ has been landed, these should be fixed first. + consider-merging-isinstance, + misplaced-comparison-constant, + old-style-class, + simplifiable-if-statement, + unnecessary-lambda, + unnecessary-pass, + useless-super-delegation, + #--------------------------------------------------------------------------- # 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

Fixed a few unnecessary-lambda warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 3cdb5a8069702004cc2d542eb31c1b4559e5e360 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cdb5a80697020… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 12 09:27:19 2018 +0200 Fixed a few unnecessary-lambda warnings. Change-Id: I5b1c12e30a221a9383275e843b364eb82aa16eda --- bin/mkbackup | 4 ++-- checks/ucs_bladecenter_if | 6 +++++- cmk_base/modes/check_mk.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 65e1a85..0681dbd 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1186,7 +1186,7 @@ def do_system_rw_backup(opts): t.start() # Process backup stream and write to destination file - s = BackupStream(stream=pipein, is_alive=lambda: t.is_alive(), + s = BackupStream(stream=pipein, is_alive=t.is_alive, key_ident=g_job_config["encrypt"]) for chunk in s.process(): backup_file.write(chunk) @@ -1204,7 +1204,7 @@ def do_system_data_backup(opts): t.start() # Process backup stream and write to destination file - s = BackupStream(stream=pipein, is_alive=lambda: t.is_alive(), + s = BackupStream(stream=pipein, is_alive=t.is_alive, key_ident=g_job_config["encrypt"]) for chunk in s.process(): backup_file.write(chunk) diff --git a/checks/ucs_bladecenter_if b/checks/ucs_bladecenter_if index 6b3e87f..8166972 100644 --- a/checks/ucs_bladecenter_if +++ b/checks/ucs_bladecenter_if @@ -312,9 +312,13 @@ def parse_ucs_bladecenter_if(info): return converted +def inventory_ucs_bladecenter_if(info): + return inventory_if_common(info) + + check_info["ucs_bladecenter_if"] = { 'parse_function' : parse_ucs_bladecenter_if, - 'inventory_function' : lambda info: inventory_if_common(info), + 'inventory_function' : inventory_ucs_bladecenter_if, 'check_function' : check_if_common, 'service_description' : 'Interface %s', 'has_perfdata' : True, diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 783a958..4bfd35d 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -833,7 +833,7 @@ modes.register(Mode( long_option="extraoid", argument=True, argument_descr="A", - argument_conv=lambda x: _extra_oids.append(x), + argument_conv=_extra_oids.append, short_help="Walk also on this OID, in addition to mib-2 and " "enterprises. You can specify this option multiple " "times.", @@ -842,7 +842,7 @@ modes.register(Mode( long_option="oid", argument=True, argument_descr="A", - argument_conv=lambda x: _oids.append(x), + argument_conv=_oids.append, short_help="Walk on this OID instead of mib-2 and enterprises. " "You can specify this option multiple times." ),

6 years, 2 months

Fixed a few old-style-class warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 5e2d3153ae5d479e7ed6a412d4a5765b2bc7db9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e2d3153ae5d47… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 12 08:41:29 2018 +0200 Fixed a few old-style-class warnings. Change-Id: I36e57fdccf7cb32340df63dc88de7aa6bf7b8531 --- agents/special/agent_netapp | 6 +++--- agents/special/agent_ucs_bladecenter | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index b900b1e..34551a9 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -199,7 +199,7 @@ else: reparsed = minidom.parseString(rough_string) return reparsed.toprettyxml(indent="\t") - class ErrorMessages(): + class ErrorMessages(object): def __init__(self): self.messages = set() @@ -217,7 +217,7 @@ else: def format_messages(self): return "\n".join(self.messages) - class NetAppConnection(): + class NetAppConnection(object): def __init__(self, hostname, user, password): self.hostname = hostname self.user = user @@ -376,7 +376,7 @@ else: # NetApp Response Oject, holds the actual content in the NetAppNode member variable - class NetAppResponse(): + class NetAppResponse(object): def __init__(self, response): self.content = None self.reason = None diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 8459513..3983fed 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -92,7 +92,7 @@ def get_pattern(pattern, line): p = re.compile(pattern) return p.findall(line) -class Server: +class Server(object): def __init__(self, host_address): self.netloc = host_address self.session_handle = requests.Session()

6 years, 2 months

Fixed a few unnecessary-pass warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 1d5a8cae050d8aa9f3f0d87d1c0ae03c9e7fc6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5a8cae050d8a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 12 09:59:52 2018 +0200 Fixed a few unnecessary-pass warnings. Change-Id: I53387828c1173cdc7a4633edcb2796da2f5aae7c --- checks/winperf_phydisk | 1 - cmk_base/ip_lookup.py | 1 - omd/packages/omd/omd | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 927e82b..3a9f726 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -138,7 +138,6 @@ def winperf_phydisk_convert(info): except StopIteration: if current_node != "": entries.extend(finalize_block(current_node)) - pass return entries diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 3c3ae9b..0cd8566 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -163,7 +163,6 @@ def _initialize_ip_lookup_cache(): if cmk.debug.enabled(): raise # TODO: Would be better to log it somewhere to make the failure transparent - pass return ip_lookup_cache diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index e2319bf..126554d 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -806,7 +806,6 @@ def try_chown(filename, user): os.chown(filename, uid, gid) except Exception, e: sys.stderr.write("Cannot chown %s to %s: %s\n" % (filename, user, e)) - pass def instantiate_skel(path): @@ -3855,8 +3854,7 @@ def kill_site_user_processes(exclude_current_and_parents=False): os.kill(pid, 9) # SIGKILL except OSError, e: if e.errno == 3: - pids.remove(pid) - pass # No such process + pids.remove(pid) # No such process else: raise time.sleep(1)

6 years, 2 months

Fixed a few simplifiable-if-statement warnings.

by Sven Panne

Module: check_mk Branch: master Commit: eac59aa0c978f8e539d6c3945841fdd2d94f3243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eac59aa0c978f8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 12 14:40:11 2018 +0200 Fixed a few simplifiable-if-statement warnings. Change-Id: I379e8eba59be0d0a4195846b456decce3bf21150 --- active_checks/check_sftp | 5 +---- agents/plugins/mk_logwatch | 5 +---- agents/plugins/mtr | 14 +++----------- checks/cisco_mem.include | 5 +---- checks/if.include | 5 +---- checks/ipmi | 5 ----- 6 files changed, 7 insertions(+), 32 deletions(-) diff --git a/active_checks/check_sftp b/active_checks/check_sftp index 14093e7..7d6c4d3 100755 --- a/active_checks/check_sftp +++ b/active_checks/check_sftp @@ -148,10 +148,7 @@ def get_paths(omd_root, working_dir): def file_available(working_dir): filename = opt_put_local.split("/")[-1] - if filename in sftp.listdir("%s/%s" % (working_dir, opt_put_remote)): - return True - else: - return False + return filename in sftp.listdir("%s/%s" % (working_dir, opt_put_remote)) def create_testfile(paths): diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index db6a606..8b2bad9 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -305,10 +305,7 @@ def is_inode_cabable(path): import win32api # pylint: disable=import-error volume_info = win32api.GetVolumeInformation(volume_name) volume_type = volume_info[-1] - if "ntfs" in volume_type.lower(): - return True - else: - return False + return "ntfs" in volume_type.lower() else: return False diff --git a/agents/plugins/mtr b/agents/plugins/mtr index 08ed178..3ffe9e3 100755 --- a/agents/plugins/mtr +++ b/agents/plugins/mtr @@ -47,10 +47,7 @@ config_dir = mk_confdir + "/mtr.d/*.cfg" status_filename = mk_vardir + "/mtr.state" report_filepre = mk_vardir + "/mtr.report." -if '-d' in sys.argv[2:] or '--debug' in sys.argv[1:]: - debug = True -else: - debug = False +debug = '-d' in sys.argv[2:] or '--debug' in sys.argv[1:] def which(program): @@ -179,13 +176,8 @@ def check_mtr_pid(pid): else: pid_cmdline = "/proc/%d/cmdline" % pid try: - if os.path.exists(pid_cmdline): - if file(pid_cmdline).read().startswith("mtr\x00--report\x00--report-wide"): - return True - else: - return False # different process than mtr - else: - return False # cmdline no longer exists, race condition.. + return os.path.exists(pid_cmdline) and \ + file(pid_cmdline).read().startswith("mtr\x00--report\x00--report-wide") except: return False # any error diff --git a/checks/cisco_mem.include b/checks/cisco_mem.include index e75351a..2b30eb2 100644 --- a/checks/cisco_mem.include +++ b/checks/cisco_mem.include @@ -32,10 +32,7 @@ factory_settings["cisco_mem_default_levels"] = { def scan_cisco_mem_asa64(oid): version = int((oid(".1.3.6.1.2.1.1.1.0").split("Version")[-1]).split(".")[0]) - if version >= 9: - return True - else: - return False + return version >= 9 def inventory_cisco_mem(info): diff --git a/checks/if.include b/checks/if.include index 3def51a..ce1c525 100644 --- a/checks/if.include +++ b/checks/if.include @@ -649,10 +649,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou group_operStatus = "2" # down alias_info = [] - if len(params["aggregate"].get("group_patterns", {})) >= 2: - add_node_info = True - else: - add_node_info = False + add_node_info = len(params["aggregate"].get("group_patterns", {})) >= 2 for node_name, attrs in params["aggregate"].get("group_patterns", {}).items(): if attrs.get("iftype"): diff --git a/checks/ipmi b/checks/ipmi index 4af9f28..23a2d3b 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -204,11 +204,6 @@ def inventory_ipmi(info): rules = host_extra_conf(host_name(), inventory_ipmi_rules) if rules and type(rules[0]) == dict: if rules[0].get("summarize", True): - summarize = True - else: - summarize = False - - if summarize: rules = [ 'summarize' ] else: if rules[0].get('ignored_sensors', []):

6 years, 2 months

Be strict about infotext being a string.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 09f72c5e4af24314b6177930828ede03fe64f51d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f72c5e4af243… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 5 12:44:56 2018 +0200 Be strict about infotext being a string. Remove all falsey infotexts from the aggregation of check results (to avoid multiple commas). Make sure we consider the check status, even if the infotext is falsey. The test classes in checktestlib.py expect infotext to be of type str *allways*. Change-Id: Ib99ce305711105726cc4512aeae6046c0cbea760 --- checks/diskstat.include | 2 +- checks/hivemanager_devices | 6 +++--- checks/lnx_quota | 6 +++--- checks/mkeventd_status | 4 ++-- checks/omd_apache | 2 +- cmk_base/checking.py | 9 ++++----- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index c6617dd..9055738 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -457,4 +457,4 @@ def check_diskstat_dict(item, params, disks): # Currently the levels are not shown in the perfdata perfdata.append(("disk_" + key, value)) - yield 0, None, perfdata + yield 0, '', perfdata diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index a440041..b0e0cb2 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -68,16 +68,16 @@ def check_hivemanager_devices(item, params, info): levels = ' Warn/Crit at %s/%s' % ( warn, crit ) if number_of_clients >= crit: - yield 2, infotext+levels, perfdata + yield 2, infotext + levels, perfdata elif number_of_clients >= warn: - yield 1, infotext+levels, perfdata + yield 1, infotext + levels, perfdata else: yield 0, infotext, perfdata # Uptime state = 0 warn, crit = 0, 0 - infotext = None + infotext = '' uptime_secs = 0 if infos['upTime'] != 'down': uptime_tokens = map(int, infos['upTime'].split()[-2::-2]) diff --git a/checks/lnx_quota b/checks/lnx_quota index 0560b0e..bf00db6 100644 --- a/checks/lnx_quota +++ b/checks/lnx_quota @@ -110,7 +110,7 @@ def lnx_quota_limit_check(mode, what, user, used, soft, hard, grace): txt += ', within grace time' else: state = 0 - txt = None + txt = '' return state, txt @@ -161,10 +161,10 @@ def check_lnx_quota(item, params, parsed): if txt: at_least_one_problematic = True - yield state, (txt + ', ') + yield state, txt #yield state, (txt + ', '), perfdata else: - yield state, None + yield state, '' #yield state, None, perfdata if not at_least_one_problematic: diff --git a/checks/mkeventd_status b/checks/mkeventd_status index 373bd93..b0ca294 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -119,7 +119,7 @@ def check_mkeventd_status(item, params, parsed): else: value = rates["rule_hit"] / rates["rule_trie"] * 100 hit_rate_txt = "%.2f%%" % value - yield 0, None, [("average_rule_hit_ratio", value)] + yield 0, '', [("average_rule_hit_ratio", value)] yield 0, "%s: %s" % ("Rule hit ratio", hit_rate_txt) # Time columns @@ -132,7 +132,7 @@ def check_mkeventd_status(item, params, parsed): value = status.get("average_%s_time" % name) if value: txt = "%.2f ms" % (value * 1000) - yield 0, None, [("average_%s_time" % name, value)] + yield 0, '', [("average_%s_time" % name, value)] else: if name == "sync": continue # skip if not available diff --git a/checks/omd_apache b/checks/omd_apache index 073ee03..ac67f5f 100644 --- a/checks/omd_apache +++ b/checks/omd_apache @@ -119,7 +119,7 @@ def check_omd_apache(item, _no_params, parsed): rate = get_rate("omd_apache.%s.%s.%s" % (item, ty, key), this_time, value, onwrap=SKIP, is_rate=True) total += rate - yield 0, None, [(ty+'_'+key, rate)] + yield 0, '', [(ty + '_' + key, rate)] total = ty == 'bytes' and get_bytes_human_readable(total) or '%.2f' % total yield 0, '%s %s' % (total, title) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 9794706..a7362ba 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -365,6 +365,7 @@ def _sanitize_yield_check_result(result, is_snmp): # Simple check with no separate subchecks (yield wouldn't have been neccessary here!) if len(subresults) == 1: state, infotext, perfdata = _sanitize_tuple_check_result(subresults[0], allow_missing_infotext=True) + # just to be safe - infotext should allways be a string if infotext == None: return state, u"", perfdata else: @@ -381,15 +382,13 @@ def _sanitize_yield_check_result(result, is_snmp): for subresult in subresults: st, text, perf = _sanitize_tuple_check_result(subresult, allow_missing_infotext=True) - # FIXME/TODO: Why is the state only aggregated when having text != None? - if text != None: - infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) - status = cmk_base.utils.worst_service_state(st, status) + infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) + status = cmk_base.utils.worst_service_state(st, status) if perf != None: perfdata += subresult[2] - return status, ", ".join(infotexts), perfdata + return status, ", ".join(i for i in infotexts if i), perfdata def _item_not_found(is_snmp):

6 years, 2 months

Don't raise an 'Exception'. Be as specific as possible.

by Moritz Kiemer

Module: check_mk Branch: master Commit: a7407580652b18d3df8c338d759b0811fe8189f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7407580652b18… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 6 14:49:39 2018 +0200 Don't raise an 'Exception'. Be as specific as possible. Change-Id: If05824b4f3054bb08b54c46e041cdd86e5a7ae9e --- checks/multipath | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/multipath b/checks/multipath index 0f472c4..de0a34b 100644 --- a/checks/multipath +++ b/checks/multipath @@ -220,10 +220,9 @@ def parse_multipath(info): dm_device = None break - # No data row and no matching header row if not matchobject: - raise Exception("Invalid line in agent output: " + l) + raise ValueError("Invalid line in agent output: " + l) # initialize information about next device numpaths = 0

6 years, 2 months

esx_vsphere_sensors: Add information from user-relevant comment in check to manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6a418864cb2ef3f24aa62f426e9edad37868a9a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a418864cb2ef3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 12 10:23:57 2018 +0200 esx_vsphere_sensors: Add information from user-relevant comment in check to manpage Change-Id: I8ef58952d6d41d0dc673e75d39fa85270f132de6 --- checkman/esx_vsphere_sensors | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checkman/esx_vsphere_sensors b/checkman/esx_vsphere_sensors index 0934271..2eb13e4 100644 --- a/checkman/esx_vsphere_sensors +++ b/checkman/esx_vsphere_sensors @@ -9,6 +9,12 @@ description: hard disk, an others. In order to avoid network traffic the agent sends only information about sensors that are not in green state. + Note: Due to a caching problem on the ESX host system side, this check + occasionally reports incorrect sensor data. This may mean that the + sensor appears to be stuck in an unhealthy state. You can find more + information here: + http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externa… + inventory: One check per ESX Host System will be created.

6 years, 2 months

6135 mssql_backup: The check can handle situations if no backups are found

by Simon Betz

Module: check_mk Branch: master Commit: 2d49caecceb6088a65cc6c3b841e967af192388c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d49caecceb608… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 13:08:59 2018 +0200 6135 mssql_backup: The check can handle situations if no backups are found Change-Id: I1c3c5ef55a1c427794397372c3202edbdc6b38d3 --- .werks/6135 | 13 +++ agents/windows/plugins/mssql.vbs | 5 ++ checkman/mssql_backup | 2 + checks/mssql_backup | 148 +++++++++++++++++------------------ web/plugins/wato/check_parameters.py | 2 +- 5 files changed, 95 insertions(+), 75 deletions(-) diff --git a/.werks/6135 b/.werks/6135 new file mode 100644 index 0000000..bb63ba5 --- /dev/null +++ b/.werks/6135 @@ -0,0 +1,13 @@ +Title: mssql_backup: The check can handle situations if no backups are found +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529572730 +Class: feature + +The agent plugin {{mssql.vbs}} must be installed. +The default state if no backup is found is WARN. +This state is configurable via the check parameters +{{MSSQL Time since last Backup}}. diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index ac9c5bc..3781217 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -388,6 +388,11 @@ For Each instance_id In instances.Keys: Do ' Continue trick "END " & _ "EXEC (@SQLCommand)" ,CONN + If RS.Eof Then + addOutput("MSSQL_" & instance_id & "|" & Replace(dbName, " ", "_") & _ + "|-|-|-|no backup found") + End If + Do While Not RS.Eof lastBackupDate = Trim(RS("last_backup_date")) diff --git a/checkman/mssql_backup b/checkman/mssql_backup index e9e8902..eca1a55 100644 --- a/checkman/mssql_backup +++ b/checkman/mssql_backup @@ -13,6 +13,8 @@ description: The check has been developed with MSSQL Server 2008 R2 but should work with other versions too. + The state if no backup is found is configurable. + This check needs the Check_MK mssql.vbs -plugin installed in the agent. Please refer to the online documentation for how to install that plugin. diff --git a/checks/mssql_backup b/checks/mssql_backup index f2ad4a4..b431173 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -48,112 +48,112 @@ def parse_mssql_backup(info): - - def get_backup_type_name(backup_type): - return { - "D": "database ", - "I": "database diff ", - "L": "log ", - "F": "file or filegroup ", - "G": "file diff ", - "P": "partial ", - "Q": "partial diff ", - "-": "unspecific ", - }.get(backup_type, "") - - parsed = [] + def _parse_date_and_time(backup_date, backup_time): + try: + timestamp = time.mktime(time.strptime( + "%s %s" % (backup_date, backup_time), + '%Y-%m-%d %H:%M:%S')) + except ValueError: + timestamp = None + return timestamp + + map_backup_types = { + "D": "database", + "I": "database diff", + "L": "log", + "F": "file or filegroup", + "G": "file diff", + "P": "partial", + "Q": "partial diff", + "-": "unspecific", + } + + parsed = {} + Backup = collections.namedtuple("Backup", ["timestamp", "type", "state"]) for line in info: - if len(line) not in [3, 4, 5]: - continue + backup_state = None + backup_type = None + if len(line) == 6: + inst, tablespace, backup_date, backup_time, backup_type, backup_state = line + timestamp = _parse_date_and_time(backup_date, backup_time) - # read data - backup_date = None - if len(line) == 5: + elif len(line) == 5: inst, tablespace, backup_date, backup_time, backup_type = line + timestamp = _parse_date_and_time(backup_date, backup_time) + elif len(line) == 4: inst, tablespace, backup_date, backup_time = line - backup_type = None + timestamp = _parse_date_and_time(backup_date, backup_time) + elif len(line) == 3: inst, tablespace, backup_timestamp = line - backup_type = None - - # construct content - db_system = inst + ' ' + tablespace + try: + timestamp = int(backup_timestamp) + except ValueError: + timestamp = None - if backup_date: - # TODO: Timezone issue? Agent should always send UTC timestamp. - timestamp = time.mktime(time.strptime( - backup_date + ' ' + backup_time, '%Y-%m-%d %H:%M:%S') - ) - else: - timestamp = int(backup_timestamp) - - backup_type_name = get_backup_type_name(backup_type) - - if backup_type == None: - perfkey = "seconds" else: - perfkey = "backup_age_%s" % backup_type_name.strip().replace(" ", "_") + continue - parsed.append((db_system, timestamp, backup_type_name, perfkey)) + parsed.setdefault("%s %s" % (inst, tablespace), []).append( + Backup(timestamp, map_backup_types.get(backup_type), backup_state)) return parsed def inventory_mssql_backup(parsed): - return [ (line[0], {}) - for line in parsed - if len(line) in [3, 4, 5] ] + for db_name in parsed.iterkeys(): + yield db_name, {} def check_mssql_backup(item, params, parsed): - found_instance = False - for db_system, timestamp, backup_type_name, perfkey in parsed: - if item != db_system: - continue - found_instance = True + if item not in parsed: + # Assume general connection problem to the database, which is reported + # by the "X Instance" service and skip this check. + raise MKCounterWrapped("Failed to connect to database") + + if not isinstance(params, dict): + params = {"database": params} - if not isinstance(params, dict): - params = {"database": params} + for backup in parsed[item]: + if backup.state == "no backup found": + yield params.get("not_found", 1), "State: %s" % backup.state + continue - if backup_type_name == "": # use "database" parameters as default for old agent output - age_warn, age_crit = params["database"] + if backup.type is None: + backup_type_var = "database" + perfkey = "seconds" + infotext = "[database] " else: - backup_type_var = backup_type_name.strip().replace(" ", "_") - age_warn, age_crit = params.get(backup_type_var, (None, None)) + backup_type_var = backup.type.strip().replace(" ", "_") + perfkey = "backup_age_%s" % backup_type_var + infotext = "[%s] " % backup.type state = 0 - sec_ago = time.time() - timestamp + age_warn, age_crit = params.get(backup_type_var, (None, None)) + sec_ago = time.time() - backup.timestamp if age_crit is not None and sec_ago >= age_crit: state = 2 elif age_warn is not None and sec_ago >= age_warn: state = 1 - perfdata = [(perfkey, sec_ago, age_warn, age_crit)] - infotext = 'Last %sbackup was at %s (%s ago)' % ( - backup_type_name, - time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(timestamp)), - get_age_human_readable(sec_ago) - ) + infotext += 'Last backup was at %s (%s ago)' % ( + time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(backup.timestamp)), + get_age_human_readable(sec_ago)) - if state != 0: + if state: infotext += " (warn/crit at %s/%s)" % ( - get_age_human_readable(age_warn), get_age_human_readable(age_crit) - ) - - yield state, infotext, perfdata + get_age_human_readable(age_warn), get_age_human_readable(age_crit)) - if not found_instance: - # Assume general connection problem to the database, which is reported - # by the "X Instance" service and skip this check. - raise MKCounterWrapped("Failed to connect to database") + yield state, infotext, [(perfkey, sec_ago, age_warn, age_crit)] check_info['mssql_backup'] = { - 'parse_function': parse_mssql_backup, - 'check_function': check_mssql_backup, - 'inventory_function': inventory_mssql_backup, - 'service_description': 'MSSQL %s Backup', - 'has_perfdata': True, - 'group': 'mssql_backup', + 'parse_function' : parse_mssql_backup, + 'inventory_function' : inventory_mssql_backup, + 'check_function' : check_mssql_backup, + 'default_levels_variable' : 'mssql_backup_default_levels', + 'service_description' : 'MSSQL %s Backup', + 'has_perfdata' : True, + 'group' : 'mssql_backup', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 68c7117..1ace68d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10384,7 +10384,7 @@ register_check_parameters( Age(title = _("Warning if older than")), Age(title = _("Critical if older than")), ])), - + ("not_found", MonitoringState(title=_("State if no backup found"))), ] ), forth = lambda params: (params if isinstance(params, dict)

6 years, 2 months

← Newer
1
...
31
32
33
34
35
36
37
...
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