Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Fix URL parsing: last occurrance of a variable as precedence

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45016930c504dfc65b313e2b3e6d056a2239f851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45016930c504df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 3 14:08:43 2012 +0100 Fix URL parsing: last occurrance of a variable as precedence --- web/htdocs/index.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 7079202..3c75de6 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -69,8 +69,10 @@ def read_get_vars(req): req.listvars[varname].append(value) else: req.listvars[varname] = [ req.vars[varname], value ] - else: - req.vars[varname] = value + # In the single-value-store the last occurrance of a variable + # has precedence. That makes appending variables to the current + # URL simpler. + req.vars[varname] = value def read_cookies(req): req.cookies = Cookie.get_cookies(req)

12 years, 7 months

Check_MK Git: check_mk: Fix timeout bug in check rescheduling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1a6a5092cfe086240c4561abe0673d948099e0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1a6a5092cfe08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 3 14:03:55 2012 +0100 Fix timeout bug in check rescheduling This was in fact a timeout problem in the whole Livestatus API hat had been introduced some weeks ago. --- web/htdocs/actions.py | 3 +-- web/htdocs/livestatus.py | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 20f76dd..9d91020 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -85,7 +85,6 @@ def action_reschedule(): last_check = row[0] if last_check < now: html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) - else: if service == "Check_MK": # Passive services triggered by Check_MK often are updated @@ -97,4 +96,4 @@ def action_reschedule(): except Exception, e: html.live.set_only_sites() - raise MKGeneralException("Cannot reschedule check: %s" % e) + raise MKGeneralException(_("Cannot reschedule check: %s") % e) diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index c5211ce..d498f83 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -246,6 +246,8 @@ class BaseConnection: def receive_data(self, size): result = "" + # Timeout is only honored when connecting + self.socket.settimeout(None) while size > 0: packet = self.socket.recv(size) if len(packet) == 0: @@ -320,6 +322,9 @@ class BaseConnection: else: raise MKLivestatusSocketError(str(e)) + except Exception, e: + raise MKLivestatusSocketError("Unhandled exception: %s" % e) + def do_command(self, command): if self.socket == None:

12 years, 7 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: 6c819b38931117060356aaf7f2b5e1e4ad106463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c819b38931117… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 3 13:40:18 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: WATO: make enter go to services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48d1e71b9ce6d8a01ee2bbcbac7813e1c1532af9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48d1e71b9ce6d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 3 13:40:15 2012 +0100 WATO: make enter go to services --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index db4f0f2..83b2cf0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1853,10 +1853,10 @@ def mode_edithost(phase, new, cluster): configure_attributes({hostname: host}, "host", parent = g_folder) html.write('<tr><td class="buttons" colspan=3>') + html.button("services", _("Save & go to Services"), "submit") html.button("save", _("Save & Finish"), "submit") if not new: html.button("delete", _("Delete host!"), "submit") - html.button("services", _("Save & go to Services"), "submit") html.write("</td></tr>\n") html.write("</table>\n") html.hidden_fields()

12 years, 7 months

Check_MK Git: check_mk: FIX: Fixed state filter in log views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e04bcd64f90a0c2896a9c307cad0c001c283117c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e04bcd64f90a0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 16:05:34 2012 +0100 FIX: Fixed state filter in log views --- ChangeLog | 1 + web/plugins/views/filters.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d0dca1..27c8b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ error messages when the core is being restarted * Events view now shows icon and text for "flapping" events * Use buffer for HTML creation (this speeds up esp. HTTPS a lot) + * FIX: Fixed state filter in log views Livestatus: * Add missing column check_freshness to services table diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index d55820e..723aa03 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -531,7 +531,7 @@ class FilterLogState(Filter): headers = [] for varsuffix, what, state, text in self._items: if html.get_checkbox("logst_" + varsuffix) != False: # None = form not filled in = allow - headers.append("Filter: log_type = %s ALERT\nFilter: log_state = %d\nAnd: 2\n" % + headers.append("Filter: log_type ~ %s .*\nFilter: log_state = %d\nAnd: 2\n" % (what.upper(), state)) if len(headers) == 0: return "Limit: 0\n" # no allowed state

12 years, 7 months

Check_MK Git: check_mk: FIX: Fixed wrong label "Main Overview" shown for moved WATO folders

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ad5e4c96471f8783f1ec3bfc0a0f6c868d76372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ad5e4c96471f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 15:22:40 2012 +0100 FIX: Fixed wrong label "Main Overview" shown for moved WATO folders in foldertree snapin --- ChangeLog | 2 ++ web/htdocs/wato.py | 3 +++ web/plugins/sidebar/wato.py | 9 +++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66a912a..8d0dca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,8 @@ least one contact group. * It is now possible to configure auxiliary tags via WATO (formerly also called secondary tags) + * FIX: Fixed wrong label "Main Overview" shown for moved WATO folders + in foldertree snapin Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9be661b..83d627c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -423,6 +423,9 @@ def save_folders(folder): def save_all_folders(): save_folders(g_root_folder) +def folder_config_exists(dir): + return os.path.exists(dir + "/.wato") + # Load the meta-data of a folder (it's .wato file), register # it in g_folders, load recursively all subfolders and then # return the folder object. The case the .wato file is missing diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 0d4decb..8e18775 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -107,9 +107,12 @@ def render_wato_foldertree(): hosts.sort() def get_folder(path, num = 0): - wato_folder = wato.load_folder(wato.root_dir + path, childs = False) + wato_folder = {} + if wato.folder_config_exists(wato.root_dir + path): + wato_folder = wato.load_folder(wato.root_dir + path, childs = False) + return { - 'title': wato_folder['title'], + 'title': wato_folder.get('title', path.split('/')[-1]), '.path': path, '.num_hosts': num, '.folders': {}, @@ -181,6 +184,8 @@ def render_wato_foldertree(): html.write('<span class=left>%s</span>' % _('View:')) + html.debug(repr(user_folders[''])) + # Now render the whole tree if user_folders: render_tree_folder(user_folders[''])

12 years, 7 months

Check_MK Git: check_mk: Removed debug output

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f4ce309bc3697bed32252f7043af4c6189722b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f4ce309bc3697… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 15:23:23 2012 +0100 Removed debug output --- web/plugins/sidebar/wato.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 8e18775..86b790e 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -184,8 +184,6 @@ def render_wato_foldertree(): html.write('<span class=left>%s</span>' % _('View:')) - html.debug(repr(user_folders[''])) - # Now render the whole tree if user_folders: render_tree_folder(user_folders[''])

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0688, #0687

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a625ee9775402d455c9e90d355b44f43143938a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a625ee9775402d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 14:17:57 2012 +0100 Updated bug entries #0688, #0687 --- .bugs/687 | 9 +++++++++ .bugs/688 | 8 ++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/.bugs/687 b/.bugs/687 new file mode 100644 index 0000000..507ae99 --- /dev/null +++ b/.bugs/687 @@ -0,0 +1,9 @@ +Title: Hide Roles/Users (depending on own permissions) +Component: wato +State: open +Date: 2012-03-02 14:15:14 +Targetversion: 1.2.0 +Class: feature + +It is neccessary to hide some roles and users from others. For example some admins which are only allowed +to administrate a small part of the system and only some users/roles must not see e.g. the super-admins. diff --git a/.bugs/688 b/.bugs/688 new file mode 100644 index 0000000..61dd010 --- /dev/null +++ b/.bugs/688 @@ -0,0 +1,8 @@ +Title: Add permissions to controll the single host/folder actions +Component: wato +State: open +Date: 2012-03-02 14:17:03 +Targetversion: 1.2.0 +Class: feature + +It is needed to disable single actions like "move to" or "inventory" for single roles/users.

12 years, 7 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60379fc1d1a162e6e2048cc9378c8c3fb3d2664c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60379fc1d1a162… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 2 14:07:54 2012 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index a3888f7..8b8e485 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -687 +707

12 years, 7 months

Check_MK Git: check_mk: lgp_pdu_aux: Fixed UOM shown in humidity checks

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4dfbb1be5bf67b4523e8a4e1fe68c7bb1d9d03c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dfbb1be5bf67b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 1 12:38:04 2012 +0100 lgp_pdu_aux: Fixed UOM shown in humidity checks --- .bugs/668 | 2 ++ checks/lgp_pdu_aux | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.bugs/668 b/.bugs/668 index 7527616..09cde3e 100644 --- a/.bugs/668 +++ b/.bugs/668 @@ -8,3 +8,5 @@ Class: bug When clicking on the rotating arrows only the error message ERROR cannot reschedule check: time out appears (after ~ 1 sec.) + +LM: Works for me. diff --git a/checks/lgp_pdu_aux b/checks/lgp_pdu_aux index 7edfdb8..9b42b30 100644 --- a/checks/lgp_pdu_aux +++ b/checks/lgp_pdu_aux @@ -132,7 +132,7 @@ def check_lgp_pdu_aux(item, params, info): else: output.append('Label: ' + pdu['SystemLabel']) - def handle_type(ty, label): + def handle_type(ty, label, uom): state = 0 perfdata = (ty.lower(), pdu[ty], '%0.2f:%0.2f' % (pdu[ty+'LowWarn'], pdu[ty+'HighWarn']), @@ -151,15 +151,15 @@ def check_lgp_pdu_aux(item, params, info): state = 1 s_out = ' <= %0.2f (!)' % pdu[ty+'LowWarn'] - return state, '%s: %0.2fC%s' % (label, pdu[ty], s_out), perfdata + return state, '%s: %0.2f%s%s' % (label, pdu[ty], uom, s_out), perfdata if pdu['Type'] == 'TEMP': - state, out, perf = handle_type('Temp', 'Temperature') + state, out, perf = handle_type('Temp', 'Temperature', 'C') output.append(out) perfdata.append(perf) elif pdu['Type'] == 'HUM': - state, out, perf = handle_type('Hum', 'Humidity') + state, out, perf = handle_type('Hum', 'Humidity', '%') output.append(out) perfdata.append(perf)

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012