Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 3b93e0ef219e5b987d26546914d37ae8f22f5aa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b93e0ef219e5b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 5 16:39:33 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.cc | 13 ++++--------- livestatus/src/Logger.h | 4 ++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 6bdbb2c..071e4d3 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -81,31 +81,26 @@ LogLevel Logger::getLevel() { return _level; } -#ifndef CMC -// cppcheck-suppress unusedFunction -#endif +#ifdef CMC void Logger::setLevel(LogLevel level) { lock_guard<mutex> lg(_mutex); _level = level; } -#ifndef CMC -// cppcheck-suppress unusedFunction -#endif Handler *Logger::getHandler() { lock_guard<mutex> lg(_mutex); return _handler.get(); } +#endif void Logger::setHandler(std::unique_ptr<Handler> handler) { lock_guard<mutex> lg(_mutex); _handler = std::move(handler); } -#ifndef CMC -// cppcheck-suppress unusedFunction -#endif +#ifdef CMC bool Logger::isLoggable(LogLevel level) { return level <= getLevel(); } +#endif void Logger::log(const LogRecord &record) { lock_guard<mutex> lg(_mutex); diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 5f334f5..b836657 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -127,12 +127,16 @@ public: static Logger *getLogger() { return &_global_logger; } LogLevel getLevel(); +#ifdef CMC void setLevel(LogLevel level); Handler *getHandler(); +#endif void setHandler(std::unique_ptr<Handler> handler); +#ifdef CMC bool isLoggable(LogLevel level); +#endif void log(const LogRecord &record); private:

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 608620183aeaf5b2bfaca6c34b6169a7b4fa5c6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=608620183aeaf5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 5 16:13:09 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 895da3e..6bdbb2c 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -81,13 +81,17 @@ LogLevel Logger::getLevel() { return _level; } +#ifndef CMC // cppcheck-suppress unusedFunction +#endif void Logger::setLevel(LogLevel level) { lock_guard<mutex> lg(_mutex); _level = level; } +#ifndef CMC // cppcheck-suppress unusedFunction +#endif Handler *Logger::getHandler() { lock_guard<mutex> lg(_mutex); return _handler.get(); @@ -98,7 +102,9 @@ void Logger::setHandler(std::unique_ptr<Handler> handler) { _handler = std::move(handler); } +#ifndef CMC // cppcheck-suppress unusedFunction +#endif bool Logger::isLoggable(LogLevel level) { return level <= getLevel(); } void Logger::log(const LogRecord &record) {

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 6c0b3c27fdf3c3bbdcf8a785c4396939cd25865d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c0b3c27fdf3c3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 2 16:56:33 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/ChronoUtils.h | 26 ++++++- livestatus/src/Logger.cc | 153 ++++++++++++++++----------------------- livestatus/src/Logger.h | 166 ++++++++++++++++++++++++++++++++----------- livestatus/src/module.cc | 73 ++++++++++++++++++- 4 files changed, 283 insertions(+), 135 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6c0b3c27fd…

8 years

