Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64329 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cdd00eddb74db951df19c4e62b71f5aea5516f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cdd00eddb74db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:33:22 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed handling of validation errors in cascading dropdown fields

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 082fcff265bd0ce81da87d2734d806d0663f0842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082fcff265bd0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:31:42 2012 +0200 FIX: Fixed handling of validation errors in cascading dropdown fields --- ChangeLog | 1 + web/htdocs/valuespec.py | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55fba84..b726bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ is valid on the replication slaves * FIX: implement locking in order to prevent data corruption on concurrent changes + * FIX: Fixed handling of validation errors in cascading dropdown fields Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3898041..2d90ff5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1,4 +1,4 @@ -#!/usr/bin/python + # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | @@ -812,25 +812,30 @@ class CascadingDropdown(ValueSpec): def_val = str(nr) vp = varprefix + "_sel" - onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices)) + onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(self._choices)) if self._sorted: html.select(vp, options, def_val, onchange=onchange) else: html.sorted_select(vp, options, def_val, onchange=onchange) + cur_val = html.var(vp) + html.write(self._html_separator) for nr, (val, title, vs) in enumerate(self._choices): if vs: vp = varprefix + "_%d" % nr - if value == val or ( - type(value) == tuple and value[0] == val): - def_val = value[1] + if value == val \ + or (type(value) == tuple and value[0] == val): + def_val_2 = value[1] + disp = "" + elif cur_val == str(nr): + def_val_2 = vs.default_value() disp = "" else: - def_val = vs.default_value() + def_val_2 = vs.default_value() disp = "none" html.write('<span id="%s_%s_sub" style="display: %s">' % (varprefix, nr, disp)) - vs.render_input(vp, def_val) + vs.render_input(vp, def_val_2) html.write('</span>') def value_to_text(self, value):

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0755

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e540969e2ae9364b8bae5da386207ba1564578d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e540969e2ae936… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:21:01 2012 +0200 Updated bug entries #0755 --- .bugs/755 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/755 b/.bugs/755 index f799cee..ec42e3b 100644 --- a/.bugs/755 +++ b/.bugs/755 @@ -1,9 +1,9 @@ Title: Implement locking in WATO Component: wato -State: open +Class: bug +State: done Date: 2012-05-24 19:49:08 Targetversion: 1.2.0 -Class: bug We need to prevent multiple users using WATO at the same time getting into conflict. This should be done in the following way: @@ -19,3 +19,6 @@ getting into conflict. This should be done in the following way: [3] Activating foreign changes will need a special permission. Still people need to make sure that the use personalized logins. + +2012-05-25 10:21:00: changed state open -> done +Implemented as described.

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1bd1f7de23dbaf4f2b9eca83ce3c964fb860786f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bd1f7de23dbaf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:16:54 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: WATO: keep track of foreign changes when activating

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd453399eea0576a6c6ebb11302915a03d6afb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd453399eea057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 10:08:22 2012 +0200 WATO: keep track of foreign changes when activating --- ChangeLog | 3 + web/htdocs/images/icon_foreign_changes.png | Bin 0 -> 3259 bytes web/htdocs/pages.css | 2 +- web/htdocs/wato.css | 40 ++++++++++-------- web/htdocs/wato.py | 64 +++++++++++++++++++++++++--- 5 files changed, 83 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55fba84..5c180ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,9 @@ is valid on the replication slaves * FIX: implement locking in order to prevent data corruption on concurrent changes + * Keep track of changes made by other users before activating changes, + let user confirm this, new permission can be used to prevent a user + from activating foreign changes. Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/images/icon_foreign_changes.png b/web/htdocs/images/icon_foreign_changes.png new file mode 100644 index 0000000..b11a7b6 Binary files /dev/null and b/web/htdocs/images/icon_foreign_changes.png differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index b9559b3..5abaa0e 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -467,7 +467,7 @@ table.form img.toggleheader { height: 20px; cursor: auto; padding-right: 5px; - vertical-align:middle; + vertical-align: middle; } table.form img.toggleheader.hover { cursor: pointer; diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 8ddadd4..e2a9a21 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -134,33 +134,37 @@ Boston, MA 02110-1301 USA. font-weight: bold; } -.wato table.auditlog { - background-image: url("images/form_background.png"); - background-repeat: repeat; - border-collapse: collapse; - margin-top: 3px; - margin-bottom: 1em; - width: 100%; +.wato table.auditlog td.nobreak { + white-space: nowrap; } -.wato table.pending { - background-color: #fff; +.wato table.auditlog img { + width: 14px; + height: 14px; + margin: 0 5px 0 0; + padding: 0; + border-style; none; + float: left; } -.wato table.auditlog td { - border: 1px solid #fff; - padding: 2px 6px; +.wato table.foreignchanges { + border-spacing: 3px; + margin-left: 20px; + margin-top: 5px; + margin-bottom: 5px; } - -.wato table.auditlog td.nobreak { - white-space: nowrap; +.wato table.foreignchanges td { + padding: 2px 8px; + background-color: #ff0; + margin: 2px; } -.wato .pending td { - border: 1px solid #444; - padding: 2px 6px; +.wato img.foreignchanges { + float: left; + margin-right: 10px; } + .wato td.dns { color: #666; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3d0d2fc..68d395b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3259,6 +3259,32 @@ def mode_changelog(phase): [ '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hn)]), hn) for hn in defective_hosts.keys() ])) + # If there are changes by other users, we need a confirmation + transaction_already_checked = False + changes = foreign_changes() + if changes: + table = "<table class=foreignchanges>" + for user_id, count in changes.items(): + table += '<tr><td>%s: </td><td>%d %s</td></tr>' % \ + (config.alias_of_user(user_id), count, _("changes")) + table += '</table>' + c = wato_confirm(_("Confirm activating foreign changes"), + '<img class=foreignchanges src="images/icon_foreign_changes.png">' + + _("There are some changes made by you collegues that you will " + "activate if you proceed:") + table + + _("Do you really want to proceed?")) + if c == False: + return "" + elif not c: + return None + transaction_already_checked = True + + if changes and not config.may("wato.activateforeign"): + raise MKAuthException( + _("Sorry, you are not allowed to activate " + "changes of other users.")) + + # Give hooks chance to do some pre-activation things (and maybe stop # the activation) try: @@ -3274,7 +3300,7 @@ def mode_changelog(phase): config.need_permission("wato.activate") site_id = html.var("_site") action = html.var("_siteaction") - if html.check_transaction(): + if transaction_already_checked or html.check_transaction(): try: # If the site has no pending changes but just needs restart, # the button text is just "Restart". We do a sync anyway. This @@ -3301,7 +3327,7 @@ def mode_changelog(phase): raise raise MKUserError(None, _("Remote command on site %s failed: <pre>%s</pre>") % (site_id, e)) - elif html.check_transaction(): + elif transaction_already_checked or html.check_transaction(): config.need_permission("wato.activate") create_snapshot() if is_distributed(): @@ -3502,7 +3528,16 @@ def mode_changelog(phase): if len(pending) == 0: html.write("<div class=info>" + _("There are no pending changes.") + "</div>") else: - render_audit_log(pending, "pending") + render_audit_log(pending, "pending", hilite_others=True) + +# Determine if other users have made pending changes +def foreign_changes(): + changes = {} + for t, linkinfo, user, action, text in parse_audit_log("pending"): + if user != config.user_id: + changes.setdefault(user, 0) + changes[user] += 1 + return changes def log_entry(linkinfo, action, message, logfilename): @@ -3737,7 +3772,7 @@ def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('</div>') -def render_audit_log(log, what, with_filename = False): +def render_audit_log(log, what, with_filename = False, hilite_others=False): htmlcode = '' if what == 'audit': log, times = paged_log(log) @@ -3765,12 +3800,18 @@ def render_audit_log(log, what, with_filename = False): even = "even" for t, linkinfo, user, action, text in log: even = even == "even" and "odd" or "even" - htmlcode += '<tr class="%s0">' % even + hilite = hilite_others and config.user_id != user + htmlcode += '<tr class="data %s%d">' % (even, hilite and 2 or 0) htmlcode += '<td class=nobreak>%s</td>' % render_linkinfo(linkinfo) htmlcode += '<td class=nobreak>%s</td>' % fmt_date(float(t)) htmlcode += '<td class=nobreak>%s</td>' % fmt_time(float(t)) - htmlcode += '<td>%s</td><td width="100%%">%s</td></tr>\n' % \ - (user, text) + htmlcode += '<td class=nobreak>' + if hilite: + htmlcode += '<img class=icon src="images/icon_foreign_changes.png" title="%s">' \ + % _("This change has been made by another user") + htmlcode += user + '</td>' + + htmlcode += '</td><td width="100%%">%s</td></tr>\n' % text htmlcode += "</table>" if what == 'audit': @@ -11288,6 +11329,15 @@ def load_plugins(): "current configuration (and thus rewriting the " "monitoring configuration and restart the monitoring daemon.)"), [ "admin", "user", ]) + + config.declare_permission("wato.activateforeign", + _("Activate Foreign Changes"), + _("When several users work in parallel with WATO then " + "several pending changes of different users might pile up " + "before changes are activate. Only with this permission " + "a user will be allowed to activate the current configuration " + "if this situation appears."), + [ "admin", ]) config.declare_permission("wato.auditlog", _("Audit log"),

12 years, 4 months

Check_MK Git: check_mk: Fixed styling error in quicksearch dropdown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45d723630cfe4938f3dfe62d64d865fc63af372a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d723630cfe49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:01:26 2012 +0200 Fixed styling error in quicksearch dropdown --- web/plugins/sidebar/search.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index bc6ca6a..94d7b53 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -130,8 +130,8 @@ sidebar_snapins["search"] = { #mk_search_results { position: relative; + float:left; border: 1px solid white; - top: 1px; background-color: #DFDFDF; color: #000; font-size: 80%;

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0752, #0685, #0749

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83004cddc0117c43d7d056cf76f9a3d81d30a2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83004cddc0117c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:01:13 2012 +0200 Updated bug entries #0752, #0685, #0749 --- .bugs/685 | 10 ++++++++-- .bugs/749 | 8 ++++++-- .bugs/752 | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.bugs/685 b/.bugs/685 index 2d39456..d15c870 100644 --- a/.bugs/685 +++ b/.bugs/685 @@ -1,9 +1,9 @@ Title: Logout or password change and relogin leads to side.py Component: multisite -State: open +Class: bug +State: works4me Date: 2012-05-10 10:33:12 Targetversion: 1.2.0 -Class: bug When logging out and in again - or when you are logged out due to a password change - then you are not logged into the main @@ -11,3 +11,9 @@ frameset but into side.py (or whatever frame had done the logout int the first place). Happens with cookie based authentication. + +2012-05-25 08:48:10: changed state open -> works4me +I added some changes several days ago which might have fixed the problem. +I tested this yesterday and was unable to reproduce these problems. So if +you experience any problems please provide a reproducable way to get this +error. diff --git a/.bugs/749 b/.bugs/749 index e6d6107..1501547 100644 --- a/.bugs/749 +++ b/.bugs/749 @@ -1,9 +1,9 @@ Title: Multisite setup with cookie based login garbles PNP webservice Component: multisite -State: open +Class: bug +State: done Date: 2012-05-14 19:02:05 Targetversion: 1.2.0 -Class: bug If you use cookie based authentication and a multisite setup and if the auth.secret is not replicated - so that your login does not automatically @@ -17,3 +17,7 @@ remote PNP graph embedded), then Chrome will go into an endless loop again and again loading the page. This must have to do something with the PNP webservice returning HTML code that will somehow redirect to the login page. + +2012-05-25 09:41:47: changed state open -> done +Sent patch to be integrated into pnp to fix the problem. PNP module won't +send any Location-Redirects when calling graph/json/popup controllers. diff --git a/.bugs/752 b/.bugs/752 index 6eff41d..ae42239 100644 --- a/.bugs/752 +++ b/.bugs/752 @@ -3,7 +3,7 @@ Component: multisite State: open Date: 2012-05-20 15:58:01 Targetversion: 1.2.0 -Class: bug +Class: nastiness Only the right half of the actual data is being displayed. Maybe Opera has problems with negative values somewhere.

12 years, 4 months

Check_MK Git: check_mk: Fix color of links on background

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 828958601457cbf56904fb153cfe21c53dcccc46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=828958601457cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 09:21:45 2012 +0200 Fix color of links on background --- web/htdocs/check_mk.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index e5a5a51..c9b4ca2 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -63,6 +63,10 @@ body { color: white; } +body a { + color: white; +} + /* Default font size for the complete Multisite GUI */ button, input, td, th, select, textarea { font-size: 9pt;

12 years, 4 months

Check_MK Git: check_mk: WATO: implement locking for alle write processes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 339106bf7f1157a41f701d7a2aea037934336ea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339106bf7f1157… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 09:14:57 2012 +0200 WATO: implement locking for alle write processes --- ChangeLog | 2 ++ web/htdocs/index.py | 2 ++ web/htdocs/lib.py | 2 +- web/htdocs/wato.py | 9 +++++++++ 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6effb00..55fba84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ * FIX: D/WATO: mark site dirty after host deletion * FIX: D/WATO: replicate auth.secret, so that login on one site also is valid on the replication slaves + * FIX: implement locking in order to prevent data corruption on + concurrent changes Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 26e991e..83adfbd 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -379,6 +379,8 @@ def handler(req, profiling = True): response_code = apache.HTTP_BAD_GATEWAY except apache.SERVER_RETURN: + release_all_locks() + html.live = None raise except Exception, e: diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index fa5a58f..f1298fc 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -238,7 +238,7 @@ def aquire_lock(path): g_locked_paths.append(path) def release_all_locks(): - global g_aquired_locks + global g_aquired_locks, g_locked_paths for fd in g_aquired_locks: os.close(fd) g_aquired_locks = [] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a602e75..3d0d2fc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -214,6 +214,11 @@ def page_handler(): current_mode = html.var("mode") or "main" + # If we do an action, we aquire an exclusive lock on the complete + # WATO. + if html.is_transaction(): + lock_exclusive() + try: # Make information about current folder and hosts available # To be able to perform a "factory reset" or a snapshot restore @@ -378,6 +383,10 @@ def need_sidebar_reload(): global g_need_sidebar_reload g_need_sidebar_reload = id(html) +def lock_exclusive(): + aquire_lock(defaults.default_config_dir + "/multisite.mk") + + #. # .-Load/Save------------------------------------------------------------. # | _ _ ______ |

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b4c163751a1e1dc658fa2caf13c11006403957c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4c163751a1e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 09:17:25 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits