Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: FIX: better error message if not logged into site during remote automation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bcd22c8272abc911dbc3e2023518c421ea649967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd22c8272abc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:52:26 2012 +0200 FIX: better error message if not logged into site during remote automation --- ChangeLog | 5 ++++- web/htdocs/wato.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d329f9..974a60e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ 1.2.0b4: WATO: * ps and ps.perf configurable via WATO now (without inventory) - * FIX: honor folder-permissions when creating, deleting and modifiying rules + * FIX: honor folder-permissions when creating, deleting + and modifiying rules * FIX: detect non-local site even if unix: is being used + * FIX: better error message if not logged into site during + action that needs remote access Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 01923e8..5bbec4e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6675,6 +6675,10 @@ def get_url(url, insecure, user=None, password=None, params = ''): return response_body def check_mk_remote_automation(siteid, command, args, indata): + site = config.site(siteid) + if "secret" not in site: + raise MKGeneralException(_("Cannot access site %s - you are not logged in.") + % site.get("alias", siteid)) # If the site is not up-to-date, synchronize it first. repstatus = load_replication_status() if repstatus.get(siteid, {}).get("need_sync"):

12 years, 4 months

Check_MK Git: check_mk: FIX: convert more buttons to new graphical style

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89552cfc01d9a8b6c548c81306d0b371805e9477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89552cfc01d9a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:47:57 2012 +0200 FIX: convert more buttons to new graphical style --- ChangeLog | 1 + web/htdocs/htmllib.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 917f731..1d329f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) + * FIX: convert more buttons to new graphical style Mobile GUI: * FIX: commands can be executed again diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 30add17..1482521 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -176,6 +176,7 @@ class html: self.buffering = True self.transformations = [] self.final_javascript_code = "" + self.auto_id = 0 def set_buffering(self, b): self.buffering = b @@ -186,6 +187,10 @@ class html: def pop_transformation(self): del self.transformations[-1] + def some_id(self): + self.auto_id += 1 + return "id_%d" % self.auto_id + def plugin_stylesheets(self): global plugin_stylesheets try: @@ -343,8 +348,9 @@ class html: def buttonlink(self, href, text, add_transid=False, obj_id='', style='', title='', disabled=''): if add_transid: href += "&_transid=%s" % self.fresh_transid() - if obj_id: - obj_id = ' id=%s' % obj_id + if not obj_id: + obj_id = self.some_id() + obj_id = ' id=%s' % obj_id if style: style = ' style="%s"' % style if title: @@ -352,9 +358,12 @@ class html: if disabled: title = ' disabled="%s"' % disabled + if not self.mobile: + self.write('<label for="%s" class=image_button>' % obj_id) self.write('<input%s%s%s%s value="%s" class=buttonlink type=button onclick="location.href=\'%s\'">' % \ (obj_id, style, title, disabled, text, href)) - # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) + if not self.mobile: + self.write('</label>') def icon(self, help, icon): self.write('<img align=absmiddle class=icon title="%s" src="images/icon_%s.png">' % (

12 years, 4 months

Check_MK Git: check_mk: FIX: detect non-local site even if unix: is being used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dd6f24507a6a815f9a2bbf6bc3958e3c7a86ab1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dd6f24507a6a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:47:33 2012 +0200 FIX: detect non-local site even if unix: is being used --- ChangeLog | 1 + web/htdocs/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fc7250..917f731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ WATO: * ps and ps.perf configurable via WATO now (without inventory) * FIX: honor folder-permissions when creating, deleting and modifiying rules + * FIX: detect non-local site even if unix: is being used Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index db8955b..39767b7 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -441,7 +441,7 @@ def site(name): def site_is_local(name): s = sites.get(name, {}) sock = s.get("socket") - return not sock or sock.startswith("unix:") + return not sock or sock == defaults.livestatus_unix_socket def is_multisite(): if len(sites) > 1:

12 years, 4 months

Check_MK Git: check_mk: Use label for checkbox in WATO site configuration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a34d5b65175a3de94b6cb8db73d4a4dbbba17a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a34d5b65175a3d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:28:55 2012 +0200 Use label for checkbox in WATO site configuration --- web/htdocs/wato.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 49cb264..01923e8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6493,8 +6493,7 @@ def mode_edit_site(phase): "the connection to the remote sites. This brings a great speed up in high-latency " "situations but locks a number of threads in the Livestatus module of the target site. ")) html.write("</td><td class=content>") - html.checkbox("persist", site.get("persist", False)) - html.write(_("Use persistent connections")) + html.checkbox("persist", site.get("persist", False), label=_("Use persistent connections")) html.write("</td></tr>") # URL-Prefix

