Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64661 discussions

Check_MK Git: check_mk: Fixed exception when using RelativeDate valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: a09897b59ad2285d68f1b0ac7699b3d8bbc79ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a09897b59ad228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 24 16:01:03 2014 +0200 Fixed exception when using RelativeDate valuespec --- web/htdocs/valuespec.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 7e42253..4acb5ab 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1694,23 +1694,28 @@ weekdays = { class RelativeDate(OptionalDropdownChoice): def __init__(self, **kwargs): - ValueSpec.__init__(self, **kwargs) - self._choices = [ - (0, _("today")), - (1, _("tomorrow"))] + choices = [ + (0, _("today")), + (1, _("tomorrow")) + ] weekday = time.localtime(today()).tm_wday for w in range(2, 7): wd = (weekday + w) % 7 - self._choices.append((w, weekdays[wd])) + choices.append((w, weekdays[wd])) for w in range(0, 7): wd = (weekday + w) % 7 if w < 2: title = _(" next week") else: title = _(" in %d days") % (w + 7) - self._choices.append((w + 7, weekdays[wd] + title)) - self._explicit = Integer() - self._otherlabel = _("in ... days") + choices.append((w + 7, weekdays[wd] + title)) + + kwargs['choices'] = choices + kwargs['explicit'] = Integer() + kwargs['otherlabel'] = _("in ... days") + + OptionalDropdownChoice.__init__(self, **kwargs) + if "default_days" in kwargs: self._default_value = kwargs["default_days"] * seconds_per_day + today() else:

9 years, 11 months

Check_MK Git: check_mk: #1162 FIX User profiles can not be edited on WATO remote sites anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 21a10e9b8f059a60cec4997247843c5f223b2233 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a10e9b8f059a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 27 09:30:21 2014 +0100 #1162 FIX User profiles can not be edited on WATO remote sites anymore In previous versions it was possible for users to edit their own user profile (language, password, ...) on WATO remote sites. This was an problem, because it leads to inconsistent settings between the master and remote site, because the changes on the remote site are not synced to the master. The edit dialog of the user profile has been removed/disabled for all users of the remote site of a WATO distributed setup. --- .werks/1162 | 16 ++++++++++++++++ ChangeLog | 3 ++- web/htdocs/sidebar.py | 9 ++++++--- web/htdocs/wato.py | 3 +++ web/plugins/sidebar/wato.py | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.werks/1162 b/.werks/1162 new file mode 100644 index 0000000..7f579c9 --- /dev/null +++ b/.werks/1162 @@ -0,0 +1,16 @@ +Title: User profiles can not be edited on WATO remote sites anymore +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1414398442 +Class: fix + +In previous versions it was possible for users to edit their own +user profile (language, password, ...) on WATO remote sites. This +was an problem, because it leads to inconsistent settings between +the master and remote site, because the changes on the remote site +are not synced to the master. + +The edit dialog of the user profile has been removed/disabled for +all users of the remote site of a WATO distributed setup. diff --git a/ChangeLog b/ChangeLog index cb3db73..5fa1a7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,10 +74,10 @@ * 1442 ups_socomec_out_source: New check for checking the power source of out phases for Socomec UPSs * 0662 domino_mailqueues: new check to monitor mail queues in Lotus Domino * 1188 veeam_client: Check now also outputs ReadSize and TransferedSize... - * 1190 statgrab_cpu: Check can now handle parameters * 0663 domino_info: new check to extract informational data about a Lotus Domino Server * 0664 domino_users: new check to monitor the number of users on a Domino Notes server * 1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers + * 1190 statgrab_cpu: Check can now handle parameters * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -139,6 +139,7 @@ * 1158 FIX: Moved filter logic to visuals module... NOTE: Please refer to the migration notes! * 1077 FIX: Fixed labelling of Y achsis in prediction graphs... + * 1162 FIX: User profiles can not be edited on WATO remote sites anymore... WATO: * 1096 New WATO web service: manage hosts via a new HTTP API... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 0607df6..129e806 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -182,9 +182,12 @@ def sidebar_foot(): if config.may("general.configure_sidebar"): html.icon_button("sidebar_add_snapin.py", _("Add snapin to the sidebar"), "sidebar_addsnapin", target="main") - if config.may("general.edit_profile") or config.may("general.change_password"): - html.icon_button("user_profile.py", _("Edit your personal settings, change your password"), "sidebar_settings", - target="main") + # editing the profile is not possible on remote sites which are sync targets + # of a central WATO system + if config.wato_enabled and \ + (config.may("general.edit_profile") or config.may("general.change_password")): + html.icon_button("user_profile.py", _("Edit your personal settings, change your password"), + "sidebar_settings", target="main") if config.may("general.logout") and not config.auth_by_http_header: html.icon_button("logout.py", _("Log out"), "sidebar_logout", target="_top") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bf89e58..b180543 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15218,6 +15218,9 @@ def page_user_profile(): if not config.may('general.edit_profile') and not config.may('general.change_password'): raise MKAuthException(_("You are not allowed to edit your user profile.")) + if not config.wato_enabled: + raise MKAuthException(_('User profiles can not be edited (WATO is disabled).')) + success = None if html.has_var('_save') and html.check_transaction(): try: diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 93a3589..56c7dca 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -36,7 +36,7 @@ import config, wato, views, dashboard # +----------------------------------------------------------------------+ def render_wato(mini): if not config.wato_enabled: - html.write(_("WATO is disabled in <tt>multisite.mk</tt>.")) + html.write(_("WATO is disabled.")) return False elif not config.may("wato.use"): html.write(_("You are not allowed to use Check_MK's web configuration GUI."))

9 years, 11 months

Check_MK Git: check_mk: Fixed further bug in edit_dictionary

by Mathias Kettner

Module: check_mk Branch: master Commit: 761cb08d489919eb5fdbb891c71a7036ae35dc49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=761cb08d489919… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 24 16:19:17 2014 +0200 Fixed further bug in edit_dictionary --- web/htdocs/forms.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 9532842..7a7c392 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -63,15 +63,15 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, else: sections.append((keyname, None, d)) # valuespec Dictionary, title used from dict - new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): if not preview and consume_transid: html.check_transaction() messages = [] + new_value = {} for keyname, section_title, entries in sections: + new_value[keyname] = value.get(keyname, {}).copy() if type(entries) == list: - new_value[keyname] = {} for name, vs in entries: if len(sections) == 1: vp = varprefix @@ -87,8 +87,9 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, else: try: - new_value[keyname] = entries.from_html_vars(keyname) - entries.validate_value(new_value[keyname], keyname) + edited_value = entries.from_html_vars(keyname) + entries.validate_value(edited_value, keyname) + new_value[keyname].update(edited_value) except Exception, e: messages.append("%s: %s" % (entries.title() or _("Properties"), e.message)) html.add_user_error(e.varname, e.message)

9 years, 11 months

Check_MK Git: check_mk: Fix internal edit_dictionary() function

by Mathias Kettner

Module: check_mk Branch: master Commit: bd0a3af60cf461a8e7d67ce596ed434f04617c78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd0a3af60cf461… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 24 16:00:07 2014 +0200 Fix internal edit_dictionary() function --- web/htdocs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 0588f19..9532842 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -41,7 +41,7 @@ def get_input(valuespec, varprefix): def edit_dictionary(entries, value, **args): - result = edit_dictionaries([("value", entries)], value, **args) + result = edit_dictionaries([("value", entries)], {"value": value}, **args) if result: return result["value"] else:

9 years, 11 months

Check_MK Git: check_mk: removed print statement

by Bastian Kuhn

Module: check_mk Branch: master Commit: f04d3e90af6cb2060c1b314f770262e254337346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04d3e90af6cb2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 24 15:52:29 2014 +0200 removed print statement --- checks/cpu_util.include | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 0ef034b..78fb291 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -94,7 +94,6 @@ def check_cpu_util_unix(values, params): sum_jiffies = sum(diff_values) # do not account for steal! if sum_jiffies == 0: raise MKCounterWrapped(None, "Too short time difference since last check") - print sum_jiffies user = diff_values[0] + diff_values[1] # add user + nice system = diff_values[2]

9 years, 11 months

Check_MK Git: check_mk: #1190 statgrab_cpu: Check can now handle parameters

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7d9cb8e4d7d214446e978c9e82ab20e39922c092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d9cb8e4d7d214… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 24 15:51:23 2014 +0200 #1190 statgrab_cpu: Check can now handle parameters --- .werks/1190 | 9 +++++++ ChangeLog | 1 + checks/cpu_util.include | 58 +++++++++++++++++++++++++++++++++++++++ checks/kernel | 69 +++++++---------------------------------------- checks/statgrab_cpu | 51 ++++++++++++++--------------------- 5 files changed, 98 insertions(+), 90 deletions(-) diff --git a/.werks/1190 b/.werks/1190 new file mode 100644 index 0000000..3cda189 --- /dev/null +++ b/.werks/1190 @@ -0,0 +1,9 @@ +Title: statgrab_cpu: Check can now handle parameters +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414158659 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1c45197..59f6890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1442 ups_socomec_out_source: New check for checking the power source of out phases for Socomec UPSs * 0662 domino_mailqueues: new check to monitor mail queues in Lotus Domino * 1188 veeam_client: Check now also outputs ReadSize and TransferedSize... + * 1190 statgrab_cpu: Check can now handle parameters * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 410d24a..0ef034b 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -77,3 +77,61 @@ def check_cpu_util(util, params, this_time = None): perfdata += extraperf # reference curve for predictive levels return state, infotext, perfdata +# This one can handle user, system and wait +def check_cpu_util_unix(values, params): + this_time = int(time.time()) + # Compute jiffi-differences of all relevant counters + diff_values = [] + n = 0 + global g_counters + for v in values: + n += 1 + countername = "cpu.util.%d" % n + last_time, last_val = g_counters.get(countername, (0, 0)) + diff_values.append(v - last_val) + g_counters[countername] = (this_time, v) + + sum_jiffies = sum(diff_values) # do not account for steal! + if sum_jiffies == 0: + raise MKCounterWrapped(None, "Too short time difference since last check") + print sum_jiffies + + user = diff_values[0] + diff_values[1] # add user + nice + system = diff_values[2] + wait = diff_values[3] + user_perc = 100.0 * float(user) / float(sum_jiffies) + system_perc = 100.0 * float(system) / float(sum_jiffies) + wait_perc = 100.0 * float(wait) / float(sum_jiffies) + perfdata = [ + ( "user", "%.3f" % user_perc ), + ( "system", "%.3f" % system_perc ), + ( "wait", "%.3f" % wait_perc ) ] + + yield 0, "user: %.1f%%, system: %.1f%%" % (user_perc, system_perc), perfdata + + # Handle level on iowait + state = 0 + if "iowait" in params and params["iowait"] != None: + warn, crit = params["iowait"] + if wait_perc >= crit: + state = 2 + elif wait_perc >= warn: + state = 1 + yield state, "wait: %.1f%%" % (wait_perc) + + # Total utilization + util_total_perc = user_perc + system_perc + wait_perc + state = 0 + levelstext = "" + if "util" in params: + warn, crit = params["util"] + if util_total_perc >= crit: + state = 2 + elif util_total_perc >= warn: + state = 1 + else: + state = 0 + if state: + levelstext = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) + + yield state, "total: %.1f%%" % util_total_perc + levelstext diff --git a/checks/kernel b/checks/kernel index 6135420..e773fee 100644 --- a/checks/kernel +++ b/checks/kernel @@ -129,8 +129,7 @@ def kernel_check_cpu_utilization(item, params, info): # Look for entry beginning with "cpu" f = [ l for l in info if l[0] == "cpu" ] if len(f) != 1: - yield 3, "More than one line with CPU info found. This check is not cluster-enabled." - return + return 3, "More than one line with CPU info found. This check is not cluster-enabled." line = f[0] if len(line) < 8: @@ -140,63 +139,14 @@ def kernel_check_cpu_utilization(item, params, info): # 'cpu' user nice system idle wait hw-int sw-int (steal ...) # convert number to int values = [ int(x) for x in line[1:8] ] - this_time = int(time.time()) - - # Compute jiffi-differences of all relevant counters - diff_values = [] - n = 0 - global g_counters - for v in values: - n += 1 - countername = "cpu.util.%d" % n - last_time, last_val = g_counters.get(countername, (0, 0)) - diff_values.append(v - last_val) - g_counters[countername] = (this_time, v) - - sum_jiffies = sum(diff_values[0:7]) # do not account for steal! - if sum_jiffies == 0: - raise MKCounterWrapped(None, "Too short time difference since last check") - - user = diff_values[0] + diff_values[1] # add user + nice - system = diff_values[2] - wait = diff_values[4] - user_perc = 100.0 * float(user) / float(sum_jiffies) - system_perc = 100.0 * float(system) / float(sum_jiffies) - wait_perc = 100.0 * float(wait) / float(sum_jiffies) - perfdata = [ - ( "user", "%.3f" % user_perc ), - ( "system", "%.3f" % system_perc ), - ( "wait", "%.3f" % wait_perc ) ] - - yield 0, "user: %.1f%%, system: %.1f%%" % (user_perc, system_perc), perfdata - - # Handle level on iowait - state = 0 - if "iowait" in params and params["iowait"] != None: - warn, crit = params["iowait"] - if wait_perc >= crit: - state = 2 - elif wait_perc >= warn: - state = 1 - yield state, "wait: %.1f%%" % (wait_perc) - - # Total utilization - util_total_perc = user_perc + system_perc + wait_perc - state = 0 - levelstext = "" - if "util" in params: - warn, crit = params["util"] - if util_total_perc >= crit: - state = 2 - elif util_total_perc >= warn: - state = 1 - else: - state = 0 - if state: - levelstext = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) - - yield state, "total: %.1f%%" % util_total_perc + levelstext - + user = values[0] + nice = values[1] + system = values[2] + wait = values[4] + hw_int = values[5] + sw_int = values[6] + idle = 100 - user - system - nice - wait + return check_cpu_util_unix([user, nice, system, wait, hw_int, sw_int, idle], params) check_info["kernel.util"] = { 'check_function': kernel_check_cpu_utilization, @@ -205,5 +155,6 @@ check_info["kernel.util"] = { 'has_perfdata': True, 'default_levels_variable': 'kernel_util_default_levels', 'group': 'cpu_iowait', + 'includes': ['cpu_util.include'], } diff --git a/checks/statgrab_cpu b/checks/statgrab_cpu index 7bb0880..b52e0e2 100644 --- a/checks/statgrab_cpu +++ b/checks/statgrab_cpu @@ -28,49 +28,38 @@ def inventory_statgrab_cpu(info): if len(info) > 1: - return [(None, None)] + return [(None, {})] def check_statgrab_cpu(item, params, info): - global g_counters + if not params: + params = {} user = 0 + nice = 0 for var, value in info: if var == 'iowait': wait = int(value) elif var == 'kernel': system = int(value) - elif var == 'nice' or var == 'user': - user += int(value) + elif var == 'nice': + nice = int(value) + elif var == 'user': + user = int(value) elif var == 'total': total = int(value) - - values = [ user, system, wait, total ] - this_time = int(time.time()) - diff_values = [ ] - n = 0 - for v in values: - n += 1 - countername = "cpu.util.%d" % n - last_time, last_val = g_counters.get(countername, (0, 0)) - diff_values.append(v - last_val) - g_counters[countername] = (this_time, v) - - diff_total = diff_values[3] - if diff_total == 0: - return (0, "too short interval") - user_perc = 100.0 * float(diff_values[0]) / float(diff_total) - system_perc = 100.0 * float(diff_values[1]) / float(diff_total) - wait_perc = 100.0 * float(diff_values[2]) / float(diff_total) - perfdata = [ - ( "user", "%.3f" % user_perc ), - ( "system", "%.3f" % system_perc ), - ( "wait", "%.3f" % wait_perc ) ] - return (0, "user: %2.0f%%, system: %2.0f%%, wait: %2.0f%%" % (user_perc, system_perc, wait_perc), perfdata) + idle = 100 - total + # user, nice, system, wait, hw-int, sw-int, idle + values = [ user, nice, system, wait, 0, 0, idle ] + + # No return cause of the use of yield + return check_cpu_util_unix(values, params) check_info["statgrab_cpu"] = { - 'check_function': check_statgrab_cpu, - 'inventory_function': inventory_statgrab_cpu, - 'service_description': 'CPU utilization', - 'has_perfdata': True, + 'check_function': check_statgrab_cpu, + 'inventory_function': inventory_statgrab_cpu, + 'service_description': 'CPU utilization', + 'has_perfdata': True, + 'includes': ['cpu_util.include'], + 'group': 'cpu_iowait', }

9 years, 11 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1c1cdc7dfe5eb5f0de6b142fee660b5eadaeaf28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1cdc7dfe5eb5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 24 15:51:59 2014 +0200 merge conflict ---

9 years, 11 months

Check_MK Git: check_mk: #1161 FIX fc_port: Fixed invalid values of counters , fixed wrong values in graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: a0a2c6dee6a1abcafb5ca47ed95a5ccc46f2e408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0a2c6dee6a1ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 24 15:15:41 2014 +0200 #1161 FIX fc_port: Fixed invalid values of counters, fixed wrong values in graphs Previous versions of the checks computed wrong values for all counters like transfered bytes, errors etc. This has been fixed now. The performance graphs, for example error counters, were using wrong datasources which made the graphs show dramatically wrong values. --- .werks/1161 | 13 ++++++++++++ .werks/195 | 11 ---------- ChangeLog | 3 +-- checks/fc_port | 22 ++++++++------------ pnp-templates/check_mk-fc_port.php | 40 ++++++++++++++++++++++++------------ 5 files changed, 50 insertions(+), 39 deletions(-) diff --git a/.werks/1161 b/.werks/1161 new file mode 100644 index 0000000..691530a --- /dev/null +++ b/.werks/1161 @@ -0,0 +1,13 @@ +Title: fc_port: Fixed invalid values of counters, fixed wrong values in graphs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414156402 +Class: fix + +Previous versions of the checks computed wrong values for all counters like +transfered bytes, errors etc. This has been fixed now. + +The performance graphs, for example error counters, were using wrong datasources +which made the graphs show dramatically wrong values. diff --git a/.werks/195 b/.werks/195 deleted file mode 100644 index 51106ed..0000000 --- a/.werks/195 +++ /dev/null @@ -1,11 +0,0 @@ -Title: fc_port: Check temporary disabled cause of problems with automatic detection -Level: 1 -Component: checks -Compatible: incomp -Version: 1.2.5i6 -Date: 1407158053 -Class: fix - -There are currently a problem with the scan function who lead to a positive result on not supported devices. -The Check will be renabled asap the problems are fixed. - diff --git a/ChangeLog b/ChangeLog index d5b1e7c..a83beef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,8 +82,6 @@ * 0194 FIX: raritan_pdu_inlet: Check now outputs the correct values... NOTE: Please refer to the migration notes! * 1071 FIX: oracle_rman_backups: Only inventorize ARCHIVELOG / DB FULL / DB INCR entries... - * 0195 FIX: fc_port: Check temporary disabled cause of problems with automatic detection... - NOTE: Please refer to the migration notes! * 1152 FIX: mk-job: The check now captures currently running jobs and their start time... * 0198 FIX: cisco_temp_sensor: Removed dicey detection for temperature value.... * 0645 FIX: brocade_fcport: since in newer firmware (7.*) swFCPortSpeed is deprecated, we then calculate port speed from IF-MIB::ifHighSpeed @@ -118,6 +116,7 @@ * 1128 FIX: bluecat_dns: now reports UNKNOWN if no snmp data is available * 1131 FIX: esx_vsphere_hostsystem.maintenance: fixed misspelling in service description... NOTE: Please refer to the migration notes! + * 1161 FIX: fc_port: Fixed invalid values of counters, fixed wrong values in graphs... Multisite: * 1066 New Dashboard Designer... diff --git a/checks/fc_port b/checks/fc_port index 93b02c6..52c6c51 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -87,15 +87,11 @@ def fc_port_getitem(num_ports, index, portname): return itemname def fc_parse_counter(value): - if type(value) == str: # unsigned 64bit counter - num = 64 - result = 0 - for c in value: - num = num - 8 - result += ord(c) * 2 ** num - return result - else: - return value + # The counters are sent via SNMP as OCTETSTR, which is converted to + # a byte string by Check_MKs SNMP code. The counters seem to be + # 64 bit big endian values, which are converted to integers here + import struct + return int(struct.unpack('>Q', value)[0]) def inventory_fc_port(info): if not info: @@ -332,23 +328,23 @@ check_info["fc_port"] = { "1.10.1.17", # connUnitPortName # 5 "1.10.1.23", # connUnitPortHWSTate: # 6 # hardware detected state of the port - "4.5.1.4", # connUnitPortStatTxObjects: # 7 + "4.5.1.4", # connUnitPortStatCountTxObjects: # 7 # The number of frames/packets/IOs/etc that have been transmitted # by this port. Note: A Fibre Channel frame starts with SOF and # ends with EOF. FC loop devices should not count frames passed # through. This value represents the sum total for all other Tx - "4.5.1.5", # connUnitPortStatRxObjects: # 8 + "4.5.1.5", # connUnitPortStatCountRxObjects: # 8 # The number of frames/packets/IOs/etc that have been received # by this port. Note: A Fibre Channel frame starts with SOF and # ends with EOF. FC loop devices should not count frames passed # through. This value represents the sum total for all other Rx - "4.5.1.6", # connUnitPortStatTxElements: # 9 + "4.5.1.6", # connUnitPortStatCountTxElements: # 9 # The number of octets or bytes that have been transmitted # by this port. One second periodic polling of the port. This # value is saved and compared with the next polled value to # compute net throughput. Note, for Fibre Channel, ordered # sets are not included in the count. - "4.5.1.7", # connUnitPortStatRxElements: # 10 + "4.5.1.7", # connUnitPortStatCountRxElements: # 10 # The number of octets or bytes that have been received. # by this port. One second periodic polling of the port. This # value is saved and compared with the next polled value to diff --git a/pnp-templates/check_mk-fc_port.php b/pnp-templates/check_mk-fc_port.php index 662699e..99bfc93 100644 --- a/pnp-templates/check_mk-fc_port.php +++ b/pnp-templates/check_mk-fc_port.php @@ -89,6 +89,19 @@ if($bandwidth > $base * $base * $base) { $bwuom = 'k'; } +# The number of data source various due to different +# settings (such as averaging). We rather work with names +# than with numbers. +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRDAVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + if ($mBandwidthH < 10) $range = $mBandwidthH; else @@ -114,7 +127,7 @@ $def[1] = $def[1] .= "". # incoming - "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". + "DEF:inbytes=$RRD[in] ". "CDEF:intraffic=inbytes,$unit_multiplier,* ". "CDEF:inmb=intraffic,1048576,/ ". "AREA:inmb#00e060:\"in \" ". @@ -127,7 +140,7 @@ $def[1] = "GPRINT:inperc:\"%7.1lf %s$unit/s\\n\" ". # outgoing - "DEF:outbytes=$RRDFILE[2]:$DS[2]:MAX ". + "DEF:outbytes=$RRD[out] ". "CDEF:outtraffic=outbytes,$unit_multiplier,* ". "CDEF:minusouttraffic=outtraffic,-1,* ". "CDEF:outmb=outtraffic,1048576,/ ". @@ -146,8 +159,8 @@ $def[1] = # averages if (isset($DS[9])) { $def[1] .= - "DEF:inbytesa=$RRDFILE[9]:$DS[9]:MAX ". - "DEF:outbytesa=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:inbytesa=$RRD[in_avg] ". + "DEF:outbytesa=$RRD[out_avg] ". "CDEF:intraffica=inbytesa,$unit_multiplier,* ". "CDEF:outtraffica=outbytesa,$unit_multiplier,* ". "CDEF:inmba=intraffica,1048576,/ ". @@ -169,7 +182,7 @@ $opt[2] = "--vertical-label \"objects/sec\" --title \"Objects $hostname / $servi $def[2] = # rxobjects "HRULE:0#c0c0c0 ". - "DEF:inu=$RRDFILE[3]:$DS[3]:MAX ". + "DEF:inu=$RRD[rxobjects] ". "CDEF:in=inu ". "AREA:inu#00ffc0:\"rxobjects \" ". "GPRINT:inu:LAST:\"%9.1lf/s last \" ". @@ -180,15 +193,16 @@ $def[2] = "GPRINT:inperc:\"%9.1lf/s\\n\" ". # txobjects - "DEF:outu=$RRDFILE[4]:$DS[4]:MAX ". + "DEF:outu=$RRD[txobjects] ". "CDEF:minusoutu=0,outu,- ". "AREA:minusoutu#00c0ff:\"txobjects \" ". "GPRINT:outu:LAST:\"%9.1lf/s last \" ". "GPRINT:outu:AVERAGE:\"%9.1lf/s avg \" ". "GPRINT:outu:MAX:\"%9.1lf/s max\\n\" ". - "VDEF:outperc=minusoutu,5,PERCENTNAN ". - "LINE:outperc#0000cf:\"out 95% percentile\" ". - "GPRINT:outperc:\"%9.1lf/s\\n\" ". + "VDEF:outperc_neg=minusoutu,5,PERCENTNAN ". + "VDEF:outperc_pos=outu,5,PERCENTNAN ". + "LINE:outperc_neg#0000cf:\"out 95% percentile\" ". + "GPRINT:outperc_pos:\"%9.1lf/s\\n\" ". ""; # Graph 3: errors and discards @@ -196,8 +210,8 @@ $ds_name[3] = 'Errors and discards'; $opt[3] = "--vertical-label \"errors/sec\" -X0 --title \"Problems $hostname / $servicedesc\" "; $def[3] = "HRULE:0#c0c0c0 ". - "DEF:crcerr=$RRDFILE[5]:$DS[5]:MAX ". - "DEF:encout=$RRDFILE[6]:$DS[6]:MAX ". + "DEF:crcerr=$RRD[rxcrcs] ". + "DEF:encout=$RRD[rxencoutframes] ". "AREA:crcerr#ff0000:\"crc errors \" ". "GPRINT:crcerr:LAST:\"%7.2lf/s last \" ". "GPRINT:crcerr:AVERAGE:\"%7.2lf/s avg \" ". @@ -206,8 +220,8 @@ $def[3] = "GPRINT:encout:LAST:\"%7.2lf/s last \" ". "GPRINT:encout:AVERAGE:\"%7.2lf/s avg \" ". "GPRINT:encout:MAX:\"%7.2lf/s max\\n\" ". - "DEF:c3discards=$RRDFILE[7]:$DS[7]:MAX ". - "DEF:notxcredits=$RRDFILE[8]:$DS[8]:MAX ". + "DEF:c3discards=$RRD[c3discards] ". + "DEF:notxcredits=$RRD[notxcredits] ". "CDEF:minusc3=0,c3discards,- ". "CDEF:minusnotxcredits=0,notxcredits,- ". "AREA:minusc3#ff0080:\"c3 discards \" ".

9 years, 11 months

Check_MK Git: check_mk: diskstat: FIX for cluster cases where you have to disks with the same MAJOR/ MINOR ids, thanks to Marcel Schulte for the patch

by Goetz Golla

Module: check_mk Branch: master Commit: 16ef1ffa01caf97667573cb76f269922a44b7a18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16ef1ffa01caf9… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 14:52:48 2014 +0200 diskstat: FIX for cluster cases where you have to disks with the same MAJOR/MINOR ids, thanks to Marcel Schulte for the patch --- checks/diskstat | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 93ebb88..10a0caa 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -96,12 +96,12 @@ def diskstat_parse_info(info): info_plain.append(line) elif phase == 'dmsetup_info': try: - majmin = tuple(map(int, line[2].split(':'))) + maj, min = map(int, line[2].split(':')) if len(line) == 5: name = "LVM %s" % line[1] else: name = "DM %s" % line[1] - nameinfo[majmin] = name + nameinfo[node, maj, min] = name except: pass # ignore such crap as "No Devices Found" elif phase == 'vx_dsk': @@ -109,14 +109,15 @@ def diskstat_parse_info(info): min = int(line[2], 16) group, disk = line[3].split('/')[-2:] name = "VxVM %s-%s" % (group, disk) - nameinfo[(maj, min)] = name + nameinfo[(node, maj, min)] = name return info_plain, nameinfo def diskstat_rewrite_device(nameinfo, linestart): - major, minor = map(int, linestart[:2]) - device = linestart[2] - return nameinfo.get((major, minor), device) + node = linestart[0] + major, minor = map(int, linestart[1:3]) + device = linestart[3] + return nameinfo.get((node, major, minor), device) def linux_diskstat_convert(info): info, nameinfo = diskstat_parse_info(info) @@ -132,7 +133,7 @@ def linux_diskstat_convert(info): # 7: write queue length *counters* rewritten = [ ( l[0], # node name or None - diskstat_rewrite_device(nameinfo, l[1:4]), + diskstat_rewrite_device(nameinfo, l[0:4]), int(l[6]), int(l[10]), int(l[4]),

9 years, 11 months

Check_MK Git: check_mk: domino_mailqueues: minor output cleanup

by Goetz Golla

Module: check_mk Branch: master Commit: 129bae741f01e9699c0da0ee5aacd7b8f7ab74c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=129bae741f01e9… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 12:30:54 2014 +0200 domino_mailqueues: minor output cleanup --- checks/domino_mailqueues | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/domino_mailqueues b/checks/domino_mailqueues index 280690b..b098acb 100644 --- a/checks/domino_mailqueues +++ b/checks/domino_mailqueues @@ -48,8 +48,7 @@ def check_domino_mailqueues(item, params, info): if item == domino_mailqueues[val][0]: reading = int(line[0][1]) warn, crit = params.get("queue_length") - infotext = "%d Mails in %s Queue" % \ - (reading, domino_mailqueues[val][1]) + infotext = "%d %s" % (reading, domino_mailqueues[val][1]) levels = " (Warn/Crit at %s/%s)" % ( warn, crit ) perfdata = [ ( "mails", reading, warn, crit ) ] state = 0

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits