Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Service grouping in tables: Non OK services are now displayed above the group

by Lars Michelsen

Module: check_mk Branch: master Commit: c77b8266387a8f4d61381ef55a46db5b703710f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c77b8266387a8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 09:08:26 2016 +0200 Service grouping in tables: Non OK services are now displayed above the group --- web/plugins/views/layouts.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index e2e248d..08829fa 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -199,7 +199,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show if column_headers != "off": show_header_line() - groups = calculate_grouping_of_services(rows_with_ids) + groups, rows_with_ids = calculate_grouping_of_services(rows_with_ids) visible_row_number = 0 group_hidden, num_grouped_rows = None, 0 @@ -297,17 +297,29 @@ def calculate_grouping_of_services(rows): groups = {} current_group = None group_id = None - for index, row in rows: + for index, (row_id, row) in enumerate(rows[:]): group_spec = try_to_match_group(row) if group_spec: if current_group == None: - group_id = index + group_id = row_id + elif current_group != group_spec: - group_id = index + group_id = row_id + + # When the service is not OK and should not be grouped, move it's row + # in front of the group. + if row.get("service_state", -1) != 0 or is_stale(row): + if current_group == None or current_group != group_spec: + continue # skip grouping first row + + elif current_group == group_spec: + row = rows.pop(index) + rows.insert(index - len(groups[group_id][1]), row) + continue current_group = group_spec groups.setdefault(group_id, (group_spec, [])) - groups[group_id][1].append(index) + groups[group_id][1].append(row_id) else: current_group = None @@ -317,13 +329,12 @@ def calculate_grouping_of_services(rows): if len(row_indizes) >= group_spec.get("min_items", 2): groupings[row_indizes[0]] = group_spec, len(row_indizes) - return groupings + return groupings, rows def try_to_match_group(row): for group_spec in config.service_view_grouping: if row.get('service_description', '') != '' \ - and row.get("service_state", -1) == 0 and not is_stale(row) \ and re.match(group_spec["pattern"], row["service_description"]): return group_spec @@ -520,7 +531,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ return members rows_with_ids = [ (row_id(view, row), row) for row in rows ] - groups = calculate_grouping_of_services(rows_with_ids) + groups, rows_with_ids = calculate_grouping_of_services(rows_with_ids) visible_row_number = 0 group_hidden, num_grouped_rows = None, 0

7 years, 10 months

