Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: Updated bug entries #0400, #0405

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22caca768a5ce6b4e0bcbe63351cf11b54d799de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22caca768a5ce6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:25:09 2011 +0200 Updated bug entries #0400, #0405 --- .bugs/400 | 11 ++++++++--- .bugs/405 | 10 +++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.bugs/400 b/.bugs/400 index 3bb55e5..298453f 100644 --- a/.bugs/400 +++ b/.bugs/400 @@ -1,11 +1,12 @@ Title: Service Hardstate-Filter conflicts with Hoststate filter Component: multisite -Benefit: 2 -State: open Cost: 2 Date: 2011-10-27 15:00:16 -Targetversion: 1.1.12 +State: done Class: bug +Benefit: 2 +Fun: 0 +Targetversion: 1.1.12 The service hard state filter uses the HTML variables hst0, hst1, ... just like the host state filter. Change this to hdst0, hdst1, .... @@ -13,3 +14,7 @@ Otherwise the filter will also have the same setting as the host state filter. This might affect builtin views. Check them... + +2011-10-28 14:25:06: changed state open -> done +The variables for the hard state filters are now +prefixed with hd instead of h. diff --git a/.bugs/405 b/.bugs/405 index 85518f2..83c50c4 100644 --- a/.bugs/405 +++ b/.bugs/405 @@ -1,11 +1,15 @@ Title: Add filters for hard service state Component: multisite -Benefit: 1 -State: open Cost: 1 Date: 2011-10-27 18:56:40 -Targetversion: 1.2.0 +State: done Class: todo +Benefit: 1 +Fun: 0 +Targetversion: 1.2.0 Do we have filters for the hard service state? At least in the service search they should be visible. Same for hosts. + +2011-10-28 14:24:45: changed state open -> done +Hard state filter added to search and problems views.

12 years, 11 months

Check_MK Git: check_mk: Fixed help text in gb

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e77a55c6cb5353150815d837f860b6dc2a5a89b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e77a55c6cb5353… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:25:58 2011 +0200 Fixed help text in gb --- gb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gb b/gb index 3726f7f..45ed851 100755 --- a/gb +++ b/gb @@ -267,7 +267,7 @@ def main_list(args): if hit: break if not hit: - bail_out("No such component, state or class: %s" % a) + bail_out("No such component, state, class or target version: %s" % a) # Filter newbugs = []

12 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0427, #0431

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af3cd41d5d0f800b15c2e0a62e24b4695358a836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af3cd41d5d0f80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:32:35 2011 +0200 Updated bug entries #0427, #0431 --- .bugs/427 | 2 +- .bugs/431 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.bugs/427 b/.bugs/427 index e748796..6171da4 100644 --- a/.bugs/427 +++ b/.bugs/427 @@ -4,7 +4,7 @@ Benefit: 1 State: open Cost: 3 Date: 2011-10-21 13:09:21 -Targetversion: 1.1.12 +Targetversion: 1.2.0 Class: feature There is a agent section outputting the memory information for HP-UX, but no diff --git a/.bugs/431 b/.bugs/431 index bd352b5..8140674 100644 --- a/.bugs/431 +++ b/.bugs/431 @@ -1,11 +1,12 @@ Title: Intervals and wait parameters for mrpe Component: checks -Benefit: 6 +Benefit: 4 State: open -Cost: 3 +Cost: 2 Date: 2011-10-21 15:50:46 Targetversion: 1.2.0 Class: feature Es wäre schön, wenn man in der mrpe.conf parameter für Timeoutes und WaitMax -festlegen könnte. Dazu müsste der Agent die Ausgabe des Plugins Cachen +festlegen könnte. Dazu müsste der Agent die Ausgabe des Plugins Cachen. +Nachteil: der Code für MRPE wird dadurch sehr aufgeblasen.

12 years, 11 months

Check_MK Git: check_mk: WATO: move multisite config files to multisite.d/ wato/

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e014a8005668bda195490e15ee70821bfdc4aa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e014a8005668b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:00:55 2011 +0200 WATO: move multisite config files to multisite.d/wato/ --- web/htdocs/config.py | 16 +++++++++++----- web/htdocs/wato.py | 4 +++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index f700ebc..90d52ce 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -101,13 +101,19 @@ def load_config(): wato_host_tags = [] include("multisite.mk") - # Load also all files below multisite.d + + # Load also recursively all files below multisite.d conf_dir = defaults.default_config_dir + "/multisite.d" + filelist = [] if os.path.isdir(conf_dir): - filelist = glob.glob(conf_dir + "/*.mk") - filelist.sort() - for p in filelist: - include(p) + for root, dirs, files in os.walk(conf_dir): + for filename in files: + if filename.endswith(".mk"): + filelist.append(root + "/" + filename) + + filelist.sort() + for p in filelist: + include(p) # ------------------------------------------------------------------- diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fe1acb..7e3ac9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -241,7 +241,7 @@ config.declare_permission("wato.snapshots", root_dir = defaults.check_mk_configdir + "/wato/" -multisite_dir = defaults.default_config_dir + "/multisite.d/" +multisite_dir = defaults.default_config_dir + "/multisite.d/wato/" var_dir = defaults.var_dir + "/wato/" log_dir = var_dir + "log/" snapshot_dir = var_dir + "/snapshots/" @@ -5583,6 +5583,7 @@ def load_sites(): def save_sites(sites): + make_nagios_directory(multisite_dir) filename = multisite_dir + "sites.mk" if len(sites) == 0: if os.path.exists(filename): @@ -7946,6 +7947,7 @@ def mode_edit_rule(phase): def save_rulesets(folder, rulesets): + make_nagios_directory(root_dir) path = root_dir + '/' + folder['.path'] + '/' + "rules.mk" out = file(path, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n")

12 years, 11 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: b4df6a4a690afcf505b05c39ffee56eb84d571a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4df6a4a690afc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:02:53 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 11 months

Check_MK Git: check_mk: FIX: crash when sorting with join without title

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec51d24dc52e367cd95c3b90fca47d90f9976488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec51d24dc52e36… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 19:43:43 2011 +0200 FIX: crash when sorting with join without title --- ChangeLog | 2 ++ web/htdocs/views.py | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e30def..d263ee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds of Apache processes" problem! + * FIX: query crashed when sorting after a join columns without + an explicit title. 1.1.12: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f4a50be..ebae2c3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1205,6 +1205,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru else: join_columns += s[0]["columns"] + # Add key columns, needed for executing commands columns += datasource["keys"] @@ -1218,7 +1219,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru columns = list(colset) # Get list of painter options we need to display (such as PNP time range - # or the format being used for timestamp display + # or the format being used for timestamp display) painter_options = [] for entry in all_painters: p = entry[0] @@ -2448,16 +2449,19 @@ def sort_url(view, painter, join_index): return ','.join(p) def paint_header(view, p): + # The variable p is a tuple with the following components: + # p[0] --> painter object, from multisite_painters[] + # p[1] --> view name to link to or None (not needed here) + # p[2] --> tooltip (title) to display (not needed here) + # p[3] --> optional: join key (e.g. service description) + # p[4] --> optional: column title to use instead default painter = p[0] join_index = None + t = painter.get("short", painter["title"]) if len(p) >= 4: # join column - if len(p) >= 5 and p[4]: - t = p[4] - join_index = p[3] - else: - t = p[3] - else: - t = painter.get("short", painter["title"]) + join_index = p[3] + if len(p) >= 5 and p[4]: + t = p[4] # Optional: Sort link in title cell # Use explicit defined sorter or implicit the sorter with the painter name

12 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0403

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a19aa1726ab24743066db7746642bbedcc3adfb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a19aa1726ab247… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 19:44:50 2011 +0200 Updated bug entries #0403 --- .bugs/403 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/403 b/.bugs/403 index 4ee57c7..8e3aac8 100644 --- a/.bugs/403 +++ b/.bugs/403 @@ -1,14 +1,19 @@ Title: Service "1st perf data" in host view: search broken Component: multisite -Benefit: 2 -State: open Cost: 2 Date: 2011-10-27 18:53:50 -Targetversion: 1.1.12p1 +State: done Class: bug +Benefit: 2 +Fun: 0 +Targetversion: 1.1.12p1 Take the allhosts_mini View. Add a service column with the 1.st service perfdata variable. Now click on the header to sort after that columns -> Error that the column "service_perf_data" is missing. + +2011-10-27 19:44:48: changed state open -> done +The problem appeared, when the join column did not +have an explicit title. This is fixed now.

12 years, 11 months

