Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: check_temperature in temperature.include can now handle device levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: b421cb73d2ebcc2bd5450ad795d9ddd599b32a62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b421cb73d2ebcc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 16 14:35:03 2015 +0100 check_temperature in temperature.include can now handle device levels --- checks/temperature.include | 164 ++++++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 22 ++--- 2 files changed, 140 insertions(+), 46 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 9839fff..4c26df3 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -35,7 +35,7 @@ def celsius_to_fahrenheit(tempc): # Checks Celsius temperature against crit/warn levels defined in params. temp must # be int or float -def check_temperature(temp, params, dev_unit = "c"): +def check_temperature(temp, params, dev_unit = "c", dev_levels = None, dev_levelsl = None, dev_status = None): def tostring(temp): if type(temp) == int: @@ -51,16 +51,29 @@ def check_temperature(temp, params, dev_unit = "c"): else: return tempc + def check_levels(temp, warn, crit, warnl, critl): + if crit != None and temp >= crit: + status = 2 + elif critl != None and temp < critl: + status = 2 + elif warn != None and temp >= warn: + status = 1 + elif warnl != None and temp < warnl: + status = 1 + else: + status = 0 + return status + unitsym = { "c": "°C", "f": "°F", "k": "K", } - if type(params) == tuple: - params = { "levels" : params } - elif params == None: + if params == None or params == (None, None): params = {} + elif type(params) == tuple: + params = { "levels" : params } input_unit = params.get("input_unit", dev_unit) output_unit = params.get("output_unit", "c") @@ -70,39 +83,118 @@ def check_temperature(temp, params, dev_unit = "c"): if input_unit == "k": temp = temp - 273.15 - if type(params) == dict: - warn, crit = params.get("levels", (None, None)) - warnl, critl = params.get("levels_lower", (None, None)) - perfdata = [ ("temp", temp, warn, crit, warnl, critl) ] - infotext = "%s %s" % (tostring(outtemp(temp, output_unit)), unitsym[output_unit]) - levelstext = "" - levelstext_lower = "" - if warn != None and crit != None: - levelstext = " (warn/crit at %s/%s %s)" % ( - tostring(outtemp(warn, output_unit)), - tostring(outtemp(crit, output_unit)), - unitsym[output_unit]) - if warnl != None and critl != None: - levelstext_lower = " (warn/crit below %s/%s %s)" % ( - tostring(outtemp(warnl, output_unit)), - tostring(outtemp(critl, output_unit)), - unitsym[output_unit]) - - if crit != None and temp >= crit: - status = 2 - infotext += levelstext - elif critl != None and temp < critl: - status = 2 - infotext += levelstext_lower - - elif warn != None and temp >= warn: - status = 1 - infotext += levelstext - elif warnl != None and temp < warnl: - status = 1 - infotext += levelstext_lower + usr_levels = params.get("levels", None) + usr_levelsl = params.get("levels_lower", None) + dlh = params.get("device_levels_handling", "usrdefault") + + uwarn = ucrit = uwarnl = ucritl = dwarn = dcrit = dwarnl = dcritl = None + + if usr_levels: + uwarn, ucrit = usr_levels + if usr_levelsl: + uwarnl, ucritl = usr_levelsl + if dev_levels: + dwarn, dcrit = dev_levels + if dev_levelsl: + dwarnl, dcritl = dev_levelsl + +# if dev_status: +# warn, crit, warnl, critl = uwarn, ucrit, uwarnl, ucritl +# ustatus = check_levels(temp, warn, crit, warnl, critl) +# if dlh == "usr": +# status = ustatus +# if dlh == "dev" or dlh == "devdefault": +# warn = crit = warnl = critl = None +# status = dev_status +# if dlh == "best": +# status = min(dev_status, ustatus) +# if dlh == "worst": +# status = max(dev_status, ustatus) + +# if not dev_status: + if dlh == "usr": + warn, crit, warnl, critl = uwarn, ucrit, uwarnl, ucritl + + if dlh == "dev": + warn, crit, warnl, critl = dwarn, dcrit, dwarnl, dcritl + + if dlh == "best": + warn, crit = max(uwarn, dwarn), max(ucrit, dcrit) + warnl, critl = min(uwarnl, dwarnl), min(ucritl, dcritl) + + if dlh == "worst": + warn, crit = min(uwarn, dwarn), min(ucrit, dcrit) + warnl, critl = max(uwarnl, dwarnl), max(ucritl, dcritl) + + if dlh == "usrdefault": + if usr_levels: + warn, crit = usr_levels + else: + warn, crit = dwarn, dcrit + if usr_levelsl: + warnl, critl = usr_levelsl + else: + warnl, critl = dwarnl, dcritl + if dlh == "devdefault": + if dev_levels: + warn, crit = dev_levels else: - status = 0 + warn, crit = uwarn, ucrit + if dev_levelsl: + warnl, critl = dev_levelsl + else: + warn, crit = uwarnl, ucritl + + status = check_levels(temp, warn, crit, warnl, critl) + + perfdata = [ ("temp", temp, warn, crit, warnl, critl) ] + + infotext = "%s %s" % (tostring(outtemp(temp, output_unit)), unitsym[output_unit]) + ulevelstext = "" + ulevelstext_lower = "" + dlevelstext = "" + dlevelstext_lower = "" + if usr_levels: + ulevelstext = " (warn/crit at %s/%s %s)" % ( + tostring(outtemp(uwarn, output_unit)), + tostring(outtemp(ucrit, output_unit)), + unitsym[output_unit]) + if usr_levelsl: + ulevelstext_lower = " (warn/crit below %s/%s %s)" % ( + tostring(outtemp(uwarnl, output_unit)), + tostring(outtemp(ucritl, output_unit)), + unitsym[output_unit]) + if dev_levels: + dlevelstext = " (device warn/crit at %s/%s %s)" % ( + tostring(outtemp(dwarn, output_unit)), + tostring(outtemp(dcrit, output_unit)), + unitsym[output_unit]) + if dev_levelsl: + dlevelstext_lower = " (device warn/crit below %s/%s %s)" % ( + tostring(outtemp(dwarnl, output_unit)), + tostring(outtemp(dcritl, output_unit)), + unitsym[output_unit]) + + + if status in [1, 2] : + if dlh == "usr": + infotext += ulevelstext + ulevelstext_lower + elif dlh == "dev": + infotext += dlevelstext + dlevelstext_lower + elif dlh == "best" or dlh == "worst": + infotext += ulevelstext + ulevelstext_lower + dlevelstext + dlevelstext_lower + elif dlh == "devdefault": + infotext += dlevelstext + dlevelstext_lower + if not dev_levels: + infotext += ulevelstext + if not dev_levelsl: + infotext += ulevelstext_lower + elif dlh == "usrdefault": + infotext += ulevelstext + ulevelstext_lower + if not usr_levels: + infotext += dlevelstext + if not usr_levelsl: + infotext += dlevelstext_lower return status, infotext, perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0f94ea4..97533cb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5266,16 +5266,18 @@ register_check_parameters( ( "k", _("Kelvin") ), ] )), - ## ( "sensor_levels", - ## DropdownChoice( - ## title = _("Interpretation of Sensor's own temperature status"), - ## choices = [ - ## ( "ignore", _("Ignore sensor's own levels") ), - ## ( "sensor", _("Only use sensor's levels, ignore yours" ) ), - ## ( "best", _("Use least critical of your and sensor's levels") ), - ## ( "worst", _("Use most critical of your and sensor's levels") ), - ## ] - ## )), + ( "device_levels_handling", + DropdownChoice( + title = _("Interpretation of the device's own temperature status"), + choices = [ + ( "usr", _("Ignore device's own levels") ), + ( "dev", _("Only use device's levels, ignore yours" ) ), + ( "best", _("Use least critical of your and device's levels") ), + ( "worst", _("Use most critical of your and device's levels") ), + ( "devdefault", _("Use device's levels if present, otherwise yours") ), + ( "usrdefault", _("Use your own levels if present, otherwise the device's") ), + ] + )), ] ),

9 years, 8 months

Check_MK Git: check_mk: Updated ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: af149a7d05fd9159c538e39a9cad933929e2b5ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af149a7d05fd91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 16 12:58:00 2015 +0100 Updated ChangeLog --- ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index d0297fe..df417ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,10 @@ * 1462 netscaler_ha: new check to monitor the HA state of Citrix Netscaler appliances * 1838 emc_datadomain_mtree: New check for EMC Datadomain MTrees... * 1464 netscaler_mem: new check to monitor the memory usage of Citrix Netscaler Appliances + * 1822 oracle_undostat: rule for non space error count... + * 1823 mk_oracle_crs: compatibility against CRS 10.2 + 11.1... + * 1825 oracle_recovery_status: backupcheck for user managed backups... + * 1826 oracle_dataguard_stats: New rule for apply_lag_min, removed default rule... * 1807 check_mail: Added new check to check IMAP/POP3 login (incl. forwarding of mails to event console)... * 1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of the day... * 1668 Interface groups: Can create groups out of interface item names... @@ -57,11 +61,17 @@ * 1818 FIX: dell_poweredge_cpu: Fix exception where BrandName is missing * 1819 FIX: dell_poweredge_temp: Make output and service description consistent with other temperature checks... NOTE: Please refer to the migration notes! + * 1388 FIX: oracle_asm_diskgroup: fixed wrong calculation of free space in NORMAL/HIGH redundancy Disk Groups... + * 1389 FIX: oracle_rman: detect failed jobs... + * 1390 FIX: mk_oracle: better detection of RMAN Archivelog Backups... + * 1391 FIX: oracle_instance: New function for Primary Database not OPEN... * 1833 FIX: jolokia_metrics.gc: fix recently introduced exception for missing variable * 1463 FIX: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed * 1806 FIX: services check was not recognizing configured state when no service was found * 1840 FIX: oracle_tablespaces: fix implementation of magic factor * 1848 FIX: df: title of pnp graphs for filesystem checks fixed... + * 1821 FIX: mk_oracle: changed connection to dedicated server mode... + * 1824 FIX: oracle_recovery_status: removed default values from Check... * 1209 FIX: livestatus_status: Check handles cluster using in cluster now * 1809 FIX: cisco_temp_perf: Fixed exception when no temperature threshold provided by device * 1812 FIX: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup)

9 years, 8 months

Check_MK Git: check_mk: #1844 FIX oracle_crs_res: fix computation of node a ressource is running on

by Mathias Kettner

Module: check_mk Branch: master Commit: 63734016f25c0e0171d4fe8a74fccab66a0aa495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63734016f25c0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 16 12:24:26 2015 +0100 #1844 FIX oracle_crs_res: fix computation of node a ressource is running on Also now output information about the status of the ressource on all nodes. --- .werks/1844 | 11 ++++ ChangeLog | 1 + checks/oracle_crs_res | 165 ++++++++++++++++++++++++------------------------- 3 files changed, 92 insertions(+), 85 deletions(-) diff --git a/.werks/1844 b/.werks/1844 new file mode 100644 index 0000000..270c04d --- /dev/null +++ b/.werks/1844 @@ -0,0 +1,11 @@ +Title: oracle_crs_res: fix computation of node a ressource is running on +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421407433 + +Also now output information about the status of the ressource on +all nodes. diff --git a/ChangeLog b/ChangeLog index d90793b..566c593 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 1809 FIX: cisco_temp_perf: Fixed exception when no temperature threshold provided by device * 1812 FIX: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) * 1814 FIX: agent_ibmsvc: Fixed missing executable flag + * 1844 FIX: oracle_crs_res: fix computation of node a ressource is running on... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/oracle_crs_res b/checks/oracle_crs_res index f105972..bf506bf 100644 --- a/checks/oracle_crs_res +++ b/checks/oracle_crs_res @@ -24,45 +24,59 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Developed by Thorsten Bruhns from OPITZ CONSULTING Deutschland GmbH - -# <<<oracle_crs_res>>> -# parsing of output from agent is done in this check - -def inventory_oracle_crs_res(info): - inventory = [] - for line in info: - if line[2][0:5] == 'NAME=': - - inventory.append((line[2][5:], None)) - return inventory - -def parse_oracle_crs_data(info): - """ parse output from agent and generate a list with dictionary - Each section starts with NAME= - Key/Value is splitted by '=' - """ - data = [] - datadict = {} - - for line in info: - - if line[2] == '\n' or line[1] == 'nodename': +# Original version by Thorsten Bruhns from OPITZ CONSULTING Deutschland GmbH + +# <<<oracle_crs_res:sep(124)>>> +# ezszds8c|NAME=ora.DG_CLUSTER.dg +# ezszds8c|TYPE=ora.diskgroup.type +# ezszds8c|STATE=ONLINE on ezszds8c +# ezszds8c|TARGET=ONLINE +# ezszds8c|NAME=ora.I31_ARCH.dg +# ezszds8c|TYPE=ora.diskgroup.type +# ezszds8c|STATE=ONLINE on ezszds8c +# ezszds8c|TARGET=ONLINE +# ezszds8c|NAME=ora.I31_DATA.dg +# ezszds8c|TYPE=ora.diskgroup.type +# ezszds8c|STATE=ONLINE on ezszds8c +# ezszds8c|TARGET=ONLINE +# ezszds8c|NAME=ora.I31_MLOG.dg +# ezszds8c|TYPE=ora.diskgroup.type +# ezszds8c|STATE=ONLINE on ezszds8c +# ezszds8c|TARGET=ONLINE +# ...usw... + +# Parse output into dict of dicts of dicts: +# nodename -> ressource name -> entry +# ressource. Example: +# { 'ezszds8c' : +# { 'ora.I31_ARCH.dg' : { +# 'state': 'ONLINE on ezszds9c', +# 'target': 'ONLINE', +# 'type': 'ora.diskgroup.type'} +# } +# } +# Returns a pair of CRS node name and the former dict +def parse_oracle_crs_res(info): + ressources = {} + for nodename, varsetting in info: + if nodename == "nodename": + crs_nodename = varsetting continue - if line[2][0:5] == 'NAME=': -# print line[2].split('=', 1) - if len(datadict) > 0: - data.append([datadict.copy(), line[1]]) - datadict.clear() + key, value = varsetting.split("=", 1) + if key == "NAME": + res_name = value + entry = {} + ressources.setdefault(res_name, {}) + ressources[res_name][nodename] = entry + else: + entry[key.lower()] = value + return crs_nodename, ressources + - datasplit = line[2].split('=', 1) - datadict[datasplit[0]] = datasplit[1] +def inventory_oracle_crs_res(parsed): + return [ (name, None) for name in parsed[1] ] - # add last entry - if len(datadict) > 0: - data.append([datadict.copy(), line[1]]) - return data def get_oracle_crs_runninginfo(item, data): infotext = '' @@ -83,64 +97,45 @@ def get_oracle_crs_runninginfo(item, data): return infotext -def get_oracle_crs_nodename(info): - for line in info: - if line[1] == 'nodename': - return line[2] - return '' - -def check_oracle_crs_res(item, params, info): - # state = -1 => no data for Service - state = -1 - infotext = '' - data = [] - data = parse_oracle_crs_data(info) - - for line in data: - - nodename = line[1] - crsnodename = get_oracle_crs_nodename(info) - resname = line[0]['NAME'] - restype = line[0]['TYPE'] - resstate = line[0]['STATE'].split(' ', 1)[0] - restarget = line[0]['TARGET'] - - if resname == item and nodename in ('csslocal', crsnodename): - if nodename == 'csslocal': - runningtext = '[local resource]' - else: - runningtext = get_oracle_crs_runninginfo(resname, data) - - if resstate <> restarget: - state = 2 - infotext = 'state %s (!!), target state %s %s' \ - % (resstate, restarget, runningtext) - else: - state = 0 - infotext = 'state %s, target state %s %s' \ - % (resstate.lower(), restarget.lower(), runningtext) - - # we found no agent data for cssd. => Clusterware not running - if item == 'ora.cssd' and state == -1: - state = 2 - infotext = 'Clusterware not running!' - - if item == 'ora.crsd' and state == -1: - state = 2 - infotext = 'Cluster Resource Service Daemon not running!' - - if state <> -1: - return (state, infotext) +def check_oracle_crs_res(item, _no_params, parsed): + crs_nodename, ressources = parsed # In case of missing information we assume that the clusterware # is not running and we simple skip the result - raise MKCounterWrapped("No resource details found for %s. Maybe the cssd/crsd is not running" % item) + if item not in ressources: + if item == 'ora.cssd': + yield 2, "Clusterware not running" + elif item == 'ora.crsd': + yield 2, "Cluster Resource Service Daemon not running!" + else: + raise MKCounterWrapped("No ressource details found for %s. Maybe the cssd/crsd is not running" % item) + return + + for nodename, entry in ressources[item].items(): + restype = entry["type"] + resstate = entry["state"].split(' ', 1)[0] + restarget = entry["target"] + + if nodename == "csslocal": + infotext = "local: " + else: + infotext = "on " + nodename + ": " + infotext += resstate.lower() + + if resstate != restarget: + state = 2 + infotext += ", target state %s" % restarget.lower() + else: + state = 0 + yield state, infotext + + check_info['oracle_crs_res'] = { + "parse_function" : parse_oracle_crs_res, "check_function" : check_oracle_crs_res, "inventory_function" : inventory_oracle_crs_res, "service_description" : "ORA-GI %s Resource", - "node_info" : True, "group" : "oracle_crs_res", }

9 years, 8 months

Check_MK Git: check_mk: #1817 FIX The Check_MK service did not result in CRITICAL/ WARNING states when using Nagios as core

by Lars Michelsen

Module: check_mk Branch: master Commit: 98ca18ed30b9e049ecbacb5b0402322c74ebcf71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98ca18ed30b9e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 16 08:42:33 2015 +0100 #1817 FIX The Check_MK service did not result in CRITICAL/WARNING states when using Nagios as core When using Nagios (or Icinga) as monitoring core, the "Check_MK" services was always resulting in an OK state, even when the output reported that it has a critical problem, for example because of the agent of the monitored host can not be reached. This bug seem to be existant since Mon, 15 Dec 2014. --- .werks/1817 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1817 b/.werks/1817 new file mode 100644 index 0000000..27bddde --- /dev/null +++ b/.werks/1817 @@ -0,0 +1,14 @@ +Title: The Check_MK service did not result in CRITICAL/WARNING states when using Nagios as core +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421393931 + +When using Nagios (or Icinga) as monitoring core, the "Check_MK" services was always resulting +in an OK state, even when the output reported that it has a critical problem, for example +because of the agent of the monitored host can not be reached. + +This bug seem to be existant since Mon, 15 Dec 2014. diff --git a/ChangeLog b/ChangeLog index a9d8502..5a459fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 1809 FIX: cisco_temp_perf: Fixed exception when no temperature threshold provided by device * 1812 FIX: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) * 1814 FIX: agent_ibmsvc: Fixed missing executable flag + * 1817 FIX: The Check_MK service did not result in CRITICAL/WARNING states when using Nagios as core... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/modules/check_mk.py b/modules/check_mk.py index bf0dcc4..acfab986 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2895,7 +2895,7 @@ no_inventory_possible = None # perform actual check with a general exception handler output.write("try:\n") - output.write(" do_check(%r, %r)\n" % (hostname, ipaddress)) + output.write(" sys.exit(do_check(%r, %r))\n" % (hostname, ipaddress)) output.write("except SystemExit, e:\n") output.write(" sys.exit(e.code)\n") output.write("except Exception, e:\n")

