Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2715 FIX Fixed visibility of BI aggregations in editor

by Lars Michelsen

Module: check_mk Branch: master Commit: c09d75768fb3e8317422a0da5a429f25ea9cb9f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c09d75768fb3e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 15:37:01 2015 +0100 #2715 FIX Fixed visibility of BI aggregations in editor --- .werks/2715 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2715 b/.werks/2715 new file mode 100644 index 0000000..8793223 --- /dev/null +++ b/.werks/2715 @@ -0,0 +1,10 @@ +Title: Fixed visibility of BI aggregations in editor +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445956606 + + diff --git a/ChangeLog b/ChangeLog index 0091f0b..b65f313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now + * 2715 FIX: Fixed visibility of BI aggregations in editor HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c7fe63..a83aae8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17658,7 +17658,8 @@ def render_rule_tree(aggregation_rules, ruleid, tree_path): if not sub_rule_ids: html.write('<li><a href="%s">%s</a></li>' % (edit_url, title)) else: - html.begin_foldable_container("bi_rule_trees", tree_path, False, title, title_url = edit_url) + html.begin_foldable_container("bi_rule_trees", tree_path, False, title, + title_url=edit_url, tree_img="tree_black") for sub_rule_id in sub_rule_ids: render_rule_tree(aggregation_rules, sub_rule_id, tree_path + "/" + sub_rule_id) html.end_foldable_container()

8 years, 8 months

#2714 FIX Fixed visibility of folding arrows by making them dark

by Lars Michelsen

Module: check_mk Branch: master Commit: ba3a0756e74312933289401baada811c11393dd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba3a0756e74312… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 15:31:41 2015 +0100 #2714 FIX Fixed visibility of folding arrows by making them dark --- .werks/2714 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 12 +++++++----- web/plugins/views/inventory.py | 3 ++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/2714 b/.werks/2714 new file mode 100644 index 0000000..4cd361d --- /dev/null +++ b/.werks/2714 @@ -0,0 +1,10 @@ +Title: Fixed visibility of folding arrows by making them dark +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445956247 + + diff --git a/ChangeLog b/ChangeLog index e30ae8c..0091f0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... * 2667 FIX: solaris_mem: fix exception in inventory plugin + * 2714 FIX: Fixed visibility of folding arrows by making them dark 1.2.7i3: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9af0a74..2a18684 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1473,7 +1473,9 @@ class html: ht = ht[0:x] + ht[y+9:] return ht - def begin_foldable_container(self, treename, id, isopen, title, indent=True, first=False, icon=None, fetch_url=None, title_url=None): + def begin_foldable_container(self, treename, id, isopen, title, indent=True, + first=False, icon=None, fetch_url=None, title_url=None, + tree_img="tree"): self.folding_indent = indent if self.user: @@ -1490,14 +1492,14 @@ class html: if icon: self.write('<img class="treeangle title" src="images/icon_%s.png">' % icon) else: - self.write('<img align=absbottom class="treeangle nform" src="images/tree_%s.png">' % ( - isopen and "90" or "00")) + self.write('<img align=absbottom class="treeangle nform" src="images/%s_%s.png">' % + (tree_img, isopen and "90" or "00")) self.write('%s</td></tr>' % title) else: if not icon: self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' - 'src="images/tree_%s.png" %s>' % - (treename, id, img_num, onclick)) + 'src="images/%s_%s.png" %s>' % + (treename, id, tree_img, img_num, onclick)) if title.startswith('<'): # custom HTML code self.write(title) if indent != "form": diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 2aaeb0a..9a72b6f 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -125,7 +125,8 @@ def render_inv_subtree_foldable(hostname, tree_id, invpath, node): title = title % list_index fetch_url = html.makeuri_contextless([("host", hostname), ("path", invpath), ("treeid", tree_id)], "ajax_inv_render_tree.py") - if html.begin_foldable_container("inv_" + hostname + tree_id, invpath, False, title, icon=icon, fetch_url=fetch_url): + if html.begin_foldable_container("inv_" + hostname + tree_id, invpath, False, + title, icon=icon, fetch_url=fetch_url, tree_img="tree_black"): # Render only if it is open. We'll get the stuff via ajax later if it's closed render_inv_subtree_container(hostname, tree_id, invpath, node) html.end_foldable_container()

8 years, 8 months

