Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

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: 9a65d1ca69292cc1f0afb2249f2f705d67a843f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a65d1ca69292c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 15:48:07 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: FIX: Fixed login redirection problem after relogging

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d034d6bed5dd860817276fe772648249d55ac96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d034d6bed5dd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 15:47:37 2012 +0200 FIX: Fixed login redirection problem after relogging --- ChangeLog | 1 + web/htdocs/login.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37ebee1..156f9b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ are preferred over *.py if existing * View Editor: Fixed jump to top of the page after moving painters during editing views + * FIX: Fixed login redirection problem after relogging Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust diff --git a/web/htdocs/login.py b/web/htdocs/login.py index ba371f2..0d7b2d1 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -224,16 +224,17 @@ def normal_login_page(called_directly = True): if not origtarget and not html.req.myfile == 'login': origtarget = html.makeuri([]) + # Never allow the login page to be opened in a frameset. Redirect top page to login page. + # This will result in a full screen login page. + html.javascript('''if(top != self) { + window.top.location.href = location; +}''') + # When someone calls the login page directly and is already authed redirect to main page if html.req.myfile == 'login' and check_auth() != '': html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') return - # Never allow the login page to be opened in a frameset. Redirect top page to login page - html.javascript('''if(top != self) { - window.top.location.href = location; -}''') - html.write("<div id=login>") html.write("<img id=login_window src=\"images/login_window.png\">") html.write("<div id=version>%s</div>" % defaults.check_mk_version)

12 years, 5 months

Check_MK Git: check_mk: FIX: Made logwatch parsing mechanism a little more robust

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bda40546106084c8cce533582353b5ab0731856a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda40546106084… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 10:58:56 2012 +0000 FIX: Made logwatch parsing mechanism a little more robust (Had problems with emtpy sections from windows agent) --- ChangeLog | 4 ++++ checks/logwatch | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d68f4a9..37ebee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ * View Editor: Fixed jump to top of the page after moving painters during editing views + Checks & Agents: + * FIX: Made logwatch parsing mechanism a little more robust + (Had problems with emtpy sections from windows agent) + 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time diff --git a/checks/logwatch b/checks/logwatch index 7714d87..43d3fca 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -123,6 +123,7 @@ def logwatch_precompile(hostname, item, _unused): continue params.append((level, pattern)) + return params @@ -262,6 +263,7 @@ def check_logwatch(item, params, info): block_header = None block_worst = 0 block_lines = [] + block_last_worst_line = '' def finish_block(header, block_worst, block_lines): start = ' '.join(header.split(' ')[0:2]) @@ -270,6 +272,9 @@ def check_logwatch(item, params, info): if os.path.exists(logfile): for line in file(logfile): line = line.rstrip('\n') + # Skip empty lines + if not line: + continue if line.startswith('<<<') and line.endswith('>>>'): if block_header: # The section is finished here. Add it to the list of reclassified lines

12 years, 5 months

Check_MK Git: check_mk: View Editor: Fixed jump to top of the page after moving painters during editing views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4df0a2481717621a70afae7b8419d2d780b326b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4df0a248171762… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 12:17:58 2012 +0200 View Editor: Fixed jump to top of the page after moving painters during editing views --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/htdocs/views.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00fac6d..d68f4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Multisite: * FIX: allow web plugins to be byte compiled (*.pyc). Those are preferred over *.py if existing + * View Editor: Fixed jump to top of the page after moving painters during + editing views 1.2.0b2: Core: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4163ec0..2a3b036 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -365,7 +365,7 @@ class html: if onclick: onclick = 'onclick="%s" ' % onclick - url = "#" + url = "javascript:void(0)" if style: style = 'style="%s" ' % style diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d4f48af..0bd61ea 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -750,13 +750,13 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): # Buttons for deleting and moving around html.write('<td class="cebuttons" rowspan=5>') - html.icon_button("#", _("Delete this column"), "delete", onclick="delete_view_column(this);") + html.icon_button("javascript:void(0)", _("Delete this column"), "delete", onclick="delete_view_column(this);") display = n == 1 and 'display:none;' or '' - html.icon_button("#", _("Move this column up"), "up", onclick="move_column_up(this);", + html.icon_button("javascript:void(0)", _("Move this column up"), "up", onclick="move_column_up(this);", id="%sup_%d" % (var_prefix, n), style=display) display = n == maxnum - 1 and 'display:none;' or '' - html.icon_button("#", _("Move this column down"), "down", onclick="move_column_down(this);", + html.icon_button("javascript:void(0)", _("Move this column down"), "down", onclick="move_column_down(this);", id="%sdown_%d" % (var_prefix, n), style=display) html.write('</td>')

12 years, 5 months

