Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a9689301d508897312fdb054148e24adec5f981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a9689301d5088… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 16:06:08 2016 +0200 Fixed typo in label of event console --- web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 23f3607..27981a1 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -406,7 +406,7 @@ vs_mkeventd_rule = Dictionary( "event. It will stay open, but the count does not increase anymore. " "Any further matching message will create a new event."), ), - label = _("Discontinue counting after time as elapsed"), + label = _("Discontinue counting after time has elapsed"), none_label = _("Bar"), )), ( "count_ack",

8 years

windows agent: fixed another issue while parsing the config

by Andreas Boesl

Module: check_mk Branch: master Commit: 6fe13da6a9207f0713857a277e9c0b13a405422b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fe13da6a9207f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 7 15:56:42 2016 +0200 windows agent: fixed another issue while parsing the config --- agents/windows/Configurable.h | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/windows/Configurable.h b/agents/windows/Configurable.h index 0e84337..9ad9ac9 100644 --- a/agents/windows/Configurable.h +++ b/agents/windows/Configurable.h @@ -82,7 +82,6 @@ public: virtual void startBlock() { _block_mode.startBlock(_values); } virtual void feed(const std::string &, const std::string &value) override { - startBlock(); this->add(from_string<DataT>(value)); }

8 years

windows agent: fixed two issues when parsing the check_mk configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: 42fea50588426da4b1c30c00da2ae6b3f342444a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42fea50588426d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 7 15:55:17 2016 +0200 windows agent: fixed two issues when parsing the check_mk configuration --- agents/windows/types.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/types.cc b/agents/windows/types.cc index db2fdf6..fde408d 100644 --- a/agents/windows/types.cc +++ b/agents/windows/types.cc @@ -119,7 +119,7 @@ mrpe_entry *from_string<mrpe_entry *>(const std::string &value) { template <> winperf_counter *from_string<winperf_counter *>(const std::string &value) { size_t colonIdx = value.find_last_of(":"); - if (colonIdx != std::string::npos) { + if (colonIdx == std::string::npos) { fprintf(stderr, "Invalid counter '%s' in section [winperf]: need number(or " "text) and colon, e.g. 238:processor.\n", @@ -198,7 +198,7 @@ eventlog_config_entry from_string<eventlog_config_entry>( } } - return eventlog_config_entry(level, hide_context ? 1 : 0, nullptr, false); + return eventlog_config_entry(level, hide_context ? 1 : 0, "", false); } const char *level_name(int level_id) {

8 years

Add missing function call for loglevel verbosity - used to log in any case

by Konstantin Büttner

Module: check_mk Branch: master Commit: 357054e752e82ee3c233297ada5358a3529d5aaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=357054e752e82e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 7 14:18:14 2016 +0200 Add missing function call for loglevel verbosity - used to log in any case --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index d369868..a2b67dc 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -252,7 +252,7 @@ def is_verbose(): def verbose(text): - if is_verbose: + if is_verbose(): log(text)

8 years

Removed old python code compatibility code mess

by Lars Michelsen

Module: check_mk Branch: master Commit: 4019da6559dc4ebc895efc9a70c8d4a8b5ab6ece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4019da6559dc4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:48:13 2016 +0200 Removed old python code compatibility code mess --- web/htdocs/js/checkmk.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4690d0b..164638c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -34,11 +34,6 @@ //# | Generic library functions used anywhere in Check_MK | //# '--------------------------------------------------------------------' -// Make JS understand Python source code -// FIXME TODO remove this crap -var True = true; -var False = false; - // The nextSibling attribute points also to "text nodes" which might // be created by spaces or even newlines in the HTML code and not to // the next painted dom object.

8 years

Fixed another non json encoded data serialization for JS

by Lars Michelsen

Module: check_mk Branch: master Commit: db4897ffca84b8885e51a7acb5ed6f1f00cdb7f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4897ffca84b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:47:02 2016 +0200 Fixed another non json encoded data serialization for JS --- web/htdocs/wato.py | 25 +++++++++++-------------- web/plugins/views/layouts.py | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2b7e0d8..06e1b77 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3424,7 +3424,7 @@ def mode_bulk_discovery(phase): elif phase == "action": if html.var("_item"): if not html.check_transaction(): - html.write(repr([ 'failed', 0, 0, 0, 0, 0, 0, ]) + "\n") + html.write(json.dumps([ 'failed', 0, 0, 0, 0, 0, 0, ]) + "\n") html.write(_("Error during discovery: Maximum number of retries reached. " "You need to restart the bulk service discovery")) return "" @@ -3484,10 +3484,10 @@ def mode_bulk_discovery(phase): if not host.locked(): host.clear_discovery_failed() - result = repr([ 'continue', num_hosts, num_failed_hosts, num_skipped_hosts ] + sum_counts) + "\n" + result_txt + result = json.dumps([ 'continue', num_hosts, num_failed_hosts, num_skipped_hosts ] + sum_counts) + "\n" + result_txt except Exception, e: - result = repr([ 'failed', num_hosts, num_hosts, 0, 0, 0, 0, ]) + "\n" + result = json.dumps([ 'failed', num_hosts, num_hosts, 0, 0, 0, 0, ]) + "\n" if site_id: msg = _("Error during inventory of %s on site %s<div class=exc>%s</div") % \ (", ".join(hostnames), site_id, e) @@ -3907,7 +3907,7 @@ def mode_parentscan(phase): result = "%s\n%s: %s<br>\n" % (json.dumps(counts), host_name, message) except Exception, e: - result = repr([ 'failed', 1, 0, 0, 0, 0, 0, 1 ]) + "\n" + result = json.dumps([ 'failed', 1, 0, 0, 0, 0, 0, 1 ]) + "\n" if site_id: msg = _("Error during parent scan of %s on site %s: %s") % (host_name, site_id, e) else: @@ -16490,9 +16490,6 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if topic_is_volatile: volatile_topics.append((topic or _("Basic settings")).encode('utf-8')) - def dump_json(obj): - return repr(obj).replace('None', 'null') - forms.end() # Provide Javascript world with the tag dependency information # of all attributes. @@ -16504,13 +16501,13 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr "var user_roles = %s;\n"\ "var hide_attributes = %s;\n"\ "wato_fix_visibility();\n" % ( - dump_json(inherited_tags), - dump_json(list(set(dependency_mapping_tags.keys()+dependency_mapping_roles.keys()+hide_attributes))), - dump_json(dependency_mapping_tags), - dump_json(dependency_mapping_roles), - dump_json(volatile_topics), - dump_json(config.user_role_ids), - dump_json(hide_attributes))) + json.dumps(inherited_tags), + json.dumps(list(set(dependency_mapping_tags.keys()+dependency_mapping_roles.keys()+hide_attributes))), + json.dumps(dependency_mapping_tags), + json.dumps(dependency_mapping_roles), + json.dumps(volatile_topics), + json.dumps(config.user_role_ids), + json.dumps(hide_attributes))) # Check if at least one host in a folder (or its subfolders) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index fd9bf16..abe81ab 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -36,7 +36,7 @@ def init_rowselect(view): 'g_page_id = "view-%s";\n' 'g_selection = "%s";\n' 'g_selected_rows = %s;\n' - 'init_rowselect();' % (view['name'], weblib.selection_id(), repr(selected)) + 'init_rowselect();' % (view['name'], weblib.selection_id(), json.dumps(selected)) ) def render_checkbox(view, row, num_tds):

8 years

3850 FIX Fixed JS error when quicksearch snapin not in sidebar

by Lars Michelsen

Module: check_mk Branch: master Commit: 43da5905e1e415bbae69a3d39c7998e74fe608fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43da5905e1e415… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:41:25 2016 +0200 3850 FIX Fixed JS error when quicksearch snapin not in sidebar --- .werks/3850 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3850 b/.werks/3850 new file mode 100644 index 0000000..aad1b6d --- /dev/null +++ b/.werks/3850 @@ -0,0 +1,9 @@ +Title: Fixed JS error when quicksearch snapin not in sidebar +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1473241273 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cb56b18..6748b8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -481,6 +481,7 @@ * 3763 FIX: Fixed playing sounds in views when using current Firefox... * 3779 FIX: availability: added validation of availability options * 3767 FIX: Fixed possible UnicodeDecodeError when having users with umlauts in the user ID + * 3850 FIX: Fixed JS error when quicksearch snapin not in sidebar WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 18ad0f6..cecbc0f 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -89,7 +89,8 @@ function registerEdgeListeners(obj) { } function on_mouse_leave(e) { - mkSearchClose(); + if (typeof(mkSearchClose) != "undefined") + mkSearchClose(); return stop_snapin_dragging(e); }

8 years

Fixed another non json encoded data serialization for JS

by Lars Michelsen

Module: check_mk Branch: master Commit: b3d7b223ee675c3c717a3a252b8356ce19c913dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d7b223ee675c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:41:02 2016 +0200 Fixed another non json encoded data serialization for JS --- web/htdocs/dashboard.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index eab84c4..0e90b16 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -29,6 +29,11 @@ from valuespec import * from lib import * import wato +try: + import simplejson as json +except ImportError: + import json + loaded_with_language = False builtin_dashboards = {} builtin_dashboards_transformed = False @@ -410,7 +415,7 @@ window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); """ % (MAX, GROW, raster, header_height, screen_margin, dashlet_padding, dashlet_min_size, corner_overlap, ','.join(g_refresh_dashlets), ','.join(g_on_resize), - name, board['mtime'], repr(g_dashlets_js))) + name, board['mtime'], json.dumps(g_dashlets_js))) if mode == 'edit': html.javascript('toggle_dashboard_edit(true)')

8 years

Fixed another wrong data serialization to JS

by Lars Michelsen

Module: check_mk Branch: master Commit: e33696bf4cb96ea36bb42a5866fe6de6e527e91c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e33696bf4cb96e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:09:32 2016 +0200 Fixed another wrong data serialization to JS --- web/htdocs/htmllib.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d430557..a424e02 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1556,10 +1556,11 @@ class html(GUITester): if self.have_help: self.javascript("enable_help();") if self.keybindings_enabled and self.keybindings: - self.javascript("var keybindings = %r;\n" + self.javascript("var keybindings = %s;\n" "document.body.onkeydown = keybindings_keydown;\n" "document.body.onkeyup = keybindings_keyup;\n" - "document.body.onfocus = keybindings_focus;\n" % self.keybindings) + "document.body.onfocus = keybindings_focus;\n" % + json.dumps(self.keybindings)) if self.final_javascript_code: self.javascript(self.final_javascript_code) self.write("</body></html>\n")

8 years

Fixed broken virtual host tree link on icon

by Lars Michelsen

Module: check_mk Branch: master Commit: fe1c1c4f5961fb9e15c266a265fc700e17fbb920 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe1c1c4f5961fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:09:47 2016 +0200 Fixed broken virtual host tree link on icon --- web/plugins/sidebar/shipped.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a5f0019..e6f1950 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1857,7 +1857,7 @@ def render_tag_tree_level(taggroups, path, cwd, title, tree): if tag_tree_has_svc_problems(tree): bullet += html.render_icon_button(tag_tree_url(taggroups, path, "svcproblems"), _("Show the service problems contained in this branch"), - "svc_problems") + "svc_problems", target="main") if path: html.begin_foldable_container("tag-tree", ".".join(map(str, path)),

8 years

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016