Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 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: c7b3caf20452fcb9ec8fdb089c7d5050f71f1495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7b3caf20452fc… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 18 08:58:42 2011 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

13 years

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: 3a791af99aa9d52026f4d7061e0439803f94ea89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a791af99aa9d5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Oct 21 16:55:48 2011 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

13 years

Check_MK Git: check_mk: FIX: really suppress precompiling on PING-only hosts now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4532b402bad77877fdfec15fec7494f1ec5db322 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4532b402bad778… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 19:39:57 2011 +0100 FIX: really suppress precompiling on PING-only hosts now --- ChangeLog | 4 ++++ modules/check_mk.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a4100d..2cfbdc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,10 @@ * New columns num_hosts and num_services in status table * New aggregation functions suminv and avginv (see Documentation) +1.1.12p3: + Core, Setup, etc.: + * FIX: really suppress precompiling on PING-only hosts now + 1.1.12p2: Core, Setup, etc.: * FIX: fix handling of empty suboids diff --git a/modules/check_mk.py b/modules/check_mk.py index f9488ee..6b2b350 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2311,7 +2311,7 @@ def precompile_hostcheck(hostname): if len(check_table) == 0: if opt_verbose: sys.stderr.write("(no Check_MK checks)\n") - return + return output = file(source_filename + ".new", "w") output.write("#!/usr/bin/python\n")

13 years

Check_MK Git: check_mk: Multisite: cleanup up debug code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54563aa900fede1a3fba9156d35d99c5a5597817 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54563aa900fede… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 18:07:36 2011 +0100 Multisite: cleanup up debug code --- ChangeLog | 2 ++ web/htdocs/check_mk.css | 19 +++++++++++++++++++ web/htdocs/config.py | 2 ++ web/htdocs/htmllib.py | 2 ++ web/htdocs/views.py | 8 ++++---- web/plugins/wato/check_mk_configuration.py | 15 ++++++++++++--- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e25df3..7a4100d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ * Only show most frequently used context buttons (configurable in multisite.mk via context_buttons_to_show) * Show icon if user has modified a view's filter settings + * New config option debug_livestatus_queries, normal debug + mode does not include this anymore WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8da5dbd..e49eb3b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -158,6 +158,16 @@ body.main table.header td.right img { top: 5px; } +body.main div.urldebug { + color: white; + width: 100%; + font-size: 8pt; + font-family: monospace; + position: relative; + top: -14px; +} + + /* The content page footer containing optional status icons */ table.footer { margin-top: 10px; @@ -1023,6 +1033,15 @@ tr.data td.pnpgraph img { border: 1px solid #888; margin: 7px 3px 3px 0px; } + +div.livestatus.message { + position: fixed; + bottom: -10px; + left: 10px; + font-size: 8pt; + z-index: 20; +} + /* _ _ | | __ _ _ _ ___ _ _| |_ ___ diff --git a/web/htdocs/config.py b/web/htdocs/config.py index cb869e4..9993474 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -488,6 +488,8 @@ custom_links = {} # \_/ \__,_|_| |_|\___/ \__,_|___/ # +debug_livestatus_queries = False + # Show livestatus errors in multi site setup if some sites are # not reachable. show_livestatus_errors = True diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 32631cb..bfdae94 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -622,6 +622,8 @@ class html: "%s     <b id=headertime>%s</b> <a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a></td></tr></table>" % (title, login_text, time.strftime("%H:%M"))) self.write("<hr class=header>\n") + if config.debug: + self.write("<div class=urldebug>%s</div>" % self.makeuri([])) def body_start(self, title=''): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 492184c..0bfc925 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1703,10 +1703,10 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l html.live.set_prepend_site(True) 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 config.debug_livestatus_queries \ + and html.output_format == "html" and 'W' in html.display_options: + html.write('<div class="livestatus message" onmouseover="this.style.display=\'none\';">' + '<tt>%s</tt></div>\n' % (query.replace('\n', '<br>\n'))) if only_sites: html.live.set_only_sites(only_sites) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 1944440..83c0d95 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -45,9 +45,18 @@ register_configvar(group, "debug", Checkbox(title = _("Debug mode"), label = _("enable debug mode"), - help = _("When Multisite is running in debug mode, all Livestatus queries done in " - "views are output. Also when errors occur a complete Python stack trace " - "is being output."), + help = _("When Multisite is running in debug mode, interal Python error messages " + "are being displayed and various debug information in other places is " + "also available."), + default_value = False), + domain = "multisite") + +register_configvar(group, + "debug_livestatus_queries", + Checkbox(title = _("Debug Livestatus queries"), + label = _("enable debug of Livestatus queries"), + help = _("With this option turned on all Livestatus queries made by Multisite " + "in order to render views are being displayed."), default_value = False), domain = "multisite")

13 years