Fixed exception when trying to synchronize user profile changes to remote sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 1269614e0177ff070252cd048a6ad0a05d094d07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1269614e0177ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:58:59 2016 +0200 Fixed exception when trying to synchronize user profile changes to remote sites --- web/plugins/userdb/ldap.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index c04eca8..1ea0557 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1818,16 +1818,18 @@ ldap_attribute_plugins['groups_to_roles'] = { def synchronize_profile_to_sites(connection, user_id, profile): import sites import wato # FIXME: Cleanup! - sites = [(site_id, config.site(site_id)) - for site_id in config.sitenames() - if not config.site_is_local(site_id) ] - connection.log('Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(sites))) + remote_sites = [(site_id, config.site(site_id)) + for site_id in config.sitenames() + if not config.site_is_local(site_id) ] + + connection.log('Credentials changed: %s. Trying to sync to %d sites' % + (user_id, len(sites))) num_disabled = 0 num_succeeded = 0 num_failed = 0 - for site_id, site in sites: + for site_id, site in remote_sites: if not site.get("replication"): num_disabled += 1 continue

8 years

3700 FIX FIX lparstat_aix.cpu_util usage of checkgroup parameters

by Marcel Schulte

Module: check_mk Branch: master Commit: 87aa0ec439a23de6cff3c043fde9a3bb8b6f6906 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87aa0ec439a23d… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Sep 5 14:14:34 2016 +0200 3700 FIX FIX lparstat_aix.cpu_util usage of checkgroup parameters The check lparstat_aix.cpu_util now supports new dictionary parameters of checkgroup, including overall cpu utilization thresholds. --- .werks/3700 | 11 +++++++++++ ChangeLog | 1 + checks/lparstat_aix | 25 ++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 6 ++++-- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/.werks/3700 b/.werks/3700 new file mode 100644 index 0000000..5a0a620 --- /dev/null +++ b/.werks/3700 @@ -0,0 +1,11 @@ +Title: FIX lparstat_aix.cpu_util usage of checkgroup parameters +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1473074686 + +The check lparstat_aix.cpu_util now supports new dictionary parameters of checkgroup, including overall cpu utilization thresholds. + diff --git a/ChangeLog b/ChangeLog index 61ee155..4212f10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -371,6 +371,7 @@ * 3769 FIX: cisco_temperature: Fixed exception in case of empty SNMP data received from device * 3770 FIX: win_dhcp_pools: Fixed crash in case of empty DHCP pools * 3781 FIX: ipmi: made check more robust against incomplete datasets + * 3700 FIX: FIX lparstat_aix.cpu_util usage of checkgroup parameters... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/lparstat_aix b/checks/lparstat_aix index e1f6532..9fd7a8d 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -114,22 +114,37 @@ def check_lparstat_aix_cpu(_no_item, params, info): ( "system", "%.3f" % system ), ( "wait", "%.3f" % wait ) ] + util = user + system + wait + infotext = "user: %2.1f%%, system: %2.1f%%, wait: %2.1f%%" % (user, system, wait) # You may set a warning/critical level on the io wait # percentage. This can be done by setting params to # a pair of (warn, crit) result = 0 - try: + + if type(params) == tuple: # old config only levels io wait warn, crit = params if wait >= crit: - result = 2 + result = max(result, 2) infotext += "(!!)" elif wait >= warn: - result = 1 + result = max(result, 1) infotext += "(!)" - except: - pass + + elif type(params) == dict: + if 'util' in params: + warn, crit = params['util'] + if util >= crit: + result = max(result, 2) + elif util >= warn: + result = max(result, 1) + if 'iowait' in params: + warn, crit = params['iowait'] + if wait >= crit: + result = max(result, 2) + elif wait >= warn: + result = max(result, 1) return (result, infotext, perfdata) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 58700a4..5f28cb5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6788,7 +6788,8 @@ register_check_parameters( help = _("A single thread fully utilizing a single core (potentially due to a bug) " "may go unnoticed when only monitoring the total utilization of the CPU. " "With this configuration, check_mk will alert if a single core is " - "exceeding a utilization threshold over an extended period of time.") + "exceeding a utilization threshold over an extended period of time. " + "ATTENTION: This configuration cannot be used for check <i>lparstat_aix.cpu_util</i>!") ) ), ( "core_util_graph", @@ -6798,7 +6799,8 @@ register_check_parameters( help = _("This adds another graph to the performance CPU utilization " "details page, showing utilization of individual cores. " "Please note that this graph may be impractical on " - "device with very many cores.") + "device with very many cores. " + "ATTENTION: This configuration cannot be used for check <i>lparstat_aix.cpu_util</i>!") ), ), ]

8 years

Fixed broken mail option: Information to be displayed in email body

by Andreas Boesl

Module: check_mk Branch: master Commit: 33a8625476f7d71c10930a438d1b28f5d0f02017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33a8625476f7d7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 5 11:58:05 2016 +0200 Fixed broken mail option: Information to be displayed in email body --- notifications/mail | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index 817a368..6b3e7fe 100755 --- a/notifications/mail +++ b/notifications/mail @@ -694,8 +694,10 @@ def render_performance_graphs(context): def construct_content(context): # A list of optional information is configurable via the parameter "elements" # (new configuration style) - if "PARAMETER_ELEMENTS" in context: - elements = context["PARAMETER_ELEMENTS"].split() + # Note: The value PARAMETER_ELEMENTSS is NO TYPO. + # Have a look at the function events.py:add_to_event_context(..) + if "PARAMETER_ELEMENTSS" in context: + elements = context["PARAMETER_ELEMENTSS"].split() else: elements = [ "perfdata", "graph", "abstime", "address", "longoutput" ]

8 years

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 708028df60ac79d4b0dfe1d5e976913dc48695cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=708028df60ac79… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 5 11:12:14 2016 +0200 fixed typo --- checks/apc_netbotz_sensors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/apc_netbotz_sensors b/checks/apc_netbotz_sensors index 2f65b36..e22335a 100644 --- a/checks/apc_netbotz_sensors +++ b/checks/apc_netbotz_sensors @@ -200,7 +200,7 @@ check_info['apc_netbotz_sensors.dewpoint'] = { 'has_perfdata' : True, 'default_levels_variable' : "apc_netbotz_sensors_dewpoint_default_levels", 'group' : "temperature", - 'includes' : [ 'temperaure.include' ], + 'includes' : [ 'temperature.include' ], }

8 years

Fixed exception in alert handler config when trying to create rule without having handlers

by Lars Michelsen

Module: check_mk Branch: master Commit: ce9911264fd40d055fe2e371a52a7b36ac0877c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce9911264fd40d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 16:42:17 2016 +0200 Fixed exception in alert handler config when trying to create rule without having handlers --- web/htdocs/valuespec.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e595093..f6acd80 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1613,6 +1613,13 @@ class CascadingDropdown(ValueSpec): def from_html_vars(self, varprefix): choices = self.choices() + + # No choices and "no elements text" is shown: The html var is + # not present and no choice can be made. So fallback to default + # value and let the validation methods lead to an error message. + if not choices: + return self.default_value() + try: sel = int(html.var(varprefix + "_sel")) except:

8 years

Cleaned up tree folding visualization of BI aggregations

by Lars Michelsen