9 years, 8 months

Check_MK Git: check_mk: #1816 FIX Fixed garbled output on "rename host" result page

by Lars Michelsen

Module: check_mk Branch: master Commit: 33790f103b6d45f97ccda9c40052047e44a2e8d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33790f103b6d45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 16 08:24:14 2015 +0100 #1816 FIX Fixed garbled output on "rename host" result page --- .werks/1816 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1816 b/.werks/1816 new file mode 100644 index 0000000..ebcc598 --- /dev/null +++ b/.werks/1816 @@ -0,0 +1,10 @@ +Title: Fixed garbled output on "rename host" result page +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421393030 + + diff --git a/ChangeLog b/ChangeLog index d90793b..a9d8502 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 1805 FIX: Changing roles marks sites where users can login dirty for sync now... * 1211 FIX: Fixed g_git_messages error on activate changes... * 1212 FIX: Fixed default value in wato parameter page for timeperiods... + * 1816 FIX: Fixed garbled output on "rename host" result page Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 900ab19..9aba1dd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2249,8 +2249,8 @@ def mode_rename_host(phase): log_commit_pending() # All activated by the underlying rename automation html.set_var("host", newname) action_txt = "".join([ "<li>%s</li>" % a for a in actions ]) - return "edithost", _("Renamed host %s into %s at the following places: <ul>%s</ul>") % ( - hostname, newname, action_txt) + return "edithost", HTML(_("Renamed host %s into %s at the following places: <ul>%s</ul>") % ( + hostname, newname, action_txt)) elif c == False: # not yet confirmed return "" return

9 years, 8 months

Check_MK Git: check_mk: Fix problem with missing clusters_of()

by Mathias Kettner

in precompiled host checks Message-ID: <54b7f16c.ExPSyJBmhOrQn9EJ%mk(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: b3aa634df5e18ff5346506ef3b51acf77fc2ff62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3aa634df5e18f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 15 17:57:15 2015 +0100 Fix problem with missing clusters_of() in precompiled host checks --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index b57994f..bf0dcc4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2813,6 +2813,8 @@ no_inventory_possible = None else: output.write("clusters = {}\ndef is_cluster(hostname):\n return False\n\n") + output.write("def clusters_of(hostname):\n return %r\n\n" % clusters_of(hostname)) + # snmp hosts output.write("def is_snmp_host(hostname):\n return %r\n\n" % is_snmp_host(hostname)) output.write("def is_tcp_host(hostname):\n return %r\n\n" % is_tcp_host(hostname))

9 years, 8 months

Check_MK Git: check_mk: #1843 FIX Fixed crash in display of crash report for precompiled host checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 851c3c8247e63287b62ff13ee26c01d1d0e53f85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=851c3c8247e632… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 15 17:49:14 2015 +0100 #1843 FIX Fixed crash in display of crash report for precompiled host checks --- .werks/1843 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/crashed_check.py | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/1843 b/.werks/1843 new file mode 100644 index 0000000..61b796f --- /dev/null +++ b/.werks/1843 @@ -0,0 +1,10 @@ +Title: Fixed crash in display of crash report for precompiled host checks +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421340523 + + diff --git a/ChangeLog b/ChangeLog index c1053d2..d90793b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * 1802 FIX: Links in messages like "successfully sent X commands" are now working again... * 1803 FIX: Fixed exception in Check_MK prediction page... * 1804 FIX: Fixed prechecked checkboxes in view actions after first action submit... + * 1843 FIX: Fixed crash in display of crash report for precompiled host checks WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py index d9d62da..7639e72 100644 --- a/web/htdocs/crashed_check.py +++ b/web/htdocs/crashed_check.py @@ -67,11 +67,19 @@ def page_crashed_check(): raise MKGeneralException("Encoded crash dump data is invalid: %s" % e) trace = fetch_file_from_tar(tardata, "./trace") + tracelines = [] + for line in trace.splitlines(): + try: + tracelines.append(line.decode('utf-8')) + except: + tracelines.append(repr(line)) + trace = "\r\n".join(tracelines) + agent_output = fetch_file_from_tar(tardata, "./agent_output") body = "Dear Check_MK Developer team,\r\n\r\n" \ + "I hereby send you a report of a crashed check:\r\n\r\n" \ - + trace + "\r\n" \ + + trace.decode('utf-8') + "\r\n" \ + "BASE64 encoded tarball with agent output:" \ + "\r\n\r\n\r\n" + encoded_tardata \ + "\r\n\r\nWith best regards,\r\n\r\n"

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0433

by Mathias Kettner

Module: check_mk Branch: master Commit: cec3da4869739b2f773446bcd526dafb31346f16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cec3da4869739b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 15 17:32:02 2015 +0100 Updated bug entries #0433 --- .bugs/433 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/433 b/.bugs/433 index 7222d75..752aacc 100644 --- a/.bugs/433 +++ b/.bugs/433 @@ -1,11 +1,14 @@ Title: cmk -II should keep services on error Component: core -State: open +Class: nastiness +State: done Date: 2011-11-10 11:52:56 Targetversion: future -Class: nastiness If you do a cmk -II on a host and no data can be fetched from the agent, then all services are removed anyway. Better would be to abort with an error and keep the services. + +2015-01-15 17:31:55: changed state open -> done +Fixed by a new implementation of service discovery

9 years, 8 months

Check_MK Git: check_mk: #1842 FIX Rewrote implementation of service discovery (formerly inventory )

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b8c2a6a77e43cfbf5d942cb12140aed76cb1f5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b8c2a6a77e43c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 15 17:31:19 2015 +0100 #1842 FIX Rewrote implementation of service discovery (formerly inventory) The internal code for the service discovery has been writting. The previous name for that feature was "inventory" but the word inventory is now being used for hardware/software-inventory. The option <tt>--check-inventory</tt> has been renamed into <tt>--check-discovery</tt>. Several bugs have been fixed while doing the new implementation. One prominent bug was service discovery on clusters. Another problem that has been fixed was that when during <tt>cmk -II</tt> a host was not reachable its services would have been lost. --- .werks/1842 | 18 ++++++++++++++++++ ChangeLog | 1 + 2 files changed, 19 insertions(+) diff --git a/.werks/1842 b/.werks/1842 new file mode 100644 index 0000000..d8c4af8 --- /dev/null +++ b/.werks/1842 @@ -0,0 +1,18 @@ +Title: Rewrote implementation of service discovery (formerly inventory) +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421339331 + +The internal code for the service discovery has been writting. The previous +name for that feature was "inventory" but the word inventory is now being +used for hardware/software-inventory. The option <tt>--check-inventory</tt> +has been renamed into <tt>--check-discovery</tt>. + +Several bugs have been fixed while doing the new implementation. One prominent +bug was service discovery on clusters. Another problem that has been fixed +was that when during <tt>cmk -II</tt> a host was not reachable its services +would have been lost. diff --git a/ChangeLog b/ChangeLog index bf0a7fe..c1053d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 1797 FIX: Fix incomplete configuration during checking when using CMC... * 1832 FIX: Fix "global name 'splitted' is not defined" in bulk inventory... * 1808 FIX: Fixed broken nagios config when using RBN without a host defined... + * 1842 FIX: Rewrote implementation of service discovery (formerly inventory)... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API...

9 years, 8 months

Check_MK Git: check_mk: Code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 74c2d8ffeb9e37af19a4ba42f80abbb9c584886e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74c2d8ffeb9e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 15 16:40:35 2015 +0100 Code cleanup --- modules/discovery.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/discovery.py b/modules/discovery.py index 04c5efe..26b6261 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -578,8 +578,6 @@ def get_check_preview(hostname, use_caches, do_snmp_scan): else: ipaddress = lookup_ipaddress(hostname) - leave_no_tcp = True # FIXME TODO - table = [] for (check_type, item), (check_source, paramstring) in services.items(): params = None @@ -604,9 +602,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan): global opt_use_cachefile old_opt_use_cachefile = opt_use_cachefile opt_use_cachefile = True - if not leave_no_tcp: - opt_no_tcp = True - opt_dont_submit = True + opt_dont_submit = True # hack for get_realhost_info, avoid skipping because of check interval if check_type not in check_info: continue # Skip not existing check silently

9 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015