Check_MK Git: check_mk: Multisite: allow byte compiled *.pyc files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73b24b13fc5a813db268ef4c9dae7cdabe6416fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b24b13fc5a81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 15:04:35 2012 +0200 Multisite: allow byte compiled *.pyc files --- ChangeLog | 5 +++++ web/htdocs/lib.py | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 522e9de..00fac6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.2.0b3: + Multisite: + * FIX: allow web plugins to be byte compiled (*.pyc). Those + are preferred over *.py if existing + 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 0f07142..4ad5246 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, defaults, pprint, os, errno, gettext, __builtin__ +import grp, defaults, pprint, os, errno, gettext, marshal, __builtin__ nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } @@ -124,8 +124,14 @@ def load_web_plugins(forwhat, globalvars): fns = os.listdir(plugins_path) fns.sort() for fn in fns: + file_path = plugins_path + "/" + fn if fn.endswith(".py"): - execfile(plugins_path + "/" + fn, globalvars) + if not os.path.exists(file_path + "c"): + execfile(file_path, globalvars) + elif fn.endswith(".pyc"): + code_bytes = file(file_path).read()[8:] + code = marshal.loads(code_bytes) + exec code in globalvars if defaults.omd_root: local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/" + forwhat

12 years, 5 months

Check_MK Git: check_mk: New hook for pre-distribution

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9101125a7588a34bb383c88b4fbf18e285dd4569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9101125a7588a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 12:29:07 2012 +0200 New hook for pre-distribution --- web/htdocs/wato.py | 82 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 28 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a91f7a5..f9e0c8f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2792,13 +2792,24 @@ def mode_changelog(phase): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") elif phase == "action": + + # Let host validators do their work defective_hosts = validate_all_hosts([], force_all = True) if defective_hosts: raise MKUserError(None, _("You cannot activate changes while some hosts have " "an invalid configuration: ") + ", ".join( [ '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hn)]), hn) for hn in defective_hosts.keys() ])) - + + # Give hooks chance to do some pre-activation things (and maybe stop + # the activation) + try: + call_hook_pre_distribute_changes() + except Exception, e: + if config.debug: + raise + else: + raise MKUserError(None, "<h3>%s</h3>%s" % (_("Cannot activate changes"), e)) sitestatus_do_async_replication = False # see below if html.has_var("_siteaction"): @@ -3381,7 +3392,14 @@ def check_mk_local_automation(command, args=[], indata=""): (html.apache_user(), sudoline)) if command == 'restart': - call_hook_pre_activate_changes() + try: + call_hook_pre_activate_changes() + except Exception, e: + if config.debug: + raise + html.show_error("<h3>Cannot activate changes</h3>%s" % e) + return + if config.debug: log_audit(None, "automation", "Automation: %s" % " ".join(cmd)) @@ -10361,11 +10379,15 @@ def call_hooks(name, *args): try: hk(*args) except Exception, e: - import traceback, StringIO - txt = StringIO.StringIO() - t, v, tb = sys.exc_info() - traceback.print_exception(t, v, tb, None, txt) - html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3><pre>%s</pre>" % (name, n, e, txt.getvalue())) + if config.debug: + import traceback, StringIO + txt = StringIO.StringIO() + t, v, tb = sys.exc_info() + traceback.print_exception(t, v, tb, None, txt) + html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3><pre>%s</pre>" % (name, n, e, txt.getvalue())) + else: + raise + def call_hook_hosts_changed(folder): if "hosts-changed" in g_hooks: @@ -10385,32 +10407,36 @@ def call_hook_folder_deleted(folder): if 'folder-deleted' in g_hooks: call_hooks("folder-deleted", folder) -def call_hook_pre_activate_changes(): - """ - This hook is executed when one applies the pending configuration changes - from wato but BEFORE the nagios restart is executed. - - It can be used to create custom input files for nagios/Check_MK. +# This hook is executed before distributing changes to the remote +# sites (in distributed WATO) or before activating them (in single-site +# WATO). If the hook raises an exception, then the distribution and +# activation is aborted. +def call_hook_pre_distribute_changes(): + if hook_registered('pre-distribute-changes'): + call_hooks("pre-distribute-changes", collect_hosts(g_root_folder)) - The registered hooks are called with a dictionary as parameter which - holds all available with the hostnames as keys and the attributes of - the hosts as values. - """ +# This hook is executed when one applies the pending configuration changes +# from wato but BEFORE the nagios restart is executed. +# +# It can be used to create custom input files for nagios/Check_MK. +# +# The registered hooks are called with a dictionary as parameter which +# holds all available with the hostnames as keys and the attributes of +# the hosts as values. +def call_hook_pre_activate_changes(): if hook_registered('pre-activate-changes'): call_hooks("pre-activate-changes", collect_hosts(g_root_folder)) +# This hook is executed when one applies the pending configuration changes +# from wato. +# +# But it is only excecuted when there is at least one function +# registered for this host. +# +# The registered hooks are called with a dictionary as parameter which +# holds all available with the hostnames as keys and the attributes of +# the hosts as values. def call_hook_activate_changes(): - """ - This hook is executed when one applies the pending configuration changes - from wato. - - But it is only excecuted when there is at least one function - registered for this host. - - The registered hooks are called with a dictionary as parameter which - holds all available with the hostnames as keys and the attributes of - the hosts as values. - """ if hook_registered('activate-changes'): call_hooks("activate-changes", collect_hosts(g_root_folder))