Edition bookmark lists: Fixed exception in complain mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 2381c10b1a9d7999a56f49b52aaa6202273282c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2381c10b1a9d79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 15:22:34 2015 +0100 Edition bookmark lists: Fixed exception in complain mode --- web/plugins/sidebar/shipped.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 77e7c93..022246e 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1053,7 +1053,10 @@ class BookmarkList(pagetypes.Overridable, pagetypes.Base): ) def bookmark_config_to_vs(v): - return (v["title"], v["url"], v["icon"], v["topic"]) + if v: + return (v["title"], v["url"], v["icon"], v["topic"]) + else: + return v def bookmark_vs_to_config(v): return {

8 years, 8 months

Cleaned up i18n and index code

by Lars Michelsen

Module: check_mk Branch: master Commit: 66620528b7af2c5f7c03afa0550d7c779925d32c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66620528b7af2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 13:41:29 2015 +0100 Cleaned up i18n and index code --- web/htdocs/config.py | 1 + web/htdocs/i18n.py | 150 ++++++++++++++++++++++++++++ web/htdocs/index.py | 16 +-- web/htdocs/lib.py | 91 +---------------- web/htdocs/wato.py | 7 +- web/plugins/config/builtin.py | 20 +++- web/plugins/wato/check_mk_configuration.py | 4 +- 7 files changed, 182 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66620528b7…

8 years, 8 months

Cleaned up page handling and index module a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: ee8e1c440d616c120895be6f27e374a4a6fca46a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee8e1c440d616c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 13:16:53 2015 +0100 Cleaned up page handling and index module a bit --- web/htdocs/default_permissions.py | 2 +- web/htdocs/index.py | 98 +++++++++++++------------------------ web/htdocs/modules.py | 98 +++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 3 +- 4 files changed, 134 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ee8e1c440d…

8 years, 8 months

Cleaned up index code

by Lars Michelsen

Module: check_mk Branch: master Commit: 6da44f97684a3894e72d904a2c3920cf09415927 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6da44f97684a38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 14:54:55 2015 +0100 Cleaned up index code --- web/htdocs/html_mod_python.py | 63 +++++++++++++++++++- web/htdocs/htmllib.py | 4 +- web/htdocs/index.py | 130 ++++++++++++++++------------------------- 3 files changed, 113 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6da44f9768…

8 years, 8 months

Fixed broken graph collection page

by Lars Michelsen

Module: check_mk Branch: master Commit: 59a69bdb39d38a2240a593af39832f1cf27ba267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59a69bdb39d38a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 13:12:35 2015 +0100 Fixed broken graph collection page --- web/htdocs/pagetypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 7606e0c..d3bf5e1 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -311,7 +311,7 @@ class PageRenderer: @classmethod def _page_handlers(self, clazz): return { - clazz.type_name(): lambda: self.page_show(), + clazz.type_name(): lambda: clazz.page_show(), }

8 years, 8 months

#2713 New bookmark lists, strucutrable and shareable between users

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ac6f102a012b00a0286c6ed891c1d096447e267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ac6f102a012b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 11:43:31 2015 +0100 #2713 New bookmark lists, strucutrable and shareable between users The bookmark sidebar snapin has been extended to be structurable into topics. Each bookmark can now be put into a topic which can then be expanded or closed in the GUI. It is now possible to group bookmarks together in multiple bookmark lists. These lists can be made available to other users, just like views, dashboards, reports and graph collections. The summary of all bookmark lists a user can access is grouped together in the bookmark snapin and shown to the user as one single list of bookmarks. --- .werks/2713 | 19 ++ ChangeLog | 1 + web/htdocs/images/button_new_bookmark_list_hi.png | Bin 0 -> 5047 bytes web/htdocs/images/button_new_bookmark_list_lo.png | Bin 0 -> 5047 bytes web/htdocs/images/icon_bookmark_list.png | Bin 0 -> 5047 bytes web/htdocs/images/icon_new_bookmark_list.png | Bin 0 -> 5047 bytes web/htdocs/js/sidebar.js | 7 - web/htdocs/pagetypes.py | 65 ++++- web/htdocs/sidebar.py | 99 +------ web/htdocs/visuals.py | 1 + web/plugins/pages/shipped.py | 4 +- web/plugins/sidebar/shipped.py | 289 ++++++++++++++++++--- 12 files changed, 336 insertions(+), 149 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6ac6f102a0…

8 years, 8 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 54ca86e207cacbe2f951a89260552005c043f975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54ca86e207cacb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 11:40:47 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c98e88a..6ff38e6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2713 +2733

8 years, 8 months

fixed a couple of potential crash sources and theoretical security issues in the windows agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: 296aff3bbbd768be35791f1ef2bf4314e0ab6571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=296aff3bbbd768… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Oct 26 16:48:09 2015 +0100 fixed a couple of potential crash sources and theoretical security issues in the windows agent the problems were all caused by a misuse of snprintf. --- agents/windows/Configuration.cc | 4 ++-- agents/windows/check_mk_agent.cc | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index c083d40..818dea8 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -822,8 +822,8 @@ bool Configuration::handleMrpeConfigVariable(char *var, char *value) memset(tmp, 0, sizeof(*tmp)); if (user) - snprintf(tmp->user, sizeof(tmp->user), user); - snprintf(tmp->path, sizeof(tmp->path), value); + snprintf(tmp->user, sizeof(tmp->user), "%s", user); + snprintf(tmp->path, sizeof(tmp->path), "%s", value); _mrpe_includes.add(tmp); return true; } diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e6f920e..89ebfe6 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -67,6 +67,7 @@ #include <map> #include <vector> #include <string> +#include <algorithm> #include "stringutil.h" #include "Environment.h" #include "Configuration.h" @@ -132,18 +133,20 @@ typedef map<unsigned long long, process_entry> process_entry_t; // Forward declarations of functions void listen_tcp_loop(const Environment &env); -void output(SOCKET &out, const char *format, ...); char *ipv4_to_text(uint32_t ip); void output_data(SOCKET &out, const Environment &env); double file_time(const FILETIME *filetime); void open_crash_log(const std::string &log_directory); void close_crash_log(); -void crash_log(const char *format, ...); void lowercase(char* value); void collect_script_data(script_execution_mode mode); void find_scripts(const Environment &env); void RunImmediate(const char *mode, int argc, char **argv); +void output(SOCKET &out, const char *format, ...) __attribute__ ((format (printf, 2, 3))); +void crash_log(const char *format, ...) __attribute__ ((format (printf, 1, 2))); +void verbose(const char *format, ...) __attribute__ ((format (printf, 1, 2))); + // .----------------------------------------------------------------------. // | ____ _ _ _ | // | / ___| | ___ | |__ __ _| |___ | @@ -2294,7 +2297,6 @@ int launch_program(script_container* cont) { int exit_code = 0; int out_offset = 0; - char buf[16635]; // i/o buffer STARTUPINFO si; SECURITY_ATTRIBUTES sa; @@ -2356,7 +2358,9 @@ int launch_program(script_container* cont) unsigned long bread; // bytes read unsigned long avail; // bytes available - memset(buf, 0, sizeof(buf)); + static const size_t BUFFER_SIZE = 16635; + char buf[BUFFER_SIZE]; // i/o buffer + memset(buf, 0, BUFFER_SIZE); time_t process_start = time(0); bool buffer_full = false; @@ -2400,9 +2404,9 @@ int launch_program(script_container* cont) break; if (bread > 0) { - memset(buf, 0, sizeof(buf)); - ReadFile(read_stdout, buf, sizeof(buf) - 1, &bread, NULL); - out_offset += snprintf(cont->buffer_work + out_offset, current_heap_size - out_offset, buf); + ReadFile(read_stdout, cont->buffer_work + out_offset, + std::min<size_t>(BUFFER_SIZE - 1, current_heap_size - out_offset), &bread, NULL); + out_offset += bread; } } if (buffer_full) { @@ -2416,7 +2420,6 @@ int launch_program(script_container* cont) Sleep(10); } - TerminateJobObject(cont->job_object, exit_code); // cleanup the mess @@ -2585,7 +2588,7 @@ void output_external_programs(SOCKET &out, script_type type) snprintf(cache_buffer + cache_buffer_offset, write_bytes, "%s", line); cache_buffer_offset += write_bytes - 1; - snprintf(cache_buffer + cache_buffer_offset, cache_len, cache_info); + snprintf(cache_buffer + cache_buffer_offset, cache_len, "%s", cache_info); cache_buffer_offset += cache_len - 1; write_bytes = 3 + cr_offset + 1 + 1; // >>> + \r + \n + \0 @@ -2614,7 +2617,7 @@ void output_external_programs(SOCKET &out, script_type type) cont->buffer = NULL; } if (cont->buffer) - output(out, cont->buffer); + output(out, "%s", cont->buffer); } it_cont++; } @@ -2701,10 +2704,8 @@ void update_mrpe_includes() p = strrchr(plugin_name, '\\'); if (p) plugin_name = p + 1; - strncpy(tmp_entry->plugin_name, plugin_name, - sizeof(tmp_entry->plugin_name)); - - snprintf(tmp_entry->run_as_user, sizeof(tmp_entry->run_as_user), (*it_include)->user); + strncpy(tmp_entry->plugin_name, plugin_name, sizeof(tmp_entry->plugin_name)); + strncpy(tmp_entry->run_as_user, (*it_include)->user, sizeof(tmp_entry->run_as_user)); g_included_mrpe_entries.push_back(tmp_entry); } }

8 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015