Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: gitbug: removed obsolete headers

by git＠mathias-kettner.de

12 years, 4 months

Check_MK Git: check_mk: Some cleanup in check validator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35344031ccd4f5b45da24a0e225f1ad2654a834f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35344031ccd4f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 15:34:11 2012 +0100 Some cleanup in check validator --- doc/helpers/validate_checks | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 49fcc41..e29eebd 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -74,7 +74,7 @@ def get_perfometer_files(): return [ f for f in files if f.endswith(".py") and not f.startswith('.') ] def check_has_perfdata(check): - return check_info[check][2] == 1 + return check_info[check]["has_perfdata"] def get_all_checks(): k = check_info.keys() @@ -168,12 +168,12 @@ TESTS = { 'manpage': C_OK, 'snmp_scan': C_OK, 'pnp_tmpl': C_OK, - 'pnp_rra': C_OK, 'perfometer': C_OK, 'snmp_scan': C_OK, 'reindent': C_OK, 'global_vars': C_OK, 'linelength': C_OK, + 'group': C_OK, 'debug': C_OK, } @@ -240,6 +240,7 @@ def verify_reindent(check): f.close() return not r.run() + # Debug: # - are there 'print' statements in the code? # - are there 'sys.*.write' statements? @@ -300,15 +301,6 @@ def is_valid_pnp_tmpl(check): def verify_pnp_tmpl(check): return os.path.exists('pnp-templates/check_mk-%s.php' % check) -# PNP-Template: -# Does the chekc which produces perfdata have a rra config? - -def is_valid_pnp_rra(check): - return check_has_perfdata(check) - -def verify_pnp_rra(check): - return os.path.exists('pnp-rraconf/check_mk-%s.rra.cfg' % check) - # Perfometer: # Checks with perfdata should provide a perfometer @@ -318,6 +310,13 @@ def is_valid_perfometer(check): def verify_perfometer(check): return 'check_mk-' + check in perfometers +# Has this check a group assigned to? +def is_valid_group(check): + return True + +def verify_group(check): + return not not check_info[check]["group"] + # ############################################################################# # MAIN # ############################################################################# @@ -359,6 +358,8 @@ for o, a in opts: else: usage('Unhandled parameter: %s' % str(o)) +convert_check_info() + # 1) Perform checks # results = {}

12 years, 4 months

Check_MK Git: check_mk: Make check validator find missing WATO rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0889cc0d4a5ed936a31af75561ed47a12cbb6a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0889cc0d4a5ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 15:47:56 2012 +0100 Make check validator find missing WATO rules --- doc/helpers/validate_checks | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index e29eebd..752606f 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -173,7 +173,7 @@ TESTS = { 'reindent': C_OK, 'global_vars': C_OK, 'linelength': C_OK, - 'group': C_OK, + 'wato': C_OK, 'debug': C_OK, } @@ -311,11 +311,24 @@ def verify_perfometer(check): return 'check_mk-' + check in perfometers # Has this check a group assigned to? -def is_valid_group(check): +def is_valid_wato(check): return True -def verify_group(check): - return not not check_info[check]["group"] +def verify_wato(check): + group = check_info[check]["group"] + now = False + for line in file("web/plugins/wato/check_parameters.py"): + line = line.strip() + if line.startswith("checkgroups.append(("): + now = True + elif now: + this_group = line.strip(",").strip('"').strip("'") + if group == this_group: + return True + now = False + else: + now = False + return False # ############################################################################# # MAIN

12 years, 4 months

Check_MK Git: check_mk: Make further checks configurable via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9bba72d4dbf7e15e8ee0a7a1bfc44155902e09b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9bba72d4dbf7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 16:16:58 2012 +0100 Make further checks configurable via WATO --- ChangeLog | 1 + checkman/zpool_status | 2 +- checks/apc_symmetra_ext_temp | 4 ++- checks/wmic_process | 12 ++++---- checks/wut_webtherm | 3 +- checks/zpool_status | 2 +- modules/check_mk_base.py | 3 +- web/htdocs/wato.py | 8 ++++- web/plugins/wato/check_parameters.py | 52 +++++++++++++++++++++++++++++++++- 9 files changed, 73 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d226aad..74edc23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ (such as BINTEC routers) WATO: + * More checks are configurable via WATO now * Distributed WATO: Made all url calls using curl now * FIX: fix bug in inventory in validate_datatype() * Better output in case of inventory error diff --git a/checkman/zpool_status b/checkman/zpool_status index 7092cef..6c24641 100644 --- a/checkman/zpool_status +++ b/checkman/zpool_status @@ -10,4 +10,4 @@ description: has an error the check goes CRITICAL. inventory: - The inventory will automatically find zpools. + The inventory will create one service per host if there are any pools. diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp index 80a8bf3..bb2684b 100644 --- a/checks/apc_symmetra_ext_temp +++ b/checks/apc_symmetra_ext_temp @@ -27,7 +27,7 @@ apc_symmetra_ext_temp_default_levels = (30, 35) def inventory_temp(info): - return [ ( line[0], "", "apc_symmetra_ext_temp_default_levels" ) \ + return [ ( line[0], "apc_symmetra_ext_temp_default_levels" ) \ for line in info if line[1] == "2" ] def check_temp(item, params, info): @@ -53,3 +53,5 @@ snmp_info['apc_symmetra_ext_temp'] = ( [ 1, 3, 4 ] ) snmp_scan_functions['apc_symmetra_ext_temp'] = lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3") + +checkgroup_of["apc_symmetra_ext_temp"] = "room_temperature" diff --git a/checks/wmic_process b/checks/wmic_process index 5c1cafd..2d9cd76 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -66,27 +66,27 @@ def check_wmic_process(item, params, info): if cpu_perc >= cpucrit: state = 2 - infos[7] = "(!! critical at %d%%)" % cpucrit + infos[7] = "(!!) - critical at %d%%" % cpucrit elif page_mb >= pagecrit: state = 2 - infos[5] = "(!! critical at %d MB)" % pagecrit + infos[5] = "(!!) critical at %d MB" % pagecrit elif mem_mb >= memcrit: state = 2 - infos[3] = "(!! critical at %d MB)" % memcrit + infos[3] = "(!!) critical at %d MB" % memcrit elif cpu_perc >= cpuwarn: state = 1 - infos[7] = "(! warning at %d%%)" % cpuwarn + infos[7] = "(!) warning at %d%%" % cpuwarn elif mem_mb >= memwarn: state = 1 - infos[3] = "(! warning at %d MB)" % memwarn + infos[3] = "(!) warning at %d MB" % memwarn elif page_mb >= pagewarn: state = 1 - infos[5] = "(! warning at %d MB)" % pagewarn + infos[5] = "(!) warning at %d MB" % pagewarn else: state = 0 diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 4bed8df..f2404e5 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -29,7 +29,7 @@ wut_webtherm_defaultlevels = (30, 35) def inventory_webtherm(info): # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1 or 16.1 depending on MIB variant. We chop # of the first part in order to get independent of that. - return [ (line[0].split(".")[1], "", "wut_webtherm_defaultlevels") for + return [ (line[0].split(".")[1], "wut_webtherm_defaultlevels") for line in info if len(line) == 2 ] def check_webtherm(item, params, info): @@ -63,3 +63,4 @@ snmp_info['wut_webtherm'] = ( ".1.3.6.1.4.1.5040.1.2", ["1", "2", "3", "6", "8", "16"], [ "1.2.1.1", "1.3.1.1" ]) snmp_scan_functions['wut_webtherm'] = detect_webtherm +checkgroup_of["wut_webtherm"] = "room_temperature" diff --git a/checks/zpool_status b/checks/zpool_status index cd55f14..cccffd4 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -76,7 +76,7 @@ def inventory_zpool_status(info): else: return [ (None, None) ] # -def check_zpool_status(_no_item, params, info): +def check_zpool_status(_no_item, _no_params, info): #print info for line in info: l = " ".join(line) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e617656..ddd71a0 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -742,7 +742,8 @@ def convert_check_info(): "service_description" : service_description, "has_perfdata" : not not has_perfdata, "inventory_function" : inventory_function, - "group" : checkgroup_of.get(check_type), + # Insert check name as group if no group is being defined + "group" : checkgroup_of.get(check_type, check_type), "snmp_info" : snmp_info.get(check_type), # Sometimes the scan function is assigned to the check_type # rather than to the base name. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9f30be0..c922a97 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4414,9 +4414,13 @@ class CheckTypeSelection(ListChoice): def edit_value(valuespec, value): help = valuespec.help() or "" - html.write('<tr><td class=legend><i>%s</i></td>' % help) + html.write('<tr>') + if help: + html.write('<td class=legend><i>%s</i></td>' % help) + html.write("<td class=content>") + else: + html.write('<td colspan=2 class=content>') - html.write("<td class=content>") valuespec.render_input("ve", value) html.write("</td></tr>") diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b4d7f25..11a4aa4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -803,7 +803,8 @@ checkgroups.append(( "mailqueue_length", _("Number of mails in outgoing mail queue"), Tuple( - help = _("This levels is applied to the number of Email that are currently in the outgoing mail queue."), + help = _("These levels are applied to the number of Email that are " + "currently in the outgoing mail queue."), elements = [ Integer(title = _("Warning at"), label = _("mails")), Integer(title = _("Critical at"), label = _("mails"))]), @@ -815,6 +816,55 @@ checkgroups.append(( None, None, None)) +checkgroups.append(( + "zpool_status", + _("Check ZFS Storage Pool status"), + None, + None, None)) + +checkgroups.append(( + "room_temperature", + _("Room temperature (e.g. external thermal sensors in datacenters)"), + Tuple( + help = _("Temperature levels for external thermometers that are used " + "for monitoring the temperature of a datacenter. An example " + "is the webthem from W&T."), + elements = [ + Integer(title = "warning at", unit = u"°C"), + Integer(title = "critical at", unit = u"°C"), + ]), + TextAscii( + title = _("Thermomether ID"), + help = _("The identificator of the themal sensor.")), + "first")) + +checkgroups.append(( + "wmic_process", + _("Memory and CPU consumption of processes on Windows (via WMI)"), + Tuple( + elements = [ + TextAscii( + title = _("Name of the process"), + allow_empty = False, + ), + Integer(title = _("Memory waring at"), unit = "MB"), + Integer(title = _("Memory critical at"), unit = "MB"), + Integer(title = _("Pagefile warning at"), unit = "MB"), + Integer(title = _("Pagefile critical at"), unit = "MB"), + Percentage(title = _("CPU usage warning at")), + Percentage(title = _("CPU usage critical at")), + ], + ), + TextAscii( + title = _("Process name for usage in the Nagios service description"), + allow_empty = False), + "first")) + + + + + + # Create rules for check parameters of inventorized checks for checkgroup, title, valuespec, itemspec, matchtype in checkgroups: if not valuespec:

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0488

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63aa63c1ecb814a434ad45aee4d1a38c02691c10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63aa63c1ecb814… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 15:26:55 2012 +0100 Updated bug entries #0488 --- .bugs/488 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/488 b/.bugs/488 index 8f61886..f8c4cf4 100644 --- a/.bugs/488 +++ b/.bugs/488 @@ -5,7 +5,7 @@ State: open Cost: 1 Date: 2011-12-09 10:21:05 Targetversion: 1.1.13i1 -Class: bug +Class: todo Only when selecting authPriv, we should display privacy protocol and pass phrase.

12 years, 4 months

Check_MK Git: check_mk: BI: new tree rendering painter using boxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38c44fe19d11e80f5573c1e53558da141012775a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c44fe19d11e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 15:18:15 2012 +0100 BI: new tree rendering painter using boxes --- ChangeLog | 4 ++ web/htdocs/bi.css | 11 +++++++ web/htdocs/js/bi.js | 18 ++++++++++++ web/plugins/views/bi.py | 63 ++++++++++++++++++++++++++++++++++++++---- web/plugins/views/builtin.py | 31 ++++++++++++++++++++ 5 files changed, 121 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d01304e..d226aad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,10 @@ * check_bi_local.py: works now with cookie based authentication * FIX: Fixed wrong redirection after login in some cases + BI: + * New column (painter) for simplistic box display of tree. + This is used in a view for a single hostgroup. + 1.1.13i3: Core, Setup, etc.: * *_contactgroups lists: Single group rules are all appended. When a list diff --git a/web/htdocs/bi.css b/web/htdocs/bi.css index 1c90e5c..ed10992 100644 --- a/web/htdocs/bi.css +++ b/web/htdocs/bi.css @@ -119,3 +119,14 @@ table.aggrtree td.node { } +div.bibox_box { + border-style: solid; + border-width: 1px; + float: left; + margin: 1px 4px 1px 0px; + padding: 1px 3px; +} +div.bibox { + float: left; +} + diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js index 1d3b594..ecfed96 100644 --- a/web/htdocs/js/bi.js +++ b/web/htdocs/js/bi.js @@ -41,6 +41,24 @@ function toggle_subtree(oImg) get_url(url); } +function toggle_bi_box(oDiv) +{ + oDiv.style.display = "none"; + + // find child nodes that belong to this node + var found = false; + for (var i in oDiv.parentNode.childNodes) { + var onode = oDiv.parentNode.childNodes[i]; + if (onode == oDiv) + found = true; + else if (found) { + onode.style.display = ""; + return; + } + } +} + + function toggle_assumption(oImg, site, host, service) { // get current state diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 56051e2..edf5ed5 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -147,7 +147,10 @@ multisite_painter_options["aggr_onlyproblems"] = { multisite_painter_options["aggr_treetype"] = { "title" : _("Type of tree layout"), "default" : "foldable", - "values" : [ ("foldable", "foldable"), ("bottom-up", "bottom up"), ("top-down", "top down")] + "values" : [ + ("foldable", "foldable"), + ("bottom-up", "bottom up"), + ("top-down", "top down")] } multisite_painter_options["aggr_wrap"] = { @@ -186,10 +189,13 @@ def render_assume_icon(site, host, service): current = str(ass).lower() return u'<img state="%s" class=assumption %s src="images/assume_%s.png">\n' % (current, mousecode, current) -def aggr_render_leaf(tree, show_host): +def aggr_render_leaf(tree, show_host, bare = False): site, host = tree[2]["host"] service = tree[2].get("service") - content = u"" + render_assume_icon(site, host, service) + if bare: + content = u"" + else: + content = u"" + render_assume_icon(site, host, service) # Four cases: # (1) zbghora17 . Host status (show_host == True, service == None) @@ -211,7 +217,10 @@ def aggr_render_leaf(tree, show_host): else: content += '<a href="%s">%s</a>' % (service_url, service) - return aggr_render_node(tree, content, None, show_host) + if bare: + return content + else: + return aggr_render_node(tree, content, None, show_host) def aggr_render_node(tree, title, mousecode, show_host): state = tree[0] @@ -259,7 +268,43 @@ def filter_tree_only_problems(tree): return state, assumed_state, node, new_subtrees -def paint_aggr_tree_foldable(row): +def paint_aggr_tree_boxes(row): + mousecode = \ + 'onmouseover="this.style.cursor=\'pointer\';" ' \ + 'onmouseout="this.style.cursor=\'auto\';" ' \ + 'onclick="toggle_bi_box(this);" ' + + def render_subtree(tree, open, show_host): + ret = "" + if not open: + state = tree[0] + if len(tree) == 3: + mc = "" + else: + mc = mousecode + ret = '<div %s class="bibox_box state%s">' % (mc, state["state"]) + if len(tree) == 3: # leaf + ret += aggr_render_leaf(tree, show_host, bare = True) + else: + ret += tree[2]["title"] + ret += '</div>' + if len(tree) >= 4: + ret += '<div class="bibox" style="%s">' % (not open and "display: none;" or "") + parts = [] + for node in tree[3]: + ret += render_subtree(node, False, show_host) + ret += '</div>' + return ret + + tree = row["aggr_treestate"] + if get_painter_option("aggr_onlyproblems") == "1": + tree = filter_tree_only_problems(tree) + + affected_hosts = row["aggr_hosts"] + htmlcode = render_subtree(tree, True, len(affected_hosts) > 1) + return "aggrtree", htmlcode + +def paint_aggr_tree_foldable(row, boxes=False): saved_expansion_level = bi.load_ex_level() treestate = weblib.get_tree_states('bi') expansion_level = int(get_painter_option("aggr_expand")) @@ -378,7 +423,7 @@ def paint_aggregated_tree_state(row): return paint_aggr_tree_foldable(row) elif treetype == "bottom-up": return paint_aggr_tree_ltr(row, False) - else: + elif treetype == "top-down": return paint_aggr_tree_ltr(row, True) multisite_painters["aggr_treestate"] = { @@ -389,6 +434,12 @@ multisite_painters["aggr_treestate"] = { "paint" : paint_aggregated_tree_state, } +multisite_painters["aggr_treestate_boxed"] = { + "title" : _("Aggregation: simplistic boxed layout"), + "short" : _("Tree"), + "columns" : [ "aggr_treestate", "aggr_hosts" ], + "paint" : paint_aggr_tree_boxes, +} # _____ _ _ _ # | ___(_) | |_ ___ _ __ ___ diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index c8bd2d9..a29bb55 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2503,6 +2503,37 @@ multisite_builtin_views.update({ 'topic': u'Business Intelligence', 'user_sortable': 'on'}, +# Hostgroup with boxed BIs for each host +'aggr_hostgroup_boxed': {'browser_reload': 0, + 'column_headers': 'off', + 'datasource': 'bi_host_aggregations', + 'description': '', + 'group_painters': [('site_icon', None), + ('sitealias', 'sitehosts')], + 'hard_filters': [], + 'hard_filtervars': [], + 'hidden': True, + 'hide_filters': ['hostgroup'], + 'icon' : 'aggr', + 'layout': 'boxed', + 'linktitle': _('BI Boxes'), + 'mustsearch': False, + 'name': 'hostgroup', + 'num_columns': 2, + 'owner': 'admin', + 'painters': [('host_state', None), + ('host', 'host'), + ('host_icons', None), + ('alias', None), + ('aggr_treestate_boxed', None), + ], + 'play_sounds': False, + 'public': True, + 'show_filters': [], + 'sorters': [('site', False), ('site_host', False)], + 'title': _('Hostgroup with BI state'), + 'topic': _('hidden')}, + # +----------------------------------------------------------------------+ # | _ _ _ _ __ _ _ _ |

12 years, 4 months

Check_MK Git: check_mk: WATO: preserve/honors users only in htpasswd

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a706dadaf54b575b816665998c11c73fa69ebc92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a706dadaf54b57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 13:51:54 2012 +0100 WATO: preserve/honors users only in htpasswd --- ChangeLog | 2 ++ web/htdocs/wato.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b3a6c2..d01304e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ * FIX: allow UTF-8 encoded permission translations * FIX: Fixed several problems in OMD apache shared mode * FIX: Do not use None$ as item when creating new rules + * FIX: Do load *all* users from htpasswd, so passwords from + users not created via WATO will not be lost. Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d574fc3..9f30be0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7005,7 +7005,11 @@ def load_users(): # Passwords are read directly from the apache htpasswd-file. # That way heroes of the command line will still be able to - # change passwords with htpasswd. + # change passwords with htpasswd. Users *only* appearing + # in htpasswd will also be loaded and assigned to the role + # they are getting according to the multisite old-style + # configuration variables. + filename = defaults.htpasswd_file if os.path.exists(filename): for line in file(filename): @@ -7018,12 +7022,12 @@ def load_users(): if id in result: result[id]["password"] = password result[id]["locked"] = locked - elif id in config.admin_users: + else: # Create entry if this is an admin user new_user = { - "roles" : [ "admin" ], + "roles" : config.roles_of_user(id), "password" : password, - "locked" : False + "locked" : False } result[id] = new_user # Other unknown entries will silently be dropped. Sorry...

12 years, 4 months

Check_MK Git: check_mk: Fixed problem with snmp_scan_functions of subchecks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d860b2df886d56bc62eca641f3e415fc02bc0e61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d860b2df886d56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 13:21:12 2012 +0100 Fixed problem with snmp_scan_functions of subchecks --- modules/check_mk.py | 12 ++++++++---- modules/check_mk_base.py | 27 +++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b34e3af..e283474 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -630,9 +630,7 @@ def get_snmp_character_encoding(hostname): return entries[0] def check_uses_snmp(check_type): - base_check_name = check_type.split(".")[0] - return base_check_name in check_info and \ - check_info[base_check_name].get("snmp_info") != None + return snmp_info.get(check_type.split(".")[0]) != None def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) @@ -741,7 +739,13 @@ def snmp_scan(hostname, ipaddress): continue elif not check_uses_snmp(check_type): continue - scan_function = check["snmp_scan_function"] + basename = check_type.split(".")[0] + # The scan function should be assigned to the basename, because + # subchecks sharing the same SNMP info of course should have + # an identical scan function. But some checks do not do this + # correctly + scan_function = snmp_scan_functions.get(check_type, + snmp_scan_functions.get(basename)) if scan_function: try: if scan_function(lambda oid: get_single_oid(hostname, ipaddress, oid)): diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 54e9374..e617656 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -305,7 +305,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): # Is this an SNMP table check? Then snmp_info specifies the OID to fetch # Please note, that if the check_type is foo.bar then we lookup the # snmp info for "foo", not for "foo.bar". - oid_info = check_info.get(check_type, {}).get("snmp_info") + oid_info = snmp_info.get(check_type.split(".")[0]) if oid_info: content = read_cache_file(cache_relpath, max_cache_age) if content: @@ -735,6 +735,7 @@ def convert_check_info(): check_function, service_description, has_perfdata, inventory_function = info if inventory_function == no_inventory_possible: inventory_function = None + basename = check_type.split(".")[0] check_info[check_type] = { "check_function" : check_function, @@ -743,10 +744,32 @@ def convert_check_info(): "inventory_function" : inventory_function, "group" : checkgroup_of.get(check_type), "snmp_info" : snmp_info.get(check_type), - "snmp_scan_function" : snmp_scan_functions.get(check_type), + # Sometimes the scan function is assigned to the check_type + # rather than to the base name. + "snmp_scan_function" : + snmp_scan_functions.get(check_type, + snmp_scan_functions.get(basename)), "includes" : check_includes.get(check_type, []), "default_levels_variable" : check_default_levels.get(check_type), } + else: + # Make sure that all keys are present + info.setdefault("inventory_function", None) + info.setdefault("group", None) + info.setdefault("snmp_info", None) + info.setdefault("snmp_scan_function", None) + info.setdefault("includes", []) + info.setdefault("default_levels_variable", None) + + # Now gather snmp_info and snmp_scan_function back to the + # original arrays. Note: these information is tied to a "agent section", + # not to a check. Several checks may use the same SNMP info and scan function. + for info in check_info.values(): + basename = check_type.split(".")[0] + if info["snmp_info"] and basename not in snmp_info: + snmp_info[basename] = info["snmp_info"] + if info["snmp_scan_function"] and basename not in snmp_scan_functions: + snmp_scan_functions[basename] = info["snmp_scan_function"] # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios

12 years, 4 months

Check_MK Git: check_mk: WATO: Do not use None$ as item when creating new rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 43824429a1b0c580031a9dcb8b158aeca288dd23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43824429a1b0c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 15 08:26:59 2012 +0100 WATO: Do not use None$ as item when creating new rules --- .bugs/633 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.bugs/633 b/.bugs/633 new file mode 100644 index 0000000..08183e0 --- /dev/null +++ b/.bugs/633 @@ -0,0 +1,12 @@ +Title: Creating service rule creates explicit item None +Component: wato +Class: bug +State: done +Date: 2012-02-15 08:20:05 +Targetversion: 1.2.0 + +When creating a service rule, then always "None$" is being +used as item. There should not be an explicit item ist. + +2012-02-15 08:26:23: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index a88883a..77dbcb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * FIX: do not use isdisjoint() (was in rule editor on Lenny) * FIX: allow UTF-8 encoded permission translations * FIX: Fixed several problems in OMD apache shared mode + * FIX: Do not use None$ as item when creating new rules Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1382669..d574fc3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8250,7 +8250,7 @@ def mode_edit_ruleset(phase): if html.check_transaction(): if html.var("_new_rule"): hostname = None - item = None + item = NO_ITEM new_rule = create_rule(rulespec, hostname, item) if hostname: rules[0:0] = [new_rule] @@ -8471,7 +8471,7 @@ def mode_edit_ruleset(phase): title += _(" and %s '%s'") % (rulespec["itemname"], item) html.button("_new_host_rule", title) html.write(" " + _("or") + " ") - html.button("_new_rule", _("General rule in folder: ")) + html.button("_new_rule", _("Create rule in folder: ")) html.select("folder", folder_selection(g_root_folder)) html.write("</p>\n") html.hidden_fields()