12 years, 4 months

Check_MK Git: check_mk: Minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b831e7a1cc1096198c2969bf5be61dc73ae493a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b831e7a1cc109… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 14:10:27 2012 +0200 Minor layout fixes --- web/htdocs/check_mk.css | 7 ++++--- web/htdocs/htmllib.py | 5 +++-- web/htdocs/login.css | 1 + web/htdocs/login.py | 4 ++-- web/htdocs/pages.css | 3 --- web/htdocs/wato.css | 3 ++- web/plugins/wato/check_mk_configuration.py | 1 + 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a0c5c43..047873b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -67,14 +67,15 @@ input, select, textarea { border: 1px #73767A solid; outline-style: none; outline-width: medium; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; background-color: #fff; font-family: arial, helvetica, sans-serif; vertical-align: middle; } +input[type=text] { + box-shadow: 0.5px 0.5px 0.8px 0 #888 inset; +} + select { padding: 1px 3px; } diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7604c72..30add17 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -451,9 +451,10 @@ class html: default_value = "" addprops = "" add_style = "" - if "size" in args: + if "size" in args and args["size"]: addprops += " size=%d" % (args["size"] + 1) - add_style = "width: %dex; " % args["size"] + if "width:" not in args.get("style", ""): + add_style = "width: %d.5ex; " % args["size"] if "type" in args: mytype = args["type"] diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 545c9e8..796700d 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -114,6 +114,7 @@ label { padding: 3px 5px 3px 5px; background-image: url("images/login_input_normal.png"); background-repeat: no-repeat; + box-shadow: none; } .inputerror #input_user, .inputerror #input_pass { diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0d7b2d1..0035894 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -243,9 +243,9 @@ def normal_login_page(called_directly = True): html.hidden_field('_login', '1') html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) html.write("<label id=label_user class=legend for=_username>%s:</label><br />" % _('Username')) - html.text_input("_username", size = 50, id="input_user") + html.text_input("_username", id="input_user") html.write("<label id=label_pass class=legend for=_password>%s:</label><br />" % _('Password')) - html.password_input("_password", size = 50, id="input_pass") + html.password_input("_password", id="input_pass", size=None) if html.has_user_errors(): html.write('<div id=login_error>') diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3b0816d..d861b05 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -474,9 +474,6 @@ input.tab#results, input.tabactive#results { background-color: #fe6; } /* input elements in forms */ -table.form input.text { -} - table.form input.number { text-align: right; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0eae8ea..f738e39 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,9 +45,10 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { - box-shadow: 0 0 3px #334488; + /* box-shadow: 0 0 3px #334488; */ width: auto; } + .wato table.data th { -moz-border-radius: 0px; background-color: #508aa1; diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5356642..826ed4d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -149,6 +149,7 @@ register_configvar(group, help = _("When you point your browser to the Multisite GUI, usually the dashboard " "is shown in the main (right) frame. You can replace this with any other " "URL you like here."), + size = 80, default_value = "dashboard.py"), domain = "multisite")

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0697

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f611738373d80b946c1f1408f95414eb5254a74b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f611738373d80b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:59:24 2012 +0200 Updated bug entries #0697 --- .bugs/697 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/697 b/.bugs/697 index 141900d..a75d12a 100644 --- a/.bugs/697 +++ b/.bugs/697 @@ -1,9 +1,12 @@ Title: WATO host/folders - <form> must not be nested Component: wato -State: open +Class: bug +State: done Date: 2012-04-25 12:47:08 Targetversion: 1.2.0 -Class: bug It is not allowed to have nested forms. The search host form must be moved outside the host table form. + +2012-05-06 12:59:22: changed state open -> done +Fixed a couple of days ago.

12 years, 4 months

Check_MK Git: check_mk: Make width of text inputs more precise

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ded74d96db78e5c5d9334991172231404b0f0e07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ded74d96db78e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:58:05 2012 +0200 Make width of text inputs more precise --- web/htdocs/htmllib.py | 7 ++++++- web/htdocs/wato.css | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2d719f4..7604c72 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -450,8 +450,11 @@ class html: if default_value == None: default_value = "" addprops = "" + add_style = "" if "size" in args: addprops += " size=%d" % (args["size"] + 1) + add_style = "width: %dex; " % args["size"] + if "type" in args: mytype = args["type"] else: @@ -459,7 +462,9 @@ class html: if "autocomplete" in args: addprops += " autocomplete=\"%s\"" % args["autocomplete"] if args.get("style"): - addprops += " style=\"%s\"" % args["style"] + addprops += " style=\"%s%s\"" % (add_style, args["style"]) + elif add_style: + addprops += " style=\"%s\"" % add_style value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 156946b..0eae8ea 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -616,7 +616,7 @@ table.validationerror img { /* Special styling for Timeperiods editor */ .wato table.timeperiod td.name { - width: 230px; + width: 210px; } form#form_timeperiod td.vlof_content input.text:first-child {

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0695

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d6f0853da312fe25a3d459ad36e6dcc4df463a19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6f0853da312fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:50:55 2012 +0200 Updated bug entries #0695 --- .bugs/695 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/695 b/.bugs/695 index 5f13780..8be30d3 100644 --- a/.bugs/695 +++ b/.bugs/695 @@ -1,9 +1,9 @@ Title: Configuring timeperiod exceptions is buggy Component: wato -State: open +Class: bug +State: done Date: 2012-04-25 12:34:06 Targetversion: 1.2.0 -Class: bug - When creating one timeperiod exception it is ok. When changing the definition in the first field WATO creates a second exception entry from it but leaves the old. @@ -13,3 +13,6 @@ Class: bug - On user errors the form focuses the alias field all the time. Possible fix: Migrate to valuespecs. + +2012-05-06 12:50:53: changed state open -> done +Reimplemented using ValueSpecs.

12 years, 4 months

Check_MK Git: check_mk: Fixed position of lock icon on folder

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b087de690495fe2a3cb1d36ea1edce318855242b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b087de690495fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:46:30 2012 +0200 Fixed position of lock icon on folder --- web/htdocs/wato.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 511bc80..156946b 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -384,7 +384,7 @@ table.validationerror img { .wato div.floatfolder .autherr { position: absolute; top: 20px; - right: 62px; + right: 23px; } .wato div.floatfolder .edit {

12 years, 4 months

Check_MK Git: check_mk: honor folder-permissions when creating, deleting and modifiying rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd2ff8bbacc78a5bbff8b6f2978177fb66d404ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd2ff8bbacc78a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:46:13 2012 +0200 honor folder-permissions when creating, deleting and modifiying rules --- .bugs/612 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.bugs/612 b/.bugs/612 index d02182d..b990220 100644 --- a/.bugs/612 +++ b/.bugs/612 @@ -1,9 +1,12 @@ Title: Wato: Berechitungen bei Rulsets Component: wato -State: open +Class: bug +State: done Date: 2012-04-30 17:05:42 Targetversion: 1.1.12 -Class: bug Wird die berechtigung auf eines Ordners / Main Directory auf einen Contact Group eingeschränkt, können user auch ohne in der Gruppe zu sein dort Regel anlegen und löschen + +2012-05-06 12:45:58: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index ef5280b..7fc7250 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0b4: WATO: * ps and ps.perf configurable via WATO now (without inventory) + * FIX: honor folder-permissions when creating, deleting and modifiying rules Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1f3892c..49cb264 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9319,6 +9319,7 @@ def mode_edit_ruleset(phase): elif phase == "action": # Folder for the rule actions is defined by _folder rule_folder = g_folders[html.var("_folder", html.var("folder"))] + check_folder_permissions(rule_folder, "write", True) rulesets = load_rulesets(rule_folder) rules = rulesets.get(varname, []) @@ -9865,6 +9866,10 @@ def mode_edit_rule(phase): tag_specs, host_list, item_list = get_rule_conditions(rulespec) new_rule_folder = g_folders[html.var("new_rule_folder")] + # Check permissions on folders + check_folder_permissions(folder, "write", True) + check_folder_permissions(new_rule_folder, "write", True) + # VALUE if valuespec: value = get_edited_value(valuespec)

12 years, 4 months

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012