Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: inv: let exception happen on --debug in inventory check

by Mathias Kettner

Module: check_mk Branch: master Commit: 840a90f24a0e38c5c80da4798787427072c9d578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=840a90f24a0e38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 27 17:21:06 2014 +0200 inv: let exception happen on --debug in inventory check --- modules/inventory.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/inventory.py b/modules/inventory.py index ee83580..cdbf3a1 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -203,6 +203,8 @@ def do_inv_check(hostname): sys.stdout.write("OK - found %d entries\n" % num_entries) sys.exit(0) except Exception, e: + if opt_debug: + raise sys.stdout.write("WARN - Inventory failed: %s\n" % e) sys.exit(1)

10 years, 4 months

Check_MK Git: check_mk: symantec_av_progstate, symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux

by Bastian Kuhn

Module: check_mk Branch: master Commit: a1a6bb85dd51a5628a312d37c962f0839dfd7c39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1a6bb85dd51a5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 27 16:09:25 2014 +0200 symantec_av_progstate,symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux --- .werks/164 | 8 +++++ ChangeLog | 1 + agents/plugins/symantec_av | 12 ++++++++ checkman/symantec_av_progstate | 11 +++++++ checkman/symantec_av_quarantine | 12 ++++++++ checkman/symantec_av_updates | 12 ++++++++ checks/symantec_av_progstate | 45 +++++++++++++++++++++++++++ checks/symantec_av_quarantine | 45 +++++++++++++++++++++++++++ checks/symantec_av_updates | 56 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 15 +++++++++ 10 files changed, 217 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a1a6bb85dd…

10 years, 4 months

Check_MK Git: check_mk: kaspersky_av_quarantine, kaspersky_av_tasks, kaspersky_av_updates: New checks for kaspersky anti virus on linux

by Bastian Kuhn

Module: check_mk Branch: master Commit: 84273b300105ef513702f904b097ce2273588098 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84273b300105ef… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 27 15:47:33 2014 +0200 kaspersky_av_quarantine,kaspersky_av_tasks,kaspersky_av_updates: New checks for kaspersky anti virus on linux --- .werks/163 | 8 ++++ ChangeLog | 1 + agents/plugins/kaspersky_av | 13 ++++++ checkman/kaspersky_av_quarantine | 12 ++++++ checkman/kaspersky_av_tasks | 12 ++++++ checkman/kaspersky_av_updates | 11 +++++ checks/kaspersky_av_quarantine | 51 ++++++++++++++++++++++++ checks/kaspersky_av_tasks | 82 ++++++++++++++++++++++++++++++++++++++ checks/kaspersky_av_updates | 58 +++++++++++++++++++++++++++ 9 files changed, 248 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=84273b3001…

10 years, 4 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 66366fcaf36621f0b646a19d2c2e0d4daf4d78b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66366fcaf36621… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 27 11:41:07 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index acbef43..7f9d7e9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -982 +992

10 years, 4 months

Check_MK Git: check_mk: add windows agent persisted draft

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d373cc88f533942a3878adaace38e542d364462 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d373cc88f5339… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 27 10:39:13 2014 +0200 add windows agent persisted draft --- doc/drafts/LIESMICH.windows_persisted | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/drafts/LIESMICH.windows_persisted b/doc/drafts/LIESMICH.windows_persisted new file mode 100644 index 0000000..0356f58 --- /dev/null +++ b/doc/drafts/LIESMICH.windows_persisted @@ -0,0 +1,20 @@ + +Man möchte in windows also ein persisted Feature in den Agent bauen.. + +- script container struct erweitern um eine liste von hosts und ihrem letzten + persisted zeitpunkt + +- beim Senden der Daten an einen Host prüfen ob + a) persisted Daten wieder gemeldet werden sollen + b) wenn ja, das Sammeln der Daten wieder anwerfen, aber noch nichts melden + c) beim nächsten Aufruf sind die Daten bestimmt aktuell, diese melden + und den persisted timestamp des Hosts aktualisieren + +Jedes Skript kann man einzeln in der check_mk.ini konfigurieren. + +# Daten alle 60 Minuten (hostabhängig) in die Welt hinaus senden +persisted mk_inventory.ps1 = 60 + +Weitere Überlegung. Vielleicht nicht unbedingt persisted nennen. +Das Feature kann man evtl. auch anderweitig einsetzen. +