12 years, 5 months

Check_MK Git: check_mk: Better styling of aux tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 790467fa3a5d83c3d7dd826f82e750d18fb581ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=790467fa3a5d83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 10:22:36 2012 +0200 Better styling of aux tags --- web/htdocs/check_mk.css | 18 ++++++++++++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 8 ++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 225d78a..a86abc5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -220,6 +220,7 @@ b.treeangle.title { ul.treeangle { /* border: 1px solid #4060ff; */ padding-left: 20px; + margin: 8px 0px; } ul.treeangle li { margin: 0px; @@ -389,3 +390,20 @@ table.valuespec_listof td.vlof_content { table.valuespec_listof option[selected] { font-weight: bold; } + +table.listchoice { + cell-spacing: 0px; +} +table.listchoice td span.checkbox { + height: 10px; +} +table.listchoice td { + height: 12px; + padding: 0px; + margin: 0px; +} +table.listchoice td input[type=checkbox] { + margin: 0px; + display: inline-block; + height: 12px; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8d35e87..ca8fd11 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -944,7 +944,7 @@ class ListChoice(ValueSpec): def render_input(self, varprefix, value): self.load_elements() - html.write("<table>") + html.write("<table class=listchoice>") for nr, (key, title) in enumerate(self._elements): if nr % self._columns == 0: if nr > 0: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b960a53..a91f7a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8031,11 +8031,11 @@ def mode_edit_hosttag(phase): size=20), Foldable( - MultiSelect( + ListChoice( title = _("Auxiliary tags"), - help = _("These tags will implicitely added to a host if the " - "user selects this entry in the tag group. Select multiple " - "entries with the <b>Ctrl</b> key."), + # help = _("These tags will implicitely added to a host if the " + # "user selects this entry in the tag group. Select multiple " + # "entries with the <b>Ctrl</b> key."), choices = auxtags)), ],

12 years, 5 months

Check_MK Git: check_mk: Fix order problem in ListOf

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b75f056e744dfac4498f79fd05a386ce0b45a662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b75f056e744dfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 10:06:49 2012 +0200 Fix order problem in ListOf --- ChangeLog | 1 + web/htdocs/valuespec.py | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c3a35..522e9de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ urls to prevent too big security issues * Rule editor: improve sorting of groups and rulesets * FIX: Escaping single quotes in strings when writing auth.php + * FIX: Fix resorting of host tags (was bug in ListOf) Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4ee3078..8d35e87 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -624,15 +624,21 @@ class ListOf(ValueSpec): self._valuespec.value_to_text(v) for v in value]) def from_html_vars(self, varprefix): - value = [] - n = 0 + n = 1 + indexes = {} while True: - indexof = html.var(varprefix + "_indexof_%d" % (n+1)) + indexof = html.var(varprefix + "_indexof_%d" % n) if indexof == None: - break; - value.append(self._valuespec.from_html_vars( - varprefix + "_%d" % int(indexof))) + break + indexes[int(indexof)] = n n += 1 + + value = [] + k = indexes.keys() + k.sort() + for i in k: + val = self._valuespec.from_html_vars(varprefix + "_%d" % indexes[i]) + value.append(val) return value def validate_datatype(self, value, varprefix):

12 years, 5 months

Check_MK Git: check_mk: Better hilight selected auxtags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a5ddfc0a079ab4dca2303b1fa7660ed50b3ca6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a5ddfc0a079ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:54:19 2012 +0200 Better hilight selected auxtags --- web/htdocs/check_mk.css | 3 +++ web/htdocs/valuespec.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 629e77f..225d78a 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -386,3 +386,6 @@ table.valuespec_listof td.vlof_content { background-image: url("images/form_background.png"); background-repeat: repeat; } +table.valuespec_listof option[selected] { + font-weight: bold; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dba3c36..4ee3078 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -980,7 +980,9 @@ class MultiSelect(ListChoice): def render_input(self, varprefix, value): self.load_elements() - html.write("<select multiple name='%s'>" % varprefix) + # background_css_hack = 'onChange="this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor"' + background_css_hack = "" + html.write("<select %s multiple name='%s'>" % (background_css_hack, varprefix)) for nr, (key, title) in enumerate(self._elements): if key in value: sel = " selected"

12 years, 5 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: 638531d833da7524cfb501d3c767f836820c2f75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638531d833da75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:54:21 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits