Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Replaced wrong repr() data handover of data from python to JS with json

by Lars Michelsen

Module: check_mk Branch: master Commit: a2935764e8815fb9de34beb6a02fe2c84a8701d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2935764e8815f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:05:51 2016 +0200 Replaced wrong repr() data handover of data from python to JS with json --- web/htdocs/js/checkmk.js | 2 -- web/htdocs/js/prediction.js | 7 ------- web/htdocs/prediction.py | 23 +++++++++++++++-------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 83470d4..4690d0b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2823,8 +2823,6 @@ function show_hover_menu(event, code) document.body.appendChild(g_hover_menu); } g_hover_menu.innerHTML = code; - // TOOD: Hier weitermachen. Der <javascript...create_graph()> kommt korrekt an. - // Aber wird irgendwie nicht ausgeführt, denn das Menü bleibt unsichtbar. executeJSbyObject(g_hover_menu); // Change cursor to "hand" when displaying hover menu diff --git a/web/htdocs/js/prediction.js b/web/htdocs/js/prediction.js index f0284fc..9b6a7f0 100644 --- a/web/htdocs/js/prediction.js +++ b/web/htdocs/js/prediction.js @@ -37,8 +37,6 @@ var right_border = 50; var top_border = 40; var bottom_border = 50; -var None = null; // make us compatible with Python repr() - function create_graph(cid, ft, ut, vmi, vma) { // Keep important data as global variables, needed by @@ -54,11 +52,6 @@ function create_graph(cid, ft, ut, vmi, vma) height = canvas.height; netto_width = width - left_border - right_border; netto_height = height - top_border - bottom_border; - - // Point background and coordinates - // var c = canvas.getContext('2d'); - // c.fillStyle="#eeeeee"; - // c.fillRect(0, 0, width, height); } function arrow_up(c, cx, cy, length, size, color) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index d0e1d11..1b37350 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -32,6 +32,12 @@ import config import sites from lib import * +try: + import simplejson as json +except ImportError: + import json + + graph_size = 2000, 700 @@ -133,7 +139,6 @@ def page_graph(): render_curve(swapped["upper_crit"], "#f0b0b0", square=True) render_curve(swapped["average"], "#000000") render_curve(swapped["average"], "#000000") - # render_curve(stack(swapped["average"], swapped["stdev"], -1), "#008040") # Try to get current RRD data and render it also from_time, until_time = timegroup["range"] @@ -326,21 +331,23 @@ def create_graph(name, size, range, v_range, legend): name, range[0], range[1], v_range[0], v_range[1])) def render_coordinates(v_scala, t_scala): - html.javascript('render_coordinates(%r, %r);' % (v_scala, t_scala)) + html.javascript('render_coordinates(%s, %s);' % (json.dumps(v_scala), json.dumps(t_scala))) def render_curve(points, color, width=1, square=False): - html.javascript('render_curve(%r, %r, %d, %d);' % ( - points, color, width, square and 1 or 0)) + html.javascript('render_curve(%s, %s, %d, %d);' % ( + json.dumps(points), json.dumps(color), width, square and 1 or 0)) def render_point(t, v, color): - html.javascript('render_point(%r, %r, %r);' % (t, v, color)) + html.javascript('render_point(%s, %s, %s);' % (json.dumps(t), json.dumps(v), json.dumps(color))) def render_area(points, color, alpha=1.0): - html.javascript('render_area(%r, %r, %f);' % (points, color, alpha)) + html.javascript('render_area(%s, %s, %f);' % (json.dumps(points), json.dumps(color), alpha)) def render_area_reverse(points, color, alpha=1.0): - html.javascript('render_area_reverse(%r, %r, %f);' % (points, color, alpha)) + html.javascript('render_area_reverse(%s, %s, %f);' % + (json.dumps(points), json.dumps(color), alpha)) def render_dual_area(lower_points, upper_points, color, alpha=1.0): - html.javascript('render_dual_area(%r, %r, %r, %f);' % (lower_points, upper_points, color, alpha)) + html.javascript('render_dual_area(%s, %s, %s, %f);' % + (json.dumps(lower_points), json.dumps(upper_points), json.dumps(color), alpha))

