Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 31aeced02ab101256a22245327d11d5a851b31a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31aeced02ab101… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 11:12:50 2016 +0100 Updated bug entries #2427 --- .bugs/2427 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2427 b/.bugs/2427 index 43b41b5..02b9939 100644 --- a/.bugs/2427 +++ b/.bugs/2427 @@ -1,12 +1,14 @@ Title: Converting existing custom user macro to "Make avaible in notifications" needs load/save Component: wato -State: open +Class: bug +State: done Date: 2016-03-03 10:38:16 Targetversion: 1.2.8 -Class: bug If you create a new custom user macro and assign a value for a user to it. Then later you convert this macro to "Add as custom macro: [X] Make this variable available in notifications" then you need to save the user profile once again in order to make this effective. I assume that it is sufficiant to save any one user to correctly save all macros. + +2016-03-21 11:12:48: changed state open -> done

8 years, 8 months

3314 FIX Correctly add custom user attribute values after change in attribute declaration

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fc9dad203cc5c78c7a3174095cc0921858c4784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc9dad203cc5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 11:12:26 2016 +0100 3314 FIX Correctly add custom user attribute values after change in attribute declaration If you redeclared this attributes as "make available for notifications" it would be added only after once modifying any actual user. This has been fixed. --- .werks/3314 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 4 ++++ web/htdocs/wato.py | 6 +++++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/3314 b/.werks/3314 new file mode 100644 index 0000000..476b92c --- /dev/null +++ b/.werks/3314 @@ -0,0 +1,11 @@ +Title: Correctly add custom user attribute values after change in attribute declaration +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458555064 + +If you redeclared this attributes as "make available for notifications" it would +be added only after once modifying any actual user. This has been fixed. diff --git a/ChangeLog b/ChangeLog index d58ab9a..9fd108c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 3011 FIX: WATO host diagnostic page: prevent incorrectly filled input fields... * 3295 FIX: Fixed exception in WATO git integration when modifying .gitingore file * 3296 FIX: Hiding pending changes related buttons after discarding changes + * 3314 FIX: Correctly add custom user attribute values after change in attribute declaration... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index ac7c219..d17678a 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -609,6 +609,10 @@ def save_users(profiles): hooks.call("users-saved", profiles) +def rewrite_users(): + users = load_users(lock = True) + save_users(users) + def contactgroups_of_user(user_id): users = load_users() if user_id not in users: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cf17f2a..2f4e479 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14350,7 +14350,7 @@ def mode_edit_custom_attr(phase, what): log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Create new %s attribute %s") % (what, name)) else: - log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Changed title of %s attribute %s") % (what, name)) + log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Modified %s attribute %s") % (what, name)) attr.update({ 'title' : title, 'topic' : topic, @@ -14361,6 +14361,10 @@ def mode_edit_custom_attr(phase, what): }) save_custom_attrs(all_attrs) + if what == "user": + userdb.declare_custom_user_attrs() + userdb.rewrite_users() + return what + "_attrs"

8 years, 8 months

Updated bug entries #2426

by Mathias Kettner

Module: check_mk Branch: master Commit: 127149c008b52371f57f6ab9cb02dd6688100477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=127149c008b523… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:56:10 2016 +0100 Updated bug entries #2426 --- .bugs/2426 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.bugs/2426 b/.bugs/2426 index 755e57e..b8a50e6 100644 --- a/.bugs/2426 +++ b/.bugs/2426 @@ -1,13 +1,19 @@ Title: Monitoring UP switchports for WARN sometimes breaks Component: checks -State: open +Class: bug +State: works4me Date: 2016-03-02 13:10:47 Targetversion: 1.2.8 -Class: bug If you setup Interfacemmonitoring (SNMP) in a way that an UP port will be warned then sometimes the check will not detect this and -stay OK - even in the port UP. Might or might not be due to +stay OK - even in the port UP. Might or might not be due to counter wraps. If you restart the OMD site then the problem is gone. + +MK: I cannot reproduce this. The code looks OK. Not sure if this +report is really authentic. If it happens again we can easiliy +investigate then.... + +2016-03-21 10:55:24: changed state open -> works4me

8 years, 8 months

Fix spelling of label

by Mathias Kettner

Module: check_mk Branch: master Commit: e971c3fbb199b2a87f01063158567e701116837a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e971c3fbb199b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:48:16 2016 +0100 Fix spelling of label --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bbf30a6..b830707 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4138,7 +4138,7 @@ register_check_parameters( ListChoice( title = _("Allowed states:"), choices = dict_choices(interface_oper_states)), - title = _("Operational State"), + title = _("Operational state"), help = _("If you activate the monitoring of the operational state (<tt>ifOperStatus</tt>) " "the check will get warning or critical if the current state " "of the interface does not match one of the expected states. Note: the status 9 (<i>admin down</i>) "

8 years, 8 months

Updated bug entries #2425

by Mathias Kettner

Module: check_mk Branch: master Commit: fa92dfbf97b572a83fb38d287959c09f4fd277bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa92dfbf97b572… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:47:23 2016 +0100 Updated bug entries #2425 --- .bugs/2425 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.bugs/2425 b/.bugs/2425 index b2dd797..de6f274 100644 --- a/.bugs/2425 +++ b/.bugs/2425 @@ -2,7 +2,7 @@ Title: Permissions for views and dashboards inconsistent Component: multisite State: open Date: 2016-03-01 09:58:31 -Targetversion: 1.2.8 +Targetversion: 1.2.9 Class: bug 1. Views und Dashboards: @@ -18,3 +18,7 @@ Berechtigungs-Matrix angezeigt. Dashboard - Edit: Make this view available for all unsers wird nicht aktiviert -> Dashboard wird in Berechtigungs-Matrix angezeigt. + + +--> Fix this by using the new pagetypes principle also for +dashboards and views.

8 years, 8 months

Updated bug entries #2423

by Mathias Kettner

Module: check_mk Branch: master Commit: 29bf36f8d1ed5404b81505f164bf877fe11060f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29bf36f8d1ed54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:39:55 2016 +0100 Updated bug entries #2423 --- .bugs/2423 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2423 b/.bugs/2423 index 82c269c..4e1a195 100644 --- a/.bugs/2423 +++ b/.bugs/2423 @@ -1,10 +1,13 @@ Title: NagVis does not work anymore because of gadget_type=img Component: multisite -State: open +Class: bug +State: done Date: 2016-02-26 09:12:18 Targetversion: 1.2.8 -Class: bug Nagvis geht nach dem Update nicht mehr da Links zu maps bis dahin das Attribut gadget_type=img hatten, was nun nicht mehr erlaubt ist und zu einer Meldung führt was die GUI blockiert. Entfernen der Werte löst das Problem. + +2016-03-21 10:39:54: changed state open -> done +Lars has already fixed this.

8 years, 8 months

3298 FIX winperf_processor.util: Fixed exception when CPU counters were not matched

by Lars Michelsen

Module: check_mk Branch: master Commit: af4d518ce5b4b7de694ea5d63e68d740637b9339 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af4d518ce5b4b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 10:44:50 2016 +0100 3298 FIX winperf_processor.util: Fixed exception when CPU counters were not matched --- .werks/3298 | 10 ++++++++++ ChangeLog | 1 + checks/winperf_processor | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3298 b/.werks/3298 new file mode 100644 index 0000000..01222a0 --- /dev/null +++ b/.werks/3298 @@ -0,0 +1,10 @@ +Title: winperf_processor.util: Fixed exception when CPU counters were not matched +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458553473 + + diff --git a/ChangeLog b/ChangeLog index be4bac0..d58ab9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 3237 FIX: brocade_vdx_status: Fixed broken discovery * 3238 FIX: if.include: Fixed handling of old-skool traffic limits * 3104 FIX: ipmi: fixed crash when using summarized output with nagios backend + * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/winperf_processor b/checks/winperf_processor index 7bdcdc3..3cffe38 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -59,9 +59,10 @@ def check_winperf_util(_no_item, params, info): return wrapped = False - + matched = False for line in winperf_lines: if line[0] in what_map: + matched = True what = what_map[line[0]] # Windows sends one counter for each CPU plus one counter that # sums up to total (called _Total). We only need that last value. @@ -121,6 +122,9 @@ def check_winperf_util(_no_item, params, info): else: # privileged yield 0, "%s perc: %.1f %%" % (what, used_perc) + if not matched: + return + if wrapped: # all counters initialized, NOW we can raise the exception raise MKCounterWrapped("Counter wrap, skipping checks this time")

8 years, 8 months

3297 SEC Fixes possible XSS in views sidebar snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 77f455273d4c9ec7b4243619c349d5229da0f17c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77f455273d4c9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 10:38:33 2016 +0100 3297 SEC Fixes possible XSS in views sidebar snapin Authenticated and permitted users could create views using a topic which might contains HTML code, for example script tags, that where executed when having the view listed in the views snapin. Making the JS code be executed by other users is only possible with view publish permissions which normally only admin users have. --- .werks/3297 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 14 +++++++------- web/htdocs/wato.py | 13 +++++++------ web/htdocs/watolib.py | 9 +++++---- web/plugins/sidebar/shipped.py | 3 ++- web/plugins/sidebar/wato.py | 4 ++-- 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.werks/3297 b/.werks/3297 new file mode 100644 index 0000000..7bd9f68 --- /dev/null +++ b/.werks/3297 @@ -0,0 +1,15 @@ +Title: Fixes possible XSS in views sidebar snapin +Level: 1 +Component: multisite +Class: security +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458552307 + +Authenticated and permitted users could create views using +a topic which might contains HTML code, for example script tags, +that where executed when having the view listed in the views snapin. + +Making the JS code be executed by other users is only possible with +view publish permissions which normally only admin users have. diff --git a/ChangeLog b/ChangeLog index ba44d42..be4bac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 3187 notification view: new filter for log command via regex * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... + * 3297 SEC: Fixes possible XSS in views sidebar snapin... * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a505076..30512d5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1608,28 +1608,28 @@ class html(GUITester): if indent == "nform": self.write('<tr class=heading><td id="nform.%s.%s" %s colspan=2>' % (treename, id, onclick)) if icon: - self.write('<img class="treeangle title" src="images/icon_%s.png">' % icon) + self.write('<img class="treeangle title" src="images/icon_%s.png">' % self.attrencode(icon)) else: self.write('<img align=absbottom class="treeangle nform" src="images/%s_%s.png">' % (tree_img, isopen and "90" or "00")) - self.write('%s</td></tr>' % title) + self.write('%s</td></tr>' % self.attrencode(title)) else: if not icon: self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' 'src="images/%s_%s.png" %s>' % (treename, id, tree_img, img_num, onclick)) - if title.startswith('<'): # custom HTML code - self.write(title) + if isinstance(title, HTML): # custom HTML code + self.write(self.attrencode(title)) if indent != "form": self.write("<br>") else: self.write('<b class="treeangle title" class=treeangle %s>' % (not title_url and onclick or "")) if icon: - self.write('<img class="treeangle title" src="images/icon_%s.png">' % icon) + self.write('<img class="treeangle title" src="images/icon_%s.png">' % self.attrencode(icon)) if title_url: - self.write('<a href="%s">%s</a>' % (title_url, title)) + self.write('<a href="%s">%s</a>' % (self.attrencode(title_url), self.attrencode(title))) else: - self.write(title) + self.write(self.attrencode(title)) self.write('</b><br>') indent_style = "padding-left: %dpx; " % (indent == True and 15 or 0) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index be6b91b..cf17f2a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -556,13 +556,13 @@ def show_subfolder_title(subfolder): if not config.wato_hide_filenames: title += ' (%s)' % subfolder.name() - html.write('<div class=title title="%s">' % title) + html.write('<div class=title title="%s">' % html.attrencode(title)) if subfolder.may("read"): html.write('<a href="%s">' % subfolder.url()) - html.write(subfolder.title()) + html.write(html.attrencode(subfolder.title())) html.write("</a>") else: - html.write(subfolder.title()) + html.write(html.attrencode(subfolder.title())) html.write('</div>') @@ -4597,7 +4597,7 @@ def render_logfile_linkinfo(linkinfo): else: return "" - return '<a href="%s">%s</a>' % (url, title) + return '<a href="%s">%s</a>' % (url, html.attrencode(title)) def get_timerange(t): @@ -4726,7 +4726,7 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): % _("This change has been made by another user") htmlcode += user + '</td>' - htmlcode += '</td><td width="100%%">%s</td></tr>\n' % text + htmlcode += '</td><td width="100%%">%s</td></tr>\n' % html.attrencode(text) htmlcode += "</table>" if what == 'audit': @@ -14186,7 +14186,8 @@ def mode_pattern_editor(phase): match_img = 'nmatch' match_title = reason - html.begin_foldable_container("rule", str(rulenr), True, "<b>Rule #%d</b>" % (rulenr + 1), indent = False) + html.begin_foldable_container("rule", str(rulenr), True, + HTML("<b>Rule #%d</b>" % (rulenr + 1)), indent = False) html.write('<table style="width:100%" class="data logwatch"><tr>') html.write('<th style="width:30px;">' + _('Match') + '</th>') html.write('<th style="width:50px;">' + _('State') + '</th>') diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 699bbc1..3e2b283 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -481,8 +481,9 @@ class BaseFolder(WithPermissionsAndAttributes): keepvars.append(("mode", "folder")) def render_component(folder): - return '<a href="%s">%s</a>' % (html.makeuri_contextless([ ("folder", folder.path())] - + keepvars), folder.title()) + return '<a href="%s">%s</a>' % \ + (html.makeuri_contextless([ ("folder", folder.path())] + keepvars), + html.attrencode(folder.title())) def breadcrump_element_start(end = '', z_index = 0): html.write('<li style="z-index:%d;"><div class="left %s"></div>' % (z_index, end)) @@ -499,7 +500,7 @@ class BaseFolder(WithPermissionsAndAttributes): if link_to_folder: parts.append(render_component(self)) else: - parts.append(self.title()) + parts.append(html.attrencode(self.title())) # Render the folder path @@ -4292,7 +4293,7 @@ def render_condition_editor(tag_specs, varprefix=""): make_foldable = len(all_topics) > 1 for topic in all_topics: if make_foldable: - html.begin_foldable_container("topic", topic, True, "<b>%s</b>" % (_u(topic))) + html.begin_foldable_container("topic", topic, True, HTML("<b>%s</b>" % (_u(topic)))) html.write("<table class=\"hosttags\">") # Show main tags diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index fc593b0..9507cb9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1789,7 +1789,8 @@ def render_tag_tree_level(taggroups, path, cwd, title, tree): "svc_problems") if path: - html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title) + html.begin_foldable_container("tag-tree", ".".join(map(str, path)), + False, HTML(bullet + title)) items = tree.items() items.sort() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index fd9cef3..b8b008d 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -197,10 +197,10 @@ def render_tree_folder(f, js_func): html.write("<ul style='padding-left: 0px;'>") title = '<a class="link" href="#" onclick="%s(this, \'%s\');">%s (%d)</a>' % ( - js_func, f[".path"], f["title"], f[".num_hosts"]) + js_func, f[".path"], html.attrencode(f["title"]), f[".num_hosts"]) if not is_leaf: - html.begin_foldable_container('wato-hosts', "/" + f[".path"], False, title) + html.begin_foldable_container('wato-hosts', "/" + f[".path"], False, HTML(title)) for subfolder in subfolders: render_tree_folder(subfolder, js_func) html.end_foldable_container()

8 years, 8 months

Updated bug entries #2422

by Mathias Kettner

Module: check_mk Branch: master Commit: ca90f53b904109e87a8b4d0a00495a00f20c5a58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca90f53b904109… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:38:28 2016 +0100 Updated bug entries #2422 --- .bugs/2422 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/2422 b/.bugs/2422 index e2c168f..571d837 100644 --- a/.bugs/2422 +++ b/.bugs/2422 @@ -1,10 +1,14 @@ Title: Discovery failed: No such file or directory: '/omd/sites/heute/var/check_mk/persisted/heute' Component: core -State: open +Class: bug +State: works4me Date: 2016-02-24 15:51:18 Targetversion: 1.2.8 -Class: bug Discovery failed: Exception in check plugin '3ware_disks': [Errno 2] No such file or directory: '/omd/sites/heute/var/check_mk/persisted/heute' Reason unknown. The site was freshly started after a reboot of the system. Maybe this was a race condition due to an empty tmpfs. + +2016-03-21 10:38:26: changed state open -> works4me +There are only two place where this directory is touched. Both look +clean in current code.

8 years, 8 months

Updated bug entries #0861

by Mathias Kettner

Module: check_mk Branch: master Commit: 708b7228b9e4d8f935c723357600cd0070921cfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=708b7228b9e4d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 10:32:18 2016 +0100 Updated bug entries #0861 --- .bugs/861 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/861 b/.bugs/861 index 5bd6adf..3f19877 100644 --- a/.bugs/861 +++ b/.bugs/861 @@ -1,9 +1,9 @@ Title: Reschedule Checks only affects some services from the list Component: checks -State: open +Class: bug +State: works4me Date: 2016-02-09 15:31:09 Targetversion: 1.2.8 -Class: bug Reschedule active checks like HW/SW Inventory doesn't work at all. If you have for example 50 Services, only 12 where done. So you have to do it @@ -12,3 +12,7 @@ multiple times until all checks are triggered. mk: Maybe this could be the known problem that the CMC ignores all but the first command if more commands are sent via Livestatus in one write(). + +2016-03-21 10:32:16: changed state open -> works4me +Is probably the same problem as we had. Only first command was +executed.

8 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016