12 years, 4 months

Check_MK Git: check_mk: Move reschedule icon to first position

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50a72721ea7d7e5e9fe9630fcace261b0a3853d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a72721ea7d7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 15 08:29:13 2012 +0100 Move reschedule icon to first position That way this icon is better aligned --- web/plugins/icons/builtin.py | 80 +++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 9b51479..09cc393 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -75,6 +75,46 @@ multisite_icons.append({ 'paint': paint_icon_image, }) + +# +----------------------------------------------------------------------+ +# | ____ _ _ _ | +# | | _ \ ___ ___ ___| |__ ___ __| |_ _| | ___ | +# | | |_) / _ \/ __|/ __| '_ \ / _ \/ _` | | | | |/ _ \ | +# | | _ < __/\__ \ (__| | | | __/ (_| | |_| | | __/ | +# | |_| \_\___||___/\___|_| |_|\___|\__,_|\__,_|_|\___| | +# | | +# +----------------------------------------------------------------------+ + +def paint_reschedule(what, row, tags, custom_vars): + # Reschedule button + if (row[what + "_active_checks_enabled"] == 1 + or row[what + '_check_command'].startswith('check_mk-')) \ + and config.may('action.reschedule'): + + servicedesc = '' + wait_svc = '' + icon = 'icon_reload' + txt = _('Reschedule an immediate check of this %s') % _(what) + + if what == 'service': + servicedesc = row['service_description'] + wait_svc = servicedesc + + # Use Check_MK service for cmk based services + if row[what + '_check_command'].startswith('check_mk-'): + servicedesc = 'Check_MK' + icon = 'icon_reload_cmk' + txt = _('Reschedule an immediate check of the \'Check_MK\' service') + + return '<a href=\"javascript:void(0);\" ' \ + 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ + '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ + (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) + +multisite_icons.append({ + 'columns': [ 'active_checks_enabled' ], + 'paint': paint_reschedule, +}) # +----------------------------------------------------------------------+ # | _ _ _ _ | # | / \ ___| | ___ __ _____ _| | ___ __| | __ _ ___ | @@ -409,43 +449,3 @@ def paint_aggregations(what, row, tags, custom_vars): multisite_icons.append({ 'paint': paint_aggregations, }) - -# +----------------------------------------------------------------------+ -# | ____ _ _ _ | -# | | _ \ ___ ___ ___| |__ ___ __| |_ _| | ___ | -# | | |_) / _ \/ __|/ __| '_ \ / _ \/ _` | | | | |/ _ \ | -# | | _ < __/\__ \ (__| | | | __/ (_| | |_| | | __/ | -# | |_| \_\___||___/\___|_| |_|\___|\__,_|\__,_|_|\___| | -# | | -# +----------------------------------------------------------------------+ - -def paint_reschedule(what, row, tags, custom_vars): - # Reschedule button - if (row[what + "_active_checks_enabled"] == 1 - or row[what + '_check_command'].startswith('check_mk-')) \ - and config.may('action.reschedule'): - - servicedesc = '' - wait_svc = '' - icon = 'icon_reload' - txt = _('Reschedule an immediate check of this %s') % _(what) - - if what == 'service': - servicedesc = row['service_description'] - wait_svc = servicedesc - - # Use Check_MK service for cmk based services - if row[what + '_check_command'].startswith('check_mk-'): - servicedesc = 'Check_MK' - icon = 'icon_reload_cmk' - txt = _('Reschedule an immediate check of the \'Check_MK\' service') - - return '<a href=\"javascript:void(0);\" ' \ - 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) - -multisite_icons.append({ - 'columns': [ 'active_checks_enabled' ], - 'paint': paint_reschedule, -})

12 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012