Several minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: c0f1dd848b7151744f9d703327478aa7bc5ae4a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0f1dd848b7151… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 09:07:17 2016 +0200 Several minor cleanups --- web/htdocs/index.py | 5 +++-- web/htdocs/lib.py | 19 ++++++------------- web/htdocs/multitar.py | 4 ++-- web/htdocs/wato.py | 13 ++++--------- web/htdocs/watolib.py | 6 +++--- 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index a99db40..f75d527 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -26,6 +26,8 @@ from mod_python import apache import sys, os, pprint, __builtin__ +import traceback + import i18n import sites import livestatus @@ -66,7 +68,7 @@ def handler(req, fields = None, is_profiling = False): except Exception, e: html.write(str(e)) if config.debug: - html.write(html.attrencode(format_exception())) + html.write(html.attrencode(traceback.format_exc())) raise FinalizeRequest() # Is the user set by the webserver? otherwise use the cookie based auth @@ -179,7 +181,6 @@ def handler(req, fields = None, is_profiling = False): except Exception, e: html.unplug() - import traceback msg = "%s %s: %s" % (html.request_uri(), _('Internal error'), traceback.format_exc()) if type(msg) == unicode: msg = msg.encode('utf-8') diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f737d92..0fef22a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -145,6 +145,8 @@ def remove_user_file(path): os.remove(path) +# TODO: Remove this helper function. Replace with explicit checks and covnersion +# in using code. def savefloat(f): try: return float(f) @@ -259,8 +261,9 @@ def pnp_cleanup(s): .replace('\\', '_') # Quote string for use as arguments on the shell +# TODO: Move to Check_MK library def quote_shell_string(s): - return "'" + s.replace("'", "'\"'\"'") + "'" + return "'" + s.replace("'", "'\"'\"'") + "'" ok_marker = 'OK' warn_marker = 'WARN' @@ -310,10 +313,6 @@ def format_plugin_output(output, row = None): return output -def format_exception(): - import traceback - return traceback.format_exc() - # Debug logging directly to the dedicated web GUI log. The log format is # equal to the cmc.log format. The format is: @@ -354,6 +353,8 @@ def lqencode(s): return s.replace('\n', '') +# TODO: Remove this helper function. Replace with explicit checks and covnersion +# in using code. def saveint(x): try: return int(x) @@ -368,14 +369,6 @@ def tryint(x): return x -def isint(i): - try: - int(i) - return True - except: - return False - - aquire_lock = store.aquire_lock release_lock = store.release_lock have_lock = store.have_lock diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index d020186..47b61c2 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -28,6 +28,7 @@ # of multi-tier tar files (tar files containing tar files) import os, tarfile, time, shutil, cStringIO, defaults, grp +import traceback from lib import * class fake_file: @@ -247,7 +248,7 @@ def extract_domains(tar, domains): errors.extend(dom_errors or []) except Exception, e: # This should NEVER happen - err_info = "Restore-Phase: %s, Domain: %s\nError: %s" % (what, name, format_exception()) + err_info = "Restore-Phase: %s, Domain: %s\nError: %s" % (what, name, traceback.format_exc()) errors.append(err_info) logger(LOG_CRIT, err_info) if abort_on_error == False: @@ -301,7 +302,6 @@ def extract(tar, components): subtar = tarfile.open(fileobj = subtarstream) subtar.extractall(target_dir) except Exception, e: - import traceback raise MKGeneralException('Failed to extract subtar %s: %s' % (name, traceback.format_exc())) # Try to cleanup everything starting from the root_path diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b2cde70..172bcb6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -87,6 +87,7 @@ import sys, pprint, socket, re, time, datetime, \ shutil, tarfile, cStringIO, math, fcntl, random, glob, \ base64, csv import subprocess +import traceback import i18n import config, table, multitar, userdb, weblib, login from hashlib import sha256 @@ -265,7 +266,6 @@ def page_handler(): except Exception, e: html.unplug() - import traceback html.show_error(traceback.format_exc().replace('\n', ' ')) html.write("</div>\n") @@ -2648,7 +2648,6 @@ def ajax_diag_host(): # Second is treated as text output html.write("%s %s" % (result[0], html.attrencode(result[1]))) except Exception, e: - import traceback html.write("1 %s" % _("Exception: %s") % html.attrencode(traceback.format_exc())) #. @@ -2895,7 +2894,6 @@ def show_service_table(host, firsttime): paramtext = rulespec["valuespec"].value_to_text(params) except Exception, e: if config.debug: - import traceback err = traceback.format_exc() else: err = e @@ -3490,7 +3488,7 @@ def mode_bulk_discovery(phase): else: msg = _("Error during inventory of %s<div class=exc>%s</div>") % (", ".join(hostnames), e) if config.debug: - msg += " <pre>%s</pre> " % html.attrencode(format_exception().replace("\n", " ")) + msg += " <pre>%s</pre> " % html.attrencode(traceback.format_exc().replace("\n", " ")) result += msg html.write(result) return "" @@ -3909,7 +3907,7 @@ def mode_parentscan(phase): else: msg = _("Error during parent scan of %s: %s") % (host_name, e) if config.debug: - msg += " <pre>%s</pre>" % html.attrencode(format_exception().replace("\n", " ")) + msg += " <pre>%s</pre>" % html.attrencode(traceback.format_exc().replace("\n", " ")) result += msg + "\n " html.write(result) return "" @@ -5147,7 +5145,6 @@ def get_snapshot_status(snapshot, validate_checksums = False): except Exception, e: if config.debug: - import traceback status["broken_text"] = traceback.format_exc() status["broken"] = True else: @@ -9721,7 +9718,7 @@ def automation_push_profile(): return True except Exception, e: if config.debug: - return _("Internal automation error: %s\n%s") % (str(e), format_exception()) + return _("Internal automation error: %s\n%s") % (e, traceback.format_exc()) else: return _("Internal automation error: %s") % e @@ -9941,7 +9938,6 @@ def mode_users(phase): return None, _('The user synchronization completed successfully.') except Exception, e: if config.debug: - import traceback raise MKUserError(None, traceback.format_exc().replace('\n', ' \n')) else: raise MKUserError(None, "%s" % e) @@ -15758,7 +15754,6 @@ def execute_network_scan_job(): "state" : False, "output" : _("An exception occured: %s") % e, }) - import traceback logger(LOG_ERR, "Exception in network scan:\n%s" % (traceback.format_exc())) result["end"] = time.time() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ef013ab..c758e5c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -45,6 +45,7 @@ import os, shutil, subprocess, base64, pickle, pwd import defaults, config, hooks, userdb, multitar import sites +import traceback from lib import * from valuespec import * @@ -158,7 +159,6 @@ def activate_changes(): update_replication_status(None, {}, { 'act': duration }) except Exception: if config.debug: - import traceback raise MKUserError(None, "Error executing hooks: %s" % traceback.format_exc().replace('\n', ' ')) else: @@ -285,7 +285,7 @@ def parse_audit_log(what): for line in file(path): line = line.rstrip().decode("utf-8") splitted = line.split(None, 4) - if len(splitted) == 5 and isint(splitted[0]): + if len(splitted) == 5 and splitted[0].isdigit(): splitted[0] = int(splitted[0]) entries.append(splitted) entries.reverse() @@ -3723,7 +3723,7 @@ def automation_push_snapshot(): return configuration_warnings except Exception, e: if config.debug: - return _("Internal automation error: %s\n%s") % (str(e), format_exception()) + return _("Internal automation error: %s\n%s") % (e, traceback.format_exc()) else: return _("Internal automation error: %s") % e