Check_MK Git: check_mk: Make livestatus debug foldable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4686d1504cf2fbc946cb1da7d5c310d17b9a7c20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4686d1504cf2fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:23:03 2011 +0200 Make livestatus debug foldable --- web/htdocs/views.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ebae2c3..c5a5062 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1684,7 +1684,9 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l if limit != None: html.live.set_limit(limit + 1) # + 1: We need to know, if limit is exceeded if config.debug and html.output_format == "html" and 'W' in html.display_options: + html.begin_foldable_container("debug_lq", "x", True, _("Livestatus Query:"), indent=False) html.write("<div class=message><tt>%s</tt></div>\n" % (query.replace('\n', '<br>\n'))) + html.end_foldable_container() if only_sites: html.live.set_only_sites(only_sites)

12 years, 11 months

Check_MK Git: check_mk: FIX: filter for WATO file/ folder was not always working.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fcd388419c819467a7898ccb3f2b21bfeb298fd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcd388419c8194… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 13:53:16 2011 +0200 FIX: filter for WATO file/folder was not always working. --- ChangeLog | 1 + web/plugins/views/wato.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d263ee1..529fb24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ of Apache processes" problem! * FIX: query crashed when sorting after a join columns without an explicit title. + * FIX: filter for WATO file/folder was not always working. 1.1.12: diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 4e296bb..63efdcf 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -39,10 +39,10 @@ class FilterWatoFile(Filter): self.tree = wato.api.get_folder_tree() self.path_to_tree = {} # will be filled by self.folder_selection self.selection = self.folder_selection(self.tree, "", 0) + self.last_wato_data_update = time.time() def check_wato_data_update(self): - if not self.last_wato_data_update or time.time() - self.last_wato_data_update > 30: - self.last_wato_data_update = time.time() + if not self.last_wato_data_update or time.time() - self.last_wato_data_update > 5: self.load_wato_data() def display(self): @@ -57,11 +57,11 @@ class FilterWatoFile(Filter): else: return "" + # Construct pair-list of ( folder-path, title ) to be used + # by the HTML selection box. This also updates self._tree, + # a dictionary from the path to the title. def folder_selection(self, folder, prefix, depth): - if depth == 0: - self.check_wato_data_update() my_path = folder[".path"] - if depth: title_prefix = "   " * depth + "` " + "- " * depth else:

12 years, 11 months

Check_MK Git: check_mk: Filter for hard states in service search/problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 31405c64b014076b276e65d7562a29daf73e6efc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31405c64b01407… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:23:53 2011 +0200 Filter for hard states in service search/problems --- ChangeLog | 2 ++ web/plugins/views/builtin.py | 2 ++ web/plugins/views/filters.py | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 529fb24..739cb34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,8 @@ * FIX: query crashed when sorting after a join columns without an explicit title. * FIX: filter for WATO file/folder was not always working. + * Added filter for hard services states to search and service + problems view 1.1.12: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 951f7f5..b010dc7 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1008,6 +1008,7 @@ multisite_builtin_views.update({ 'check_command', 'hoststate', 'svcstate', + 'svchardstate', 'opthostgroup', 'opthost_contactgroup', 'output', @@ -1327,6 +1328,7 @@ multisite_builtin_views.update({ 'show_filters': ['service_in_notification_period', 'service_acknowledged', 'svcstate', + 'svchardstate', 'hoststate'], 'sorters': [('svcstate', True), ('stateage', False), diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 8f378b6..60da59c 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -206,7 +206,7 @@ class FilterServiceState(Filter): for i in [0,1,2,3]: if html.var(self.prefix + "st%d" % i, defval) == "on": - if self.prefix == "h": + if self.prefix == "hd": column = "service_last_hard_state" else: column = "service_state" @@ -214,12 +214,14 @@ class FilterServiceState(Filter): if html.var(self.prefix + "stp", defval) == "on": headers.append("Filter: service_has_been_checked = 0\n") if len(headers) == 0: - return "Limit: 0\n" # not allowed state + return "Limit: 0\n" # no allowed state + elif len(headers) == 5: # all states allowed + return "" else: return "".join(headers) + ("Or: %d\n" % len(headers)) declare_filter(215, FilterServiceState("svcstate", _("Service states"), "")) -declare_filter(216, FilterServiceState("svchardstate", _("Service hard states"), "h")) +declare_filter(216, FilterServiceState("svchardstate", _("Service hard states"), "hd")) class FilterHostState(Filter): def __init__(self):

12 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011