8 years, 2 months

Fixed another wrong data serialization to JS

by Lars Michelsen

Module: check_mk Branch: master Commit: 0841ea5f07663a49d95a0fab3c06d58afb08fb37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0841ea5f07663a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:22:13 2016 +0200 Fixed another wrong data serialization to JS --- web/htdocs/help.py | 7 ++++++- web/htdocs/sidebar.py | 9 +++++++-- web/htdocs/wato.py | 11 ++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/web/htdocs/help.py b/web/htdocs/help.py index 28b579e..79f9b4f 100644 --- a/web/htdocs/help.py +++ b/web/htdocs/help.py @@ -26,7 +26,12 @@ import config +try: + import simplejson as json +except ImportError: + import json + def ajax_switch_help(): state = html.var("enabled", "") != "" config.save_user_file("help", state) - html.write("%r" % state) + html.write(json.dumps(state)) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 536a0cc..b4c33d4 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -34,6 +34,11 @@ import notify, werks import sites from lib import * +try: + import simplejson as json +except ImportError: + import json + # Constants to be used in snapins snapin_width = 230 @@ -277,8 +282,8 @@ def page_side(): html.write("sidebar_update_interval = %0.2f;\n" % config.sidebar_update_interval) html.write("registerEdgeListeners();\n") html.write("set_sidebar_size();\n") - html.write("refresh_snapins = %r;\n" % refresh_snapins) - html.write("restart_snapins = %r;\n" % restart_snapins) + html.write("refresh_snapins = %s;\n" % json.dumps(refresh_snapins)) + html.write("restart_snapins = %s;\n" % json.dumps(restart_snapins)) html.write("sidebar_scheduler();\n") html.write("window.onresize = function() { set_sidebar_size(); };\n") html.write("if (contentFrameAccessible()) { update_content_location(); };\n") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b581b29..2b7e0d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -101,6 +101,11 @@ from watolib import * import cmk.store as store from cmk.regex import escape_regex_chars, regex +try: + import simplejson as json +except ImportError: + import json + g_html_head_open = False wato_styles = [ "pages", "wato", "status" ] @@ -830,8 +835,8 @@ def show_hosts(folder): html.javascript( 'g_page_id = "wato-folder-%s";\n' 'g_selection = "%s";\n' - 'g_selected_rows = %r;\n' - 'init_rowselect();' % ('/' + folder.path(), weblib.selection_id(), selected) + 'g_selected_rows = %s;\n' + 'init_rowselect();' % ('/' + folder.path(), weblib.selection_id(), json.dumps(selected)) ) @@ -3899,7 +3904,7 @@ def mode_parentscan(phase): gwcreat and 1 or 0, # Gateway hosts created state in [ "failed", "dnserror", "garbled" ] and 1 or 0, # Errors ] - result = "%r\n%s: %s<br>\n" % (counts, host_name, message) + 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"

8 years, 2 months

Fixed another wrong data serialization to JS

by Lars Michelsen

Module: check_mk Branch: master Commit: dc8443d282993198d072c766962106ebbb8ba04d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc8443d2829931… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:12:26 2016 +0200 Fixed another wrong data serialization to JS --- web/plugins/sidebar/shipped.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e6f1950..39fa1c4 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1833,8 +1833,8 @@ def tag_tree_url(taggroups, taglist, viewname): def tag_tree_bullet(state, path, leaf): code = '<div class="tagtree %sstatebullet state%d"> </div>' % ((leaf and "leaf " or ""), state) if not leaf: - code = '<a title="%s" href="javascript:virtual_host_tree_enter(%r);">' % \ - (_("Display the tree only below this node"), "|".join(path)) + code + "</a>" + code = '<a title="%s" href="javascript:virtual_host_tree_enter(\'%s\');">%s</a>' % \ + (_("Display the tree only below this node"), "|".join(path), code) return code + " " @@ -1922,7 +1922,7 @@ def render_tag_tree(): # Give chance to change one level up, if we are in a subtree cwd = tree_conf["cwd"].get(tree_conf["tree"]) if cwd: - upurl = "javascript:virtual_host_tree_enter(%r)" % "|".join(cwd[:-1]) + upurl = "javascript:virtual_host_tree_enter('%s')" % "|".join(cwd[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") html.select("vtree", choices, str(tree_conf["tree"]), onchange = 'virtual_host_tree_changed(this)')

8 years, 2 months

3744 synology_info: Now also displays OS version

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2e0a32f9cc40b62f168355f998e2c9232184d841 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0a32f9cc40b6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 7 11:00:13 2016 +0200 3744 synology_info: Now also displays OS version --- .werks/3744 | 9 +++++++++ ChangeLog | 1 + checks/synology_info | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3744 b/.werks/3744 new file mode 100644 index 0000000..9562fa8 --- /dev/null +++ b/.werks/3744 @@ -0,0 +1,9 @@ +Title: synology_info: Now also displays OS version +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473238791 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fa3c871..cb56b18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -154,6 +154,7 @@ * 3867 filter 'Servicegroup (Regex)' can be negated * 3868 f5_bigip_cluster_status: node states are configurable for F5 BigIP devices since version 11.2 * 3869 ipmi: now IPMI sensors can be ignored by their status texts during discovery + * 3744 synology_info: Now also displays OS version * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/synology_info b/checks/synology_info index f40aeba..df6c674 100644 --- a/checks/synology_info +++ b/checks/synology_info @@ -28,8 +28,8 @@ def inventory_synology_info(info): return [(None, None)] def check_synology_info(_no_item, _no_params, info): - model, serial = info[0] - return 0, "Model: %s, S/N: %s" % (model, serial) + model, serial, osver = info[0] + return 0, "Model: %s, S/N: %s, OS Version: %s" % (model, serial, osver) check_info["synology_info"] = { "check_function" : check_synology_info, @@ -39,6 +39,7 @@ check_info["synology_info"] = { "snmp_info" : (".1.3.6.1.4.1.6574.1.5", [ 1, #Model 2, #SerialNumber + 3, #OS Version ]), "includes" : [ "synology.include" ] }

8 years, 2 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 387510a9a2a84edef9680b16473765c08bb2bf53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=387510a9a2a84e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Sep 7 09:41:28 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/opids.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/livestatus/src/opids.cc b/livestatus/src/opids.cc index ad43801..914b541 100644 --- a/livestatus/src/opids.cc +++ b/livestatus/src/opids.cc @@ -41,9 +41,13 @@ unordered_map<string, RelationalOperator> fromString = { {"~~", RelationalOperator::matches_icase}, {"!~~", RelationalOperator::doesnt_match_icase}, {"<", RelationalOperator::less}, + {"!<", RelationalOperator::greater_or_equal}, {">=", RelationalOperator::greater_or_equal}, + {"!>=", RelationalOperator::less}, {">", RelationalOperator::greater}, - {"<=", RelationalOperator::less_or_equal}}; + {"!>", RelationalOperator::less_or_equal}, + {"<=", RelationalOperator::less_or_equal}, + {"!<=", RelationalOperator::greater}}; } // namespace ostream &operator<<(ostream &os, const RelationalOperator &relOp) {

8 years, 2 months

Added todo note

by Lars Michelsen

Module: check_mk Branch: master Commit: b4ac9a40419715ad5c6e05f165185ea99b268ee8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4ac9a40419715… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 08:47:16 2016 +0200 Added todo note --- doc/treasures/active_checks/check_cpu_peaks | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/active_checks/check_cpu_peaks b/doc/treasures/active_checks/check_cpu_peaks index a757699..a359be3 100755 --- a/doc/treasures/active_checks/check_cpu_peaks +++ b/doc/treasures/active_checks/check_cpu_peaks @@ -34,6 +34,7 @@ class MKGeneralException(Exception): # Note: This check only works in an OMD environment! +# TODO: Clean this mess up! Define and use an official API to predictive monitoring. sys.path.append(os.path.expanduser("~/share/check_mk/modules")) execfile(os.path.expanduser("~/etc/check_mk/defaults")) execfile(os.path.expanduser("~/share/check_mk/modules/prediction.py"))

8 years, 2 months

3849 FIX check_cpu_peaks: Fixed broken active check

by Lars Michelsen

Module: check_mk Branch: master Commit: 828fd1fa2bf6394a7264dd8a4a56427dc6b8a533 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=828fd1fa2bf639… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 08:46:14 2016 +0200 3849 FIX check_cpu_peaks: Fixed broken active check --- .werks/3849 | 9 +++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_cpu_peaks | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3849 b/.werks/3849 new file mode 100644 index 0000000..e1c4d7b --- /dev/null +++ b/.werks/3849 @@ -0,0 +1,9 @@ +Title: check_cpu_peaks: Fixed broken active check +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473230761 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d6abff0..fa3c871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -375,6 +375,7 @@ * 3798 FIX: Clusters: Fixed invalid timestamp of last cached agent data... * 3836 FIX: Fixed perfometer in kentix multisensor rack... * 3848 FIX: megaraid_pdisks: Handle "rebuild" state as WARNING instead of UNKNOWN + * 3849 FIX: check_cpu_peaks: Fixed broken active check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_cpu_peaks b/doc/treasures/active_checks/check_cpu_peaks index 8635645..a757699 100755 --- a/doc/treasures/active_checks/check_cpu_peaks +++ b/doc/treasures/active_checks/check_cpu_peaks @@ -35,8 +35,9 @@ class MKGeneralException(Exception): # Note: This check only works in an OMD environment! sys.path.append(os.path.expanduser("~/share/check_mk/modules")) -execfile(os.path.expanduser("~/etc/check_mk/defaults"), globals()) -execfile(os.path.expanduser("~/share/check_mk/modules/prediction.py"), globals()) +execfile(os.path.expanduser("~/etc/check_mk/defaults")) +execfile(os.path.expanduser("~/share/check_mk/modules/prediction.py")) +execfile(os.path.expanduser("~/share/check_mk/modules/check_mk_base.py")) rrdcached_socket = None def usage():

8 years, 2 months

Added pylint checker for not working localized strings

by Lars Michelsen

Module: check_mk Branch: master Commit: a03dca43bb92baf28d37b9b3e5dde2ba7745f113 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a03dca43bb92ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 19:50:56 2016 +0200 Added pylint checker for not working localized strings --- tests/testlib/pylint_checker_wrong_i18n.py | 78 ++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/tests/testlib/pylint_checker_wrong_i18n.py b/tests/testlib/pylint_checker_wrong_i18n.py new file mode 100644 index 0000000..3cc6405 --- /dev/null +++ b/tests/testlib/pylint_checker_wrong_i18n.py @@ -0,0 +1,78 @@ +"""Checker for incorrect string translation functions.""" + +import six + +import astroid + +from pylint.checkers import BaseChecker, utils +from pylint.interfaces import IAstroidChecker + +BASE_ID = 76 + +def register(linter): + """Register checkers.""" + linter.register_checker(TranslationStringConstantsChecker(linter)) + + +class TranslationStringConstantsChecker(BaseChecker): + """ + Checks for i18n translation functions (_, ugettext, ungettext, and many + others) being called on something that isn't a string literal. + + Bad: + _("hello {}".format(name)) + ugettext("Hello " + name) + ugettext(value_from_database) + + OK: + _("hello {}").format(name) + + The message id is `translation-of-non-string`. + + """ + + __implements__ = (IAstroidChecker,) + + name = 'translation-string-checker' + + TRANSLATION_FUNCTIONS = set([ + '_', + 'gettext', + 'ngettext', 'ngettext_lazy', + 'npgettext', 'npgettext_lazy', + 'pgettext', 'pgettext_lazy', + 'ugettext', 'ugettext_lazy', 'ugettext_noop', + 'ungettext', 'ungettext_lazy', + ]) + + MESSAGE_ID = 'translation-of-non-string' + msgs = { + 'E%d10' % BASE_ID: ( + "i18n function %s() must be called with a literal string", + MESSAGE_ID, + "i18n functions must be called with a literal string", + ), + } + + @utils.check_messages(MESSAGE_ID) + def visit_callfunc(self, node): + """Called for every function call in the source code.""" + if not isinstance(node.func, astroid.Name): + # It isn't a simple name, can't deduce what function it is. + return + + if node.func.name not in self.TRANSLATION_FUNCTIONS: + # Not a function we care about. + return + + if not self.linter.is_message_enabled(self.MESSAGE_ID, line=node.fromlineno): + return + + first = node.args[0] + if isinstance(first, astroid.Const): + if isinstance(first.value, six.string_types): + # The first argument is a constant string! All is well! + return + + # Bad! + self.add_message(self.MESSAGE_ID, args=node.func.name, node=node)

8 years, 2 months

Enabled new pylint checker

by Lars Michelsen

Module: check_mk Branch: master Commit: ab9b5ea499ccb9a4c6d471a780d5c64c27e8fa55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab9b5ea499ccb9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 19:51:22 2016 +0200 Enabled new pylint checker --- tests/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index b6cb84e..e06c4a9 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -1,7 +1,7 @@ [MASTER] # Setup the python paths needed for our tests init-hook='import sys, os; test_path = os.environ.get("TEST_PATH", os.environ["HOME"] + "/git/check_mk/tests"); sys.path.insert(0, test_path) ; import conftest' -load-plugins=testlib.pylint_cmk +load-plugins=testlib.pylint_cmk,testlib.pylint_checker_wrong_i18n persistent=yes # We only want to see errors for the moment. Disable this one day. But prepare to cleanup a lot of stuff. errors-only=yes

8 years, 2 months

Fixed a lot of not working localizations

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bdbe9b4023d1901a61ca1176d7aa070f08c40f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bdbe9b4023d19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 21:53:11 2016 +0200 Fixed a lot of not working localizations --- web/htdocs/backup.py | 4 +- web/htdocs/dashboard.py | 6 +- web/htdocs/index.py | 2 +- web/htdocs/login.py | 2 +- web/htdocs/mkeventd.py | 8 +-- web/htdocs/mobile.py | 7 ++- web/htdocs/multitar.py | 4 +- web/htdocs/sidebar.py | 6 +- web/htdocs/userdb.py | 24 ++++---- web/htdocs/valuespec.py | 65 +++++++++++--------- web/htdocs/wato.py | 116 +++++++++++++++++------------------ web/htdocs/watolib.py | 23 ++++--- web/plugins/icons/builtin.py | 7 ++- web/plugins/metrics/check_mk.py | 68 ++++++++++---------- web/plugins/userdb/ldap.py | 6 +- web/plugins/views/availability.py | 2 +- web/plugins/views/commands.py | 4 +- web/plugins/views/sorters.py | 20 +++--- web/plugins/visuals/filters.py | 3 +- web/plugins/wato/bi.py | 12 ++-- web/plugins/wato/check_parameters.py | 6 +- web/plugins/wato/mkeventd.py | 40 ++++++------ 22 files changed, 222 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bdbe9b402…

8 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
30
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