7 years, 10 months

3762 FIX local: Fixed long output handling with Microcore

by Lars Michelsen

Module: check_mk Branch: master Commit: 97e73e4f2645fb2991fc0919098391dd3b839183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97e73e4f2645fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 15:44:50 2016 +0200 3762 FIX local: Fixed long output handling with Microcore Escaped \n characters will now be interpreted correctly when using the Microcore. --- .werks/3762 | 9 +++++++++ ChangeLog | 1 + checks/local | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3762 b/.werks/3762 new file mode 100644 index 0000000..9475016 --- /dev/null +++ b/.werks/3762 @@ -0,0 +1,9 @@ +Title: local: Fixed long output handling with Microcore +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471873450 +Class: fix + +Escaped \n characters will now be interpreted correctly when using the Microcore. diff --git a/ChangeLog b/ChangeLog index 58147a2..c7d049e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -344,6 +344,7 @@ * 3782 FIX: agent_netapp: fixed exception with values containing umlauts * 3774 FIX: apc_symmetra: fixed wrong status and values handling * 3761 FIX: windows_tasks: Fixed possible exception in discovery in case of unexpected agent data + * 3762 FIX: local: Fixed long output handling with Microcore... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/local b/checks/local index 58bf27e..468eb97 100644 --- a/checks/local +++ b/checks/local @@ -116,7 +116,12 @@ def check_local(item, params, info): statechar = line[0] perftxt = line[2] + output = " ".join(line[3:]) + # convert eventually escaped newline chars to real newlines + # (will be converted back later individually for the different cores) + output = output.replace("\\n", "\n") + perfdata = [] if perftxt != "-": # new: allow multiple perfdata by using | as separator