Module: check_mk Branch: master Commit: 64bbe4e8c0ed681c11512baed503c0b3c861788c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64bbe4e8c0ed68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 16:32:08 2016 +0200 Cleaned up tree folding visualization of BI aggregations --- web/htdocs/bi.css | 7 +------ web/htdocs/bi.py | 24 +++++++++++++----------- web/htdocs/images/tree_black_90.png | Bin 333 -> 0 bytes web/htdocs/js/checkmk.js | 15 ++++++++------- web/plugins/views/bi.py | 3 ++- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/web/htdocs/bi.css b/web/htdocs/bi.css index fe23099..bb02ca0 100644 --- a/web/htdocs/bi.css +++ b/web/htdocs/bi.css @@ -107,7 +107,7 @@ b.bullet { background-repeat: repeat; } -.aggrtree img.opentree { +.aggrtree img.treeangle { width: 15px; height: 15px; margin-right: 2px; @@ -115,11 +115,6 @@ b.bullet { vertical-align:middle; } -.aggrtree img.opentree:hover { - cursor: pointer; -} - - table.aggrtree { border-collapse: collapse; width: 100%; diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 6700bdb..a3e1b47 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1660,18 +1660,18 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, h += '<span class=title>' is_empty = len(tree[3]) == 0 if is_empty: - style = '' mc = '' - elif is_open: - style = '' - mc = mousecode + 'src="images/tree_black_90.png" ' else: - style = 'style="display: none" ' - mc = mousecode + 'src="images/tree_black_00.png" ' + mc = mousecode + + css_class = "open" if is_open else "closed" - h += aggr_render_node(tree, tree[2]["title"], mc, show_host) + h += aggr_render_node(tree, tree[2]["title"], show_host, + mousecode=mc, img_class=css_class) if not is_empty: - h += '<ul id="%d:%s" %sclass="subtree">' % (expansion_level or 0, path_id, style) + h += '<ul id="%d:%s" class="subtree %s">' % \ + (expansion_level or 0, path_id, css_class) + if not omit_content: for node in tree[3]: if not node[2].get("hidden"): @@ -1701,7 +1701,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, '</div>' return "aggrtree" + (boxes and "_box" or ""), htmlcode -def aggr_render_node(tree, title, mousecode, show_host): +def aggr_render_node(tree, title, show_host, mousecode=None, img_class=None): # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) if tree[1] and tree[0] != tree[1]: addclass = " " + _("assumed") @@ -1729,7 +1729,9 @@ def aggr_render_node(tree, title, mousecode, show_host): h = '<span class="content state state%d%s">%s</span>\n' \ % (effective_state["state"], addclass, render_bi_state(effective_state["state"])) if mousecode: - h += '<img class=opentree %s>' % mousecode + if img_class: + h += '<img src="images/tree_black_closed.png" class="treeangle %s"%s>' % \ + (img_class, mousecode) h += '<span class="content name" %s>%s</span>' % (mousecode, title) else: h += title @@ -1792,7 +1794,7 @@ def aggr_render_leaf(tree, show_host, bare = False): if bare: return content else: - return aggr_render_node(tree, content, None, show_host) + return aggr_render_node(tree, content, show_host) def render_bi_state(state): return { PENDING: _("PD"), diff --git a/web/htdocs/images/tree_black_90.png b/web/htdocs/images/tree_black_90.png deleted file mode 100644 index 58ae250..0000000 Binary files a/web/htdocs/images/tree_black_90.png and /dev/null differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 8ebc74d..83470d4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2903,21 +2903,22 @@ function bi_toggle_subtree(oImg, lazy) } var oSubtree = oImg.parentNode.childNodes[6]; var url = "bi_save_treestate.py?path=" + encodeURIComponent(oSubtree.id); - var do_open; - if (oSubtree.style.display == "none") { - oSubtree.style.display = ""; - url += "&state=open"; + if (has_class(oImg, "closed")) { + change_class(oSubtree, "closed", "open"); toggle_folding(oImg, true); + + url += "&state=open"; do_open = true; } else { - oSubtree.style.display = "none"; - url += "&state=closed"; + change_class(oSubtree, "open", "closed"); toggle_folding(oImg, false); + + url += "&state=closed"; do_open = false; } - oSubtree = null; + if (lazy && do_open) get_url(url, bi_update_tree, oImg); else diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 894ee0b..19772aa 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -268,7 +268,8 @@ def paint_aggr_tree_ltr(row, mirror): for node in tree[3]: if not node[2].get("hidden"): leaves += gen_table(node, height - 1, show_host) - h = '<div class="aggr tree">' + bi.aggr_render_node(tree, tree[2]["title"], '', show_host) + "</div>" + h = '<div class="aggr tree">' \ + + bi.aggr_render_node(tree, tree[2]["title"], show_host) + "</div>" if leaves: leaves[0][2].append((len(leaves), h)) return leaves

8 years

added missing old style var ipmi_ignore_nr

by Simon Betz

Module: check_mk Branch: master Commit: 5b09748811f15be9e133cacc125402a46f992ab1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b09748811f15b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 2 14:22:36 2016 +0200 added missing old style var ipmi_ignore_nr --- checks/ipmi | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 40a30df..e6ace57 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -161,6 +161,7 @@ ipmi_summarize = True +ipmi_ignore_nr = False ipmi_ignored_sensors = [] # example: [ "Power_Meter", "Virtual_Fan" ] ipmi_ignored_sensorstates = [] # example: [ "nr", "ns" ] inventory_ipmi_rules = [] @@ -176,13 +177,6 @@ def ipmi_get_ignored_sensors(hostname): ignored_sensors_combined += rules[0].get("ignored_sensors", []) ignored_sensorstates_combined += rules[0].get("ignored_sensorstates", []) - # Stay compatible to set old style variable 'ipmi_ignore_nr == True' - try: - if ipmi_ignore_nr and 'nr' not in ignored_sensorstates_combined: - ignored_sensorstates_combined.append('nr') - except: - pass - return ignored_sensors_combined, ignored_sensorstates_combined

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016