Check_MK Git: check_mk: Show icon if user has modified a filter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e022fed792125b03ef4c83f709cbe246dfbcf21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e022fed792125… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 17:46:26 2011 +0100 Show icon if user has modified a filter --- ChangeLog | 1 + web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/images/icon_filter_set.png | Bin 0 -> 3259 bytes web/htdocs/views.py | 7 ++++++- 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9cdac9..3e25df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * New icon on a service whos host is in downtime * Only show most frequently used context buttons (configurable in multisite.mk via context_buttons_to_show) + * Show icon if user has modified a view's filter settings WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 4fbc484..8da5dbd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -989,6 +989,14 @@ img.icon { width: 20px; height: 20px; } +img.tabicon { + width: 16px; + height: 16px; + vertical-align: middle; + position: relative; + top: -1px; + left: 0px; +} /* Icon image place inline in some documentation text */ .wato img.icon.docu { width: 14px; diff --git a/web/htdocs/images/icon_filter_set.png b/web/htdocs/images/icon_filter_set.png new file mode 100644 index 0000000..b11a7b6 Binary files /dev/null and b/web/htdocs/images/icon_filter_set.png differ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 01676cd..492184c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1289,7 +1289,12 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Filter-button if 'F' in display_options and len(show_filters) > 0: filter_isopen = html.var("search", "") == "" and view["mustsearch"] - toggle_button("table_filter", filter_isopen, _("Filter"), ["filter"]) + # Show warning-icon if some filter is set + label = _("Filter") + if html.var("filled_in") == "filter": + label = '<img class=tabicon src="images/icon_filter_set.png"> %s' % label + + toggle_button("table_filter", filter_isopen, label, ["filter"]) html.write("<td class=minigap></td>\n") # Command-button, open command form if checkboxes are currently shown

13 years

Check_MK Git: check_mk: Automation: set opt_dont_submit on inventory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccdf953bb2dd8527f60ae1018c157982cacb2fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccdf953bb2dd85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 17:35:47 2011 +0100 Automation: set opt_dont_submit on inventory --- modules/automation.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index c9fbe3a..87eb2d2 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -131,8 +131,9 @@ def automation_inventory(args): def automation_try_inventory(args): + global opt_use_cachefile, opt_no_tcp, opt_dont_submit, \ + inventory_max_cachefile_age, check_max_cachefile_age if args[0] == '--cache': - global opt_use_cachefile, inventory_max_cachefile_age, check_max_cachefile_age opt_use_cachefile = True check_max_cachefile_age = 1000000000 inventory_max_cachefile_age = 1000000000 @@ -188,6 +189,8 @@ def automation_try_inventory(args): infotype = ct.split('.')[0] opt_use_cachefile = True opt_no_tcp = True + opt_dont_submit = True + try: info = get_host_info(hostname, ipaddress, infotype) # Handle cases where agent does not output data

13 years

Check_MK Git: check_mk: WATO: make hosts clickable in rule list

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44786f551d1f150d02bcd6e04f395b4a452ae692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44786f551d1f15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 15:48:29 2011 +0100 WATO: make hosts clickable in rule list --- web/htdocs/wato.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c44654c..a0c7d16 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8919,7 +8919,15 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): if host_list == []: condition = _("This rule does <b>never</b> apply!") elif host_list[-1] != ALL_HOSTS[0]: - tt_list = [ "<tt><b>%s</b></tt>" % t for t in host_list ] + tt_list = [] + for h in host_list: + f = find_host(h) + if f: + uri = html.makeuri([("mode", "edithost"), ("folder", f[".path"]), ("host", h)]) + host_spec = '<a href="%s">%s</a>' % (uri, h) + else: + host_spec = h + tt_list.append("<tt><b>%s</b></tt>" % host_spec) if len(host_list) == 1: condition = _("Host name is %s") % tt_list[0] else:

13 years

Check_MK Git: check_mk: WATO: fix rule/host/item context without item

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d45cc6cb5ac1eeba80600cd658490ec93515ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d45cc6cb5ac1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 15:58:26 2011 +0100 WATO: fix rule/host/item context without item --- web/htdocs/wato.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a0c7d16..8246572 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -150,6 +150,7 @@ backup_paths = replication_paths + [ ALL_HOSTS = [ '@all' ] ALL_SERVICES = [ "" ] NEGATE = '@negate' +NO_ITEM = {} # Just an arbitrary unique thing # Actions for log_pending RESTART = 1 @@ -8465,7 +8466,10 @@ def mode_edit_ruleset(phase): varname = html.var("varname") rulespec = g_rulespecs[varname] hostname = html.var("host", "") - item = eval(html.var("item", "None")) + if html.has_var("item"): + item = eval(html.var("item")) + else: + item = NO_ITEM if hostname: hosts = load_hosts(g_folder) @@ -8647,6 +8651,7 @@ def mode_edit_ruleset(phase): if hostname: reason = rule_matches_host_and_item( rulespec, tag_specs, host_list, item_list, folder, g_folder, hostname, item) + # Handle case where dict is constructed from rules if reason == True and rulespec["match"] == "dict": if len(value) == 0: @@ -8716,7 +8721,7 @@ def mode_edit_ruleset(phase): html.begin_form("new_rule") if hostname: title = _("Exception rule for host %s" % hostname) - if rulespec["itemtype"]: + if item != NO_ITEM and rulespec["itemtype"]: title += _(" and %s '%s'") % (rulespec["itemname"], item) html.button("_new_host_rule", title) html.write(" " + _("or") + " ") @@ -8740,7 +8745,7 @@ def folder_selection(folder, depth=0): -def create_rule(rulespec, hostname=None, item=None): +def create_rule(rulespec, hostname=None, item=NO_ITEM): new_rule = [] valuespec = rulespec["valuespec"] if valuespec: @@ -8750,7 +8755,7 @@ def create_rule(rulespec, hostname=None, item=None): else: new_rule.append(ALL_HOSTS) # bottom: default to catch-all rule if rulespec["itemtype"]: - if item != None: + if item != NO_ITEM: new_rule.append(["%s$" % item]) else: new_rule.append([""]) @@ -8843,7 +8848,7 @@ def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list, reasons.append(_("The rule does not apply to the folder of the host.")) # Check items - if rulespec["itemtype"]: + if item != NO_ITEM and rulespec["itemtype"]: item_matches = False for i in item_list: if re.match(i, str(item)):

13 years

Check_MK Git: check_mk: WATO: show IP addresse attribute in folder

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02d08f732281df782fa599b296745ac867baf1cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02d08f732281df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 15:38:33 2011 +0100 WATO: show IP addresse attribute in folder This is conveniant for Tests or for a larger collection of dummy hosts all having 127.0.0.1 --- web/plugins/wato/builtin_attributes.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 1c31e84..a0d7284 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -44,4 +44,4 @@ declare_host_attribute(TextAttribute("ipaddress", _("IP address"), "dynamic IP addresses."), allow_empty = False), show_in_table = True, - show_in_folder = False) + show_in_folder = True)

13 years

Check_MK Git: check_mk: WATO: new view columns for WATO folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc97ebe0e5e986226d74e259454ebfd98f8d5ca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc97ebe0e5e986… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 13:08:32 2011 +0100 WATO: new view columns for WATO folders --- web/htdocs/wato.py | 17 ++++++++++++++ web/plugins/views/wato.py | 53 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8592924..c44654c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -556,6 +556,8 @@ def load_hosts_file(folder): host[".siteid"] = host["site"] else: host[".siteid"] = folder[".siteid"] + else: + host[".siteid"] = None hosts[hostname] = host @@ -9529,6 +9531,21 @@ class API: else: return path + # Return a list with all the titles of the paths' + # components, e.g. "muc/north" -> [ "Main Directory", "Munich", "North" ] + def get_folder_title_path(self, path, withlinks=False): + load_all_folders() # TODO: speed up! + folder = g_folders.get(path) + titles = [] + while (folder): + title = folder["title"] + if withlinks: + title = "<a href='wato.py?mode=folder&folder=%s'>%s</a>" % (folder[".path"], title) + titles.append(title) + folder = folder.get(".parent") + return titles[::-1] + + # Returns the number of not activated changes. def num_pending_changes(self): return len(parse_audit_log("pending")) diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 8b69d31..3ecf00b 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -95,3 +95,56 @@ class FilterWatoFile(Filter): declare_filter(10, FilterWatoFile()) if "wato_folder" not in ubiquitary_filters: ubiquitary_filters.append("wato_folder") # show in all views + +multisite_painters["host_filename"] = { + "title" : _("Check_MK config filename"), + "short" : _("Filename"), + "columns" : ["host_filename"], + "paint" : lambda row: ("tt", row["host_filename"]), +} + +def paint_wato_folder(row, how): + filename = row["host_filename"] + if not filename.startswith("/wato/") or not filename.endswith("/hosts.mk"): + return "", "" + wato_path = filename[6:-9] + title_path = wato.api.get_folder_title_path(wato_path, True) + if how == "plain": + return "", title_path[-1] + elif how == "abs": + return "", " / ".join(title_path) + else: + # We assume that only hosts are show, that are below the + # current WATO path. If not then better output absolute + # path then wrong path. + current_path = html.var("wato_folder") + if not current_path or not wato_path.startswith(current_path): + return "", " / ".join(title_path) + + depth = current_path.count('/') + 1 + return "", " / ".join(title_path[depth:]) + + + +multisite_painters["wato_folder_abs"] = { + "title" : _("WATO folder - complete path"), + "short" : _("WATO folder"), + "columns" : ["host_filename"], + "paint" : lambda row: paint_wato_folder(row, "abs") +} + +multisite_painters["wato_folder_rel"] = { + "title" : _("WATO folder - relative path"), + "short" : _("WATO folder"), + "columns" : ["host_filename"], + "paint" : lambda row: paint_wato_folder(row, "rel") +} + +multisite_painters["wato_folder_plain"] = { + "title" : _("WATO folder - just folder name"), + "short" : _("WATO folder"), + "columns" : ["host_filename"], + "paint" : lambda row: paint_wato_folder(row, "plain") +} + +

13 years

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011