7 years, 10 months

3788 f5_big_pool: check is now cluster ready

by Andreas Boesl

Module: check_mk Branch: master Commit: 22c28180031bfad49642fd28c91da94078ce9d98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22c28180031bfa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 22 15:23:52 2016 +0200 3788 f5_big_pool: check is now cluster ready --- .werks/3788 | 9 ++++++ ChangeLog | 1 + checks/f5_bigip_pool | 86 +++++++++++++++++++++++++++++++------------------- 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/.werks/3788 b/.werks/3788 new file mode 100644 index 0000000..db1c554 --- /dev/null +++ b/.werks/3788 @@ -0,0 +1,9 @@ +Title: f5_big_pool: check is now cluster ready +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471868943 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ab182df..58147a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 3842 juniper_cpu_util: Allow configuration of levels for routing engine * 3777 ipmi: IPMI sensor states are configurable * 3778 if: now levels for discards rate are configurable + * 3788 f5_big_pool: check is now cluster ready * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/f5_bigip_pool b/checks/f5_bigip_pool index 0e8f151..edcbbdf 100644 --- a/checks/f5_bigip_pool +++ b/checks/f5_bigip_pool @@ -31,25 +31,42 @@ # F5-BIGIP-LOCAL-MIB::ltmPoolMemberCnt. 8.80.111.111.108.95.78.77.65 = 2 # F5-BIGIP-LOCAL-MIB::ltmPoolActiveMemberCnt. 8.80.111.111.108.95.78.77.65 = 0 - # warn, crit numbers of pool members f5_bigip_pool_default_levels = (2, 1) +def parse_f5_bigip_pool(info): + parsed = {} + processed_member_info = False + for block in info: + # Member information + if len(block[0]) == 3 and processed_member_info: + break + + if len(block[0]) == 3: + for line in block: + parsed.setdefault(line[0], {"act_members": 0, "def_members": 0, "down_info": []}) + parsed[line[0]]["act_members"] += int(line[1]) + parsed[line[0]]["def_members"] += int(line[2]) + processed_member_info = True + + # Status information + elif len(block[0]) == 6: + for key in parsed.keys(): + for line in block: + if key == line[0]: + parsed[key]["down_info"].append(line) + return parsed -def inventory_f5_bigip_pool(checkname,info): +def inventory_f5_bigip_pool(parsed): # inventorize all pools and their member count - inventory = [] - for line in info[0]: - if line[0] != "": - inventory.append((line[0],"f5_bigip_pool_default_levels")) - return inventory + for item in parsed.keys(): + if item != "": + yield item, "f5_bigip_pool_default_levels" -def f5_bigip_pool_get_down_members(info, item): +def f5_bigip_pool_get_down_members(down_info): downs = [] - if len(info) < 2: # no data for pool members - return - for line in info[1]: - if line[0] == item and (line[2] != '4' or line[3] != '4' or line[4] in ('2', '3', '4', '5' )): + for line in down_info: + if (line[2] != '4' or line[3] != '4' or line[4] in ('2', '3', '4', '5' )): if re.match("\/\S*\/\S*", line[5]): host = line[5].split("/")[2] else: @@ -57,31 +74,34 @@ def f5_bigip_pool_get_down_members(info, item): downs.append(host+":"+line[1]) return downs -def check_f5_bigip_pool(item, params, info): - for line in info[0]: - if line[0] == item: - warn, crit = params - pool_act_members = int(line[1]) - pool_def_members = int(line[2]) - message = "%d of %d members are up" % ( pool_act_members, pool_def_members ) - state = 0 - if pool_act_members == pool_def_members or pool_act_members >= warn: - state = 0 - elif pool_act_members < crit: - state = 2 - message += " (warn/crit: %s/%s)" % ( warn, crit ) - elif pool_act_members < warn: - state = 1 - message += " (warn/crit: %s/%s)" % ( warn, crit ) +def check_f5_bigip_pool(item, params, parsed): + warn, crit = params + + pool_info = parsed.get(item) + if not pool_info: + return - if pool_act_members < pool_def_members: - downs = f5_bigip_pool_get_down_members(info, item) - message += ", down/disabled nodes: %s" % ", ".join(downs) + pool_act_members = pool_info["act_members"] + pool_def_members = pool_info["def_members"] + message = "%d of %d members are up" % ( pool_act_members, pool_def_members ) + state = 0 + if pool_act_members == pool_def_members or pool_act_members >= warn: + state = 0 + elif pool_act_members < crit: + state = 2 + message += " (warn/crit: %s/%s)" % ( warn, crit ) + elif pool_act_members < warn: + state = 1 + message += " (warn/crit: %s/%s)" % ( warn, crit ) - return state, message - return 3, "unexpected Output from SNMP Agent" + if pool_act_members < pool_def_members: + downs = f5_bigip_pool_get_down_members(pool_info["down_info"]) + if downs: + message += ", down/disabled nodes: %s" % ", ".join(downs) + return state, message check_info["f5_bigip_pool"] = { + 'parse_function' : parse_f5_bigip_pool, 'check_function' : check_f5_bigip_pool, 'group' : 'f5_pools', 'inventory_function' : inventory_f5_bigip_pool,

7 years, 10 months

3786 WATO webapi: now able to bake agents with the new action bake_agents

by Andreas Boesl

Module: check_mk Branch: master Commit: 34c66a2905d0ef86bf1dde5694d80bded7da8999 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34c66a2905d0ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 18 10:13:51 2016 +0200 3786 WATO webapi: now able to bake agents with the new action bake_agents --- .werks/3786 | 10 ++++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 14 ++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/3786 b/.werks/3786 new file mode 100644 index 0000000..78a914d --- /dev/null +++ b/.werks/3786 @@ -0,0 +1,10 @@ +Title: WATO webapi: now able to bake agents with the new action bake_agents +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1471507994 +Class: feature + + + diff --git a/ChangeLog b/ChangeLog index 59cd5bc..ab182df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -465,6 +465,7 @@ * 3728 Automatically creating automation user for Check_MK internal use with WATO default config... * 3559 WATO API: now able to bake agents with the new action "bake_agents" * 3785 WATO rulesets: now able to set a negate option for services and items... + * 3786 WATO webapi: now able to bake agents with the new action bake_agents * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 1684438..34387a7 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -325,3 +325,17 @@ api_actions["activate_changes"] = { "locking" : True, } +def action_bake_agents(request): + try: + check_mk_local_automation('bake-agents') + last_bake_file = var_dir + "last_bake.mk" + file(last_bake_file, 'w').write('%s\n' % defaults.check_mk_version) + return _("Successfully baked agents") + except Exception, e: + raise e + +api_actions["bake_agents"] = { + "handler" : action_bake_agents, + "locking" : True, +} +

7 years, 10 months

3778 if: now levels for discards rate are configurable

by Simon Betz

Module: check_mk Branch: master Commit: ca89a4458929c4714a9e58af638e3b1cc9fcf50e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca89a4458929c4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 22 14:17:04 2016 +0200 3778 if: now levels for discards rate are configurable --- .werks/3778 | 9 +++++++++ ChangeLog | 1 + checks/if.include | 36 +++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 10 +++++++++- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.werks/3778 b/.werks/3778 new file mode 100644 index 0000000..b86af5b --- /dev/null +++ b/.werks/3778 @@ -0,0 +1,9 @@ +Title: if: now levels for discards rate are configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471868208 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fec20c5..59cd5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ * 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions * 3842 juniper_cpu_util: Allow configuration of levels for routing engine * 3777 ipmi: IPMI sensor states are configurable + * 3778 if: now levels for discards rate are configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/if.include b/checks/if.include index e3bdbb2..a2e42e7 100644 --- a/checks/if.include +++ b/checks/if.include @@ -594,6 +594,11 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, else: nucast_warn, nucast_crit = None, None + if "discards" in params: + disc_warn, disc_crit = params["discards"] + else: + disc_warn, disc_crit = None, None + # Convert the traffic related levels to a common format general_traffic_levels = if_get_traffic_levels(params) @@ -741,13 +746,13 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, ( "in", ifInOctets, traffic_levels[('in', 'upper', 'warn')], traffic_levels[('in', 'upper', 'crit')], 0, speed_b_in), ( "inucast", inucast, None, None, None, None), ( "innucast", saveint(inmcast) + saveint(inbcast), nucast_warn, nucast_crit, None, None), - ( "indisc", ifInDiscards, None, None, None, None), + ( "indisc", ifInDiscards, disc_warn, disc_crit, None, None), ( "inerr", ifInErrors, err_warn, err_crit, None, None), ( "out", ifOutOctets, traffic_levels[('out', 'upper', 'warn')], traffic_levels[('out', 'upper', 'crit')], 0, speed_b_out), ( "outucast", outucast, None, None, None, None), ( "outnucast", saveint(outmcast) + saveint(outbcast), nucast_warn, nucast_crit, None, None), - ( "outdisc", ifOutDiscards, None, None, None, None), + ( "outdisc", ifOutDiscards, disc_warn, disc_crit, None, None), ( "outerr", ifOutErrors, err_warn, err_crit, None, None) ]: try: @@ -781,9 +786,9 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, return "%s/s" % get_bytes_human_readable(value) # loop over incoming and outgoing traffic - for what, errorrate, urate, nurate, traffic, speed in \ - [ ("in", rates[4], rates[1], rates[2], rates[0], speed_b_in), - ("out", rates[9], rates[6], rates[7], rates[5], speed_b_out) ]: + for what, traffic, urate, nurate, discrate, errorrate, speed in \ + [ ("in", rates[0], rates[1], rates[2], rates[3], rates[4], speed_b_in), + ("out", rates[5], rates[6], rates[7], rates[8], rates[9], speed_b_out) ]: infotext += ", %s: %s" % (what, format_value(traffic)) @@ -842,17 +847,20 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, state = max(state, 1) infotext += ", %s-errors packets: %d (!!) >= %s" % (what, errorrate, err_warn) + # check rate of non-unicast packets and discards + for _txt, _rate, _warn, _crit in [ + ("non-unicast packets", nurate, nucast_warn, nucast_crit), + ("discards", discrate, disc_warn, disc_crit)]: - # check rate of non-unicast packets - if nucast_crit or nucast_warn: - infotext += ", %s non-unicast packets %.2f/s" % (what, nurate) + if _crit is not None and _warn is not None: + infotext += ", %s %s %.2f/s" % (what, _txt, _rate) - if nucast_crit and nurate >= nucast_crit: - state = 2 - infotext += "(!!) >= " + str(nucast_crit) - elif nucast_warn and nurate >= nucast_warn: - state = max(state,1) - infotext += "(!) >= " + str(nucast_warn) + if _rate >= _crit: + state = 2 + infotext += "(!!) >= " + str(_crit) + elif _rate >= _warn: + state = max(state,1) + infotext += "(!) >= " + str(_warn) if node: cluster_items[node] = ( state, infotext, perfdata ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d784207..9960ff6 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5162,7 +5162,15 @@ register_check_parameters( ] ), ), - + ( "discards", + Tuple( + title = _("Absolute levels for discards rates"), + elements = [ + Integer(title = _("Warning at"), unit= _("discards") ), + Integer(title = _("Critical at"), unit = _("discards") ) + ] + ) + ), ( "average", Integer( title = _("Average values"),

7 years, 10 months

tty get_size(): Fixed issue when redirecting output