10 years, 4 months

Check_MK Git: check_mk: windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable

by Andreas Boesl

Module: check_mk Branch: master Commit: 6507b9566c2255c701ad13ab92ab13564471016c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6507b9566c2255… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 27 10:31:07 2014 +0200 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable --- .werks/926 | 8 ++++++++ ChangeLog | 5 +++-- agents/windows/check_mk_agent-64.exe | Bin 204800 -> 205312 bytes agents/windows/check_mk_agent.cc | 12 +++++++++--- agents/windows/check_mk_agent.exe | Bin 175104 -> 175104 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 158244 -> 158331 bytes agents/windows/install_agent.exe | Bin 155364 -> 155451 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 9 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/926 b/.werks/926 new file mode 100644 index 0000000..5b43d12 --- /dev/null +++ b/.werks/926 @@ -0,0 +1,8 @@ +Title: windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401179419 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5394e07..b0b54f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,7 +60,8 @@ * 0960 libelle_business_shadow.archive_dir: New check for the Archive Dir of Libelle Business Shadow... * 0978 Fix security issue with mk-job on Linux... NOTE: Please refer to the migration notes! - * 0925 ps: improved/fixed calculation of CPU utilization... + * 0925 ps: improved/fixed calculation of CPU utilization (linux)... + * 0926 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection @@ -88,8 +89,8 @@ * 0611 FIX: nfsexports.solaris: fix in determination of path prefix * 0953 FIX: brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP * 0958 FIX: df.include: failed for checks with grouping patterns... - * 0614 FIX: cmciii.temp, cmciii.humidity: fixed bugs to get performance data back * 0924 FIX: windows agent: now able to execute python scripts again + * 0614 FIX: cmciii.temp, cmciii.humidity: fixed bugs to get performance data back Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e17986b..8198a67 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e7fa13b..631f109 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4056,12 +4056,18 @@ void listen_tcp_loop() connection = RemoveSocketInheritance(connection); if (connection != INVALID_SOCKET) { uint32_t ip = 0; - if (remote_addr.sin_family == AF_INET) + char ip_hr[256]; + if (remote_addr.sin_family == AF_INET) { ip = remote_addr.sin_addr.s_addr; + snprintf(ip_hr, sizeof(ip_hr), "%u.%u.%u.%u", + ip & 0xff, (ip >> 8) & 0xff, (ip >> 16) & 0xff, (ip >> 24) & 0xff); + } else + snprintf(ip_hr, sizeof(ip_hr), "None"); if (check_only_from(ip)) { open_crash_log(); - crash_log("Accepted client connection from %u.%u.%u.%u.", - ip & 0xff, (ip >> 8) & 0xff, (ip >> 16) & 0xff, (ip >> 24) & 0xff); + crash_log("Accepted client connection from %s.", ip_hr); + + SetEnvironmentVariable("REMOTE_HOST", ip_hr); output_data(connection); close_crash_log(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 3a353d7..c9b6229 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index eeca449..8276ea4 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 559d7ed..899111b 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 3ddaee1..34562eb 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f86b848..2947ce7 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years, 4 months

Check_MK Git: check_mk: Virtual Host Tree: you can now " change your current folder"

by Mathias Kettner

Module: check_mk Branch: master Commit: 45499931da0a6d13756e5ac9e05ece5f2f7ab9fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45499931da0a6d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 27 09:27:22 2014 +0200 Virtual Host Tree: you can now "change your current folder" --- web/htdocs/sidebar.py | 13 +++- web/plugins/pages/shipped.py | 1 + web/plugins/sidebar/shipped.py | 131 ++++++++++++++++++++++++++++------------ 3 files changed, 105 insertions(+), 40 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 31c0869..72480fc 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -645,8 +645,17 @@ def page_edit_bookmark(): def ajax_tag_tree(): newconf = int(html.var("conf")) - tree_conf = config.save_user_file("virtual_host_tree", newconf) - + tree_conf = config.load_user_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + if type(tree_conf) == int: + tree_conf = {"cwd":{}} # convert from old style + tree_conf["tree"] = newconf + config.save_user_file("virtual_host_tree", tree_conf) + +def ajax_tag_tree_enter(): + path = html.var("path") and html.var("path").split("|") or [] + tree_conf = config.load_user_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + tree_conf["cwd"][tree_conf["tree"]] = path + config.save_user_file("virtual_host_tree", tree_conf) #. diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 06fa4b1..245f471 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -67,6 +67,7 @@ pagehandlers.update({ "sidebar_move_snapin" : sidebar.move_snapin, "sidebar_ajax_speedometer" : sidebar.ajax_speedometer, "sidebar_ajax_tag_tree" : sidebar.ajax_tag_tree, + "sidebar_ajax_tag_tree_enter": sidebar.ajax_tag_tree_enter, "sidebar_get_messages" : sidebar.ajax_get_messages, "sidebar_message_read" : sidebar.ajax_message_read, "ajax_search" : sidebar.ajax_search, diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1fa1868..060479c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1302,24 +1302,44 @@ def tag_tree_url(taggroups, taglist, viewname): urlvars.append(("host_tag_%d_val" % nr, tag or "")) return html.makeuri_contextless(urlvars, "view.py") -def tag_tree_bullet(state, leaf): - return '<div class="tagtree %sstatebullet state%d"> </div> ' % ((leaf and "leaf " or ""), state) - - -def render_tag_tree_level(taggroups, path, title, tree): - bullet = tag_tree_bullet(tag_tree_worst_state(tree), False) - if tag_tree_has_svc_problems(tree): - # We cannot use html.plug() here, since this is not (yet) - # reentrant and it is used by the sidebar snapin updater. - # So we need to duplicate the code of icon_button here: - bullet += ('<a target="main" onfocus="if (this.blur) this.blur();" href="%s">' - '<img align=absmiddle class=iconbutton title="%s" src="images/button_svc_problems_lo.png" ' - 'onmouseover="hilite_icon(this, 1)" onmouseout="hilite_icon(this, 0)"></a>' % ( - tag_tree_url(taggroups, path, "svcproblems"), - _("Show the service problems contained in this branch"))) - - if path: - html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title) +def tag_tree_bullet(state, path, leaf): + code = '<div class="tagtree %sstatebullet state%d"> </div>' % ((leaf and "leaf " or ""), state) + if not leaf: + code = '<a title="%s" href="javascript:virtual_host_tree_enter(%r);">' % \ + (_("Display the tree only below this node"), "|".join(path)) + code + "</a>" + return code + " " + + +def is_tag_subdir(path, cwd): + if not cwd: + return True + elif not path: + return False + elif path[0] != cwd[0]: + return False + else: + return is_tag_subdir(path[1:], cwd[1:]) + +def render_tag_tree_level(taggroups, path, cwd, title, tree): + if not is_tag_subdir(path, cwd) and not is_tag_subdir(cwd, path): + return + + if path != cwd and is_tag_subdir(path, cwd): + bullet = tag_tree_bullet(tag_tree_worst_state(tree), path, False) + if tag_tree_has_svc_problems(tree): + # We cannot use html.plug() here, since this is not (yet) + # reentrant and it is used by the sidebar snapin updater. + # So we need to duplicate the code of icon_button here: + bullet += ('<a target="main" onfocus="if (this.blur) this.blur();" href="%s">' + '<img align=absmiddle class=iconbutton title="%s" src="images/button_svc_problems_lo.png" ' + 'onmouseover="hilite_icon(this, 1)" onmouseout="hilite_icon(this, 0)"></a>' % ( + tag_tree_url(taggroups, path, "svcproblems"), + _("Show the service problems contained in this branch"))) + + + if path: + html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title) + items = tree.items() items.sort() @@ -1330,18 +1350,19 @@ def render_tag_tree_level(taggroups, path, title, tree): title += " (%d)" % subtree["_num_hosts"] href = '<a target=main href="%s">%s</a>' % (url, html.attrencode(title)) if "_num_hosts" in subtree: - - html.write(tag_tree_bullet(subtree["_state"], True)) - if subtree.get("_svc_problems"): - url = tag_tree_url(taggroups, subpath, "svcproblems") - html.icon_button(url, _("Show the service problems contained in this branch"), - "svc_problems", target="main") - html.write(href) - html.write("<br>") + + if is_tag_subdir(path, cwd): + html.write(tag_tree_bullet(subtree["_state"], subpath, True)) + if subtree.get("_svc_problems"): + url = tag_tree_url(taggroups, subpath, "svcproblems") + html.icon_button(url, _("Show the service problems contained in this branch"), + "svc_problems", target="main") + html.write(href) + html.write("<br>") else: - render_tag_tree_level(taggroups, subpath, href, subtree) + render_tag_tree_level(taggroups, subpath, cwd, href, subtree) - if path: + if path and path != cwd and is_tag_subdir(path, cwd): html.end_foldable_container() virtual_host_tree_js = """ @@ -1352,6 +1373,12 @@ function virtual_host_tree_changed(field) get_url_sync('sidebar_ajax_tag_tree.py?conf=' + escape(tree_conf)); refresh_single_snapin("tag_tree"); } + +function virtual_host_tree_enter(path) +{ + get_url_sync('sidebar_ajax_tag_tree_enter.py?path=' + escape(path)); + refresh_single_snapin("tag_tree"); +} """ def render_tag_tree(): @@ -1361,18 +1388,31 @@ def render_tag_tree(): 'do this in the global settings for <a target=main href="%s">Multisite</a>.') % url) return - tree_conf = config.load_user_file("virtual_host_tree", 0) + tree_conf = config.load_user_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + if type(tree_conf) == int: + tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style + + choices = enumerate([v[0] for v in config.virtual_host_trees]) html.begin_form("vtree") - html.select("vtree", choices, tree_conf, onchange = 'virtual_host_tree_changed(this)') + + # Give chance to change one level up, if we are in a subtree + cwd = tree_conf["cwd"].get(tree_conf["tree"]) + if cwd: + upurl = "javascript:virtual_host_tree_enter(%r)" % "|".join(cwd[:-1]) + html.icon_button(upurl, _("Go up one tree level"), "back") + + html.select("vtree", choices, tree_conf["tree"], onchange = 'virtual_host_tree_changed(this)') html.write("<br>") html.end_form() html.final_javascript(virtual_host_tree_js) - title, taggroups = config.virtual_host_trees[tree_conf] + title, taggroups = config.virtual_host_trees[tree_conf["tree"]] tree = compute_tag_tree(taggroups) - render_tag_tree_level(taggroups, [], _("Virtual Host Tree"), tree) + + + render_tag_tree_level(taggroups, [], cwd, _("Virtual Host Tree"), tree) sidebar_snapins["tag_tree"] = { "title" : _("Virtual Host Tree"), @@ -1383,11 +1423,7 @@ sidebar_snapins["tag_tree"] = { "allowed" : [ "admin", "user", "guest" ], "styles" : """ -#snapin_tag_tree img.iconbutton { - width: 12px; - height: 12px; - position: relative; - top: -2px; +#snapin_tag_tree img.iconbutton { } #snapin_tag_tree select { @@ -1414,11 +1450,30 @@ sidebar_snapins["tag_tree"] = { box-shadow: 0px 0px 0.7px #284850; } -#snapin_tag_tree div.statebullet.leaf { +#snapin_tag_tree ul > div.statebullet.leaf { margin-left: 16px; } #snapin_tag_tree b { font-weight: normal; } + +#snapin_tag_tree { + position: relative; + top: 0px; + left: 0px; +} +#snapin_tag_tree form img.iconbutton { + width: 16px; + height: 16px; + float: none; + display: inline-box; + position: absolute; + top: 9px; + left: 14px; +} +#snapin_tag_tree select { + width: 198px; + margin-left: 17px; +} """ }

10 years, 4 months

Check_MK Git: check_mk: check_mk_agent.solaris: fixed problem with call of mdb command ( the output caused problems in the previous agent section)

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 14899d04882af7328cce6fa61f2c73dc75ad12e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14899d04882af7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon May 26 18:31:30 2014 +0200 check_mk_agent.solaris: fixed problem with call of mdb command (the output caused problems in the previous agent section) --- agents/check_mk_agent.solaris | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 888b016..1ae8281 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -130,7 +130,7 @@ then fi # ZFS arc cache -if type mdb &>/dev/null +if type mdb >/dev/null 2>&1 then echo '<<<zfs_arc_cache>>>' echo "::arc" | mdb -k

10 years, 4 months

Check_MK Git: check_mk: FIX cmciii.temp, cmciii.humidity: fixed bugs to get performance data back

by Goetz Golla

Module: check_mk Branch: master Commit: 94d091cca9c955b2f7346dc117e88f0f6c24542c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94d091cca9c955… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon May 26 17:00:31 2014 +0200 FIX cmciii.temp, cmciii.humidity: fixed bugs to get performance data back --- .werks/614 | 8 ++++++++ ChangeLog | 1 + checks/cmciii | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/614 b/.werks/614 new file mode 100644 index 0000000..abf563e --- /dev/null +++ b/.werks/614 @@ -0,0 +1,8 @@ +Title: cmciii.temp, cmciii.humidity: fixed bugs to get performance data back +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401116364 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4ad6274..c246af9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * 0611 FIX: nfsexports.solaris: fix in determination of path prefix * 0953 FIX: brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP * 0958 FIX: df.include: failed for checks with grouping patterns... + * 0614 FIX: cmciii.temp, cmciii.humidity: fixed bugs to get performance data back Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/cmciii b/checks/cmciii index c14fb41..12d34dc 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -463,6 +463,9 @@ def parse_temp(val): # is encoded string val = re.sub(" ","", val).decode("hex") val, t_unit = val.split(" ", 1) + # omit special characters in unit, because they + # cause problems in rrdtools + t_unit = re.sub("[^\w]","", t_unit) return val, t_unit def check_cmciii_temp(item, params, info): @@ -706,7 +709,7 @@ def check_cmciii_humidity(item, params, info): else: state = 2 - perfdata = [ ("hum", value+"%", 0, 0 ) ] + perfdata = [ ("hum", value, 0, 0 ) ] infotext = "%s %s%% %s - Limits low %s/%s high %s/%s, Offset %s" % \ ( descr, value, status, lowalarm, lowwarning, highwarning, highalarm, offset ) @@ -719,5 +722,6 @@ check_info['cmciii.humidity'] = { "service_description" : "%s", "snmp_scan_function" : cmciii_scan, "snmp_info" : cmciii_snmp_info, + "has_perfdata" : True, } #.

10 years, 4 months

Check_MK Git: check_mk: Virtual Host Tree: fix switching of different tree layouts

by Mathias Kettner

Module: check_mk Branch: master Commit: ac781af774bbb8ee35a755a4c38bf24c04c21702 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac781af774bbb8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 26 14:59:58 2014 +0200 Virtual Host Tree: fix switching of different tree layouts The bug was introduced by the new "bomb" icon. --- web/htdocs/js/checkmk.js | 1 + web/plugins/sidebar/shipped.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d0957ce..213d4e5 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -239,6 +239,7 @@ function post_url(url, params) { AJAX.send(params); } + function bulkUpdateContents(ids, codes) { var codes = eval(codes); for (var i = 0, len = ids.length; i < len; i++) { diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 39756de..1fa1868 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1309,12 +1309,14 @@ def tag_tree_bullet(state, leaf): def render_tag_tree_level(taggroups, path, title, tree): bullet = tag_tree_bullet(tag_tree_worst_state(tree), False) if tag_tree_has_svc_problems(tree): - html.plug() - url = tag_tree_url(taggroups, path, "svcproblems") - html.icon_button(url, _("Show the service problems contained in this branch"), - "svc_problems", target="main") - bullet += html.drain() - html.unplug() + # We cannot use html.plug() here, since this is not (yet) + # reentrant and it is used by the sidebar snapin updater. + # So we need to duplicate the code of icon_button here: + bullet += ('<a target="main" onfocus="if (this.blur) this.blur();" href="%s">' + '<img align=absmiddle class=iconbutton title="%s" src="images/button_svc_problems_lo.png" ' + 'onmouseover="hilite_icon(this, 1)" onmouseout="hilite_icon(this, 0)"></a>' % ( + tag_tree_url(taggroups, path, "svcproblems"), + _("Show the service problems contained in this branch"))) if path: html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title)

10 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014