by Lars Michelsen

Module: check_mk Branch: master Commit: 26d01b29a71290d40ae12d3fcb37a64cc534c167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d01b29a71290… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 11:29:22 2016 +0200 tty get_size(): Fixed issue when redirecting output --- lib/tty.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/tty.py b/lib/tty.py index fa34d09..24da57d 100644 --- a/lib/tty.py +++ b/lib/tty.py @@ -90,8 +90,11 @@ def get_size(): lines, columns, x, y = struct.unpack("HHHH", ws) if lines > 0 and columns > 0: return lines, columns - except: - raise - pass + except IOError, e: + if e.errno == 25: + # Inappropriate ioctl for device: Occurs when redirecting output + pass + else: + raise return (24, 80)

7 years, 10 months

3761 FIX windows_tasks: Fixed possible exception in discovery in case of unexpected agent data

by Lars Michelsen

Module: check_mk Branch: master Commit: 50c7cc68a917208ff87a4b2910add645e95ff675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c7cc68a91720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 10:42:08 2016 +0200 3761 FIX windows_tasks: Fixed possible exception in discovery in case of unexpected agent data --- .werks/3761 | 10 ++++++++++ ChangeLog | 1 + checks/windows_tasks | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3761 b/.werks/3761 new file mode 100644 index 0000000..d72f78b --- /dev/null +++ b/.werks/3761 @@ -0,0 +1,10 @@ +Title: windows_tasks: Fixed possible exception in discovery in case of unexpected agent data +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1471855297 + + diff --git a/ChangeLog b/ChangeLog index 54d8a51..fec20c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -341,6 +341,7 @@ * 3773 FIX: check_http: fixed proxy authentication * 3782 FIX: agent_netapp: fixed exception with values containing umlauts * 3774 FIX: apc_symmetra: fixed wrong status and values handling + * 3761 FIX: windows_tasks: Fixed possible exception in discovery in case of unexpected agent data Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/windows_tasks b/checks/windows_tasks index 2f8af8f..2cdcbbe 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -71,7 +71,7 @@ def windows_tasks_convert(info): def inventory_windows_tasks(info): info = windows_tasks_convert(info) - return [ (n, None) for n, v in info.items() if v['Scheduled Task State'] == "Enabled"] + return [ (n, None) for n, v in info.items() if v.get('Scheduled Task State') == "Enabled"] def check_windows_tasks(item, _no_params, info): info = windows_tasks_convert(info)

7 years, 10 months

IWYU.

by Sven Panne

Module: check_mk Branch: master Commit: 7a9c6bc85be879ebd3587e4f94a49d8e1a7034e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a9c6bc85be879… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 22 09:56:40 2016 +0200 IWYU. --- livestatus/src/Store.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 7e80548..7d6a03a 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// IWYU pragma: no_include <memory> #include "Store.h" #include <chrono> #include <cstring>

7 years, 10 months

updated werk 3842

by Sven Rueß

Module: check_mk Branch: master Commit: 826e97b73d3efda7b47cda5e5dc64e8720eed8e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=826e97b73d3efd… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 18:41:28 2016 +0200 updated werk 3842 --- .werks/3842 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3842 b/.werks/3842 index 1731ddc..e04fd1b 100644 --- a/.werks/3842 +++ b/.werks/3842 @@ -1,4 +1,4 @@ -Title: juniper_cpu_util: Allow configuratioh of level for routing engine +Title: juniper_cpu_util: Allow configuration of levels for routing engine Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index cfa2fb9..54d8a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,7 +130,7 @@ * 3775 fjdarye500_pfm: new check which monitors health status and lifetime of PCIe flash modules of Eternus DX500 storage systems * 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' * 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions - * 3842 juniper_cpu_util: Allow configuratioh of level for routing engine + * 3842 juniper_cpu_util: Allow configuration of levels for routing engine * 3777 ipmi: IPMI sensor states are configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin

7 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016