Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: WATO: fix inventory of SNMP services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5dc8a175cfd8366ac093bdab8261e4c4e5ea30ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dc8a175cfd836… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 12:54:39 2011 +0200 WATO: fix inventory of SNMP services --- modules/check_mk.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f782e16..ac0bc3e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1637,11 +1637,11 @@ def create_nagios_config_commands(outfile): # +----------------------------------------------------------------------+ -def inventorable_checktypes(what): # tcp, all +def inventorable_checktypes(what): # snmp, tcp, all checknames = [ k for k in check_info.keys() if check_info[k][3] != no_inventory_possible # and (k not in ignored_checktypes) - and (what == "all" or k.split('.')[0] not in snmp_info) + and (what == "all" or ((k.split('.')[0] in snmp_info) == (what == "snmp"))) ] checknames.sort() return checknames

13 years, 3 months

Check_MK Git: check_mk: WATO: fix inventory with full-scan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ddda910d1781e3d35ca9ff4a57d71fa4ecb207e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ddda910d1781e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 12:55:04 2011 +0200 WATO: fix inventory with full-scan --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 76b502c..a308f82 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1944,6 +1944,9 @@ def show_service_table(hostname, firsttime): html.button("_save", _("Save manual check configuration")) html.hidden_fields() + if html.var("_scan"): + html.hidden_field("_scan", "on") + html.write("<table class=data>\n") for state_name, state_type, checkbox in [

13 years, 3 months

Check_MK Git: check_mk: Multisite javascript ajax: Sauberere Fehlerbehandlung

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fed6cf8fdb93fbf4d88f92e8f37710536b4fad2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed6cf8fdb93fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 10:19:23 2011 +0200 Multisite javascript ajax: Sauberere Fehlerbehandlung --- web/htdocs/js/wato.js | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index dfeab39..1779d93 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -101,14 +101,12 @@ function progress_handle_response(data, code) { var header = null; try { var header = eval(code.split("\n", 1)[0]); + if (header === null) + alert('Header is null!'); } catch(err) { alert('Invalid response: ' + code); } - if (header === null) { - alert('Header is null!'); - } - // Extract the body from the response var body = code.split('\n'); body.splice(0,1);

13 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c4ad2f7f692f45f8ace1e8b770d355c113bf98a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c4ad2f7f692f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 10:19:29 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Dashbaord Eventview simplified

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 895f660f0b75f739d4b86794365e253883bfa5ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895f660f0b75f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 10:18:52 2011 +0200 Dashbaord Eventview simplified --- web/plugins/views/dashboard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/dashboard.py b/web/plugins/views/dashboard.py index ccc9bb9..7543430 100644 --- a/web/plugins/views/dashboard.py +++ b/web/plugins/views/dashboard.py @@ -150,10 +150,10 @@ multisite_builtin_views.update({ 'owner': 'admin', 'painters': [('log_icon', None), ('log_time', None), - ('log_type', None), + # ('log_type', None), ('host', 'hostsvcevents'), ('service_description', 'svcevents'), - ('log_state_type', None), + # ('log_state_type', None), ('log_plugin_output', None)],

13 years, 3 months

Check_MK Git: check_mk: WATO: fix problem in API

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 277eaf2fbfbfb44c50018e57b2bd460d4fc09499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=277eaf2fbfbfb4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 10:07:00 2011 +0200 WATO: fix problem in API --- web/htdocs/wato.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ed486b0..76b502c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1867,7 +1867,7 @@ def get_folder_and_file(): def make_path(filename): if not filename or filename == "/": return () - parts = filename[1:].rstrip("/").split("/") + parts = filename.strip("/").split("/") return tuple(parts) # Create link keeping the context to the current folder / file @@ -2808,6 +2808,10 @@ class API: return g_root_folder elif path[-1].endswith(".mk"): folder = self.get_folder(path[:-1]) + if not folder: + raise MKGeneralException("No WATO folder %s." % (path,)) + if ".files" not in folder: + raise MKGeneralException("Path %s does not point to a WATO file." % (path,)) return folder[".files"].get(path[-1]) else: return self.get_folder(path)

13 years, 3 months

Check_MK Git: check_mk: Fix two bugs in view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e519d34f7be39616c510688f68deb2eb6430b122 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e519d34f7be396… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 28 17:47:32 2011 +0200 Fix two bugs in view editor --- web/htdocs/views.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 569e4ea..4539e10 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -652,7 +652,7 @@ function toggle_section(nr, oImg) { for n in range(1, maxnum): view_edit_column(n, var_prefix, maxnum, allowed, joined) html.write('</div>') - html.buttonlink("javascript:add_view_column(%d, '%s', '%s')" % (id, datasourcename, var_prefix), "Add Column") + html.jsbutton('add_column', _("Add Column"), "add_view_column(%d, '%s', '%s')" % (id, datasourcename, var_prefix)) section_footer(id) # [4] Sorting @@ -770,7 +770,7 @@ def load_view_into_html_vars(view): html.set_var("view_title", view["title"]) html.set_var("view_topic", view.get("topic", "Other")) html.set_var("view_linktitle", view.get("linktitle", view["title"])) - html.set_var("view_icon", view.get("icon", "")), + html.set_var("view_icon", view.get("icon")), html.set_var("view_description", view.get("description", "")) html.set_var("view_name", view["name"]) html.set_var("datasource", view["datasource"]) @@ -1516,6 +1516,13 @@ def show_context_links(thisview, active_filters): # Retrieve data via livestatus, convert into list of dicts, # prepare row-function needed for painters +# datasource: the datasource object as defined in plugins/views/datasources.py +# columns: the list of livestatus columns to query +# add_columns: list of columns the datasource is known to add itself +# (couldn't we get rid of this parameter by looking that up ourselves?) +# add_headers: additional livestatus headers to add +# only_sites: list of sites the query is limited to +# limit: maximum number of data rows to query def query_data(datasource, columns, add_columns, add_headers, only_sites = [], limit = None): tablename = datasource["table"] add_headers += datasource.get("add_headers", "")

13 years, 3 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: 0ea61b9a7b8023b1c6a2617cb106823ce206713c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ea61b9a7b8023… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 09:37:13 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Fix handling of None in htmllib.set_var()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26cf6b58de7f4470249aa6dd9c4150f16f67035f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26cf6b58de7f44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 28 17:47:59 2011 +0200 Fix handling of None in htmllib.set_var() --- web/htdocs/htmllib.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b1099d9..7b3cccc 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -105,6 +105,8 @@ def urlencode_vars(vars): def urlencode(value): if type(value) == unicode: value = value.encode("utf-8") + elif value == None: + return "" ret = "" for c in value: if c == " ": @@ -658,7 +660,10 @@ class html: return val.decode("utf-8") def set_var(self, varname, value): - self.req.vars[varname] = value + if value == None: + self.del_var(varname) + else: + self.req.vars[varname] = value def del_var(self, varname): if varname in self.req.vars:

13 years, 3 months

Check_MK Git: check_mk: Livestatus: fix stats grouped by time columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 170f8078442a9062a9f81a5b1f2c5a5aeccacdaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=170f8078442a90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 28 17:46:07 2011 +0200 Livestatus: fix stats grouped by time columns --- livestatus/src/OffsetTimeColumn.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/livestatus/src/OffsetTimeColumn.h b/livestatus/src/OffsetTimeColumn.h index 8129738..fbdace0 100644 --- a/livestatus/src/OffsetTimeColumn.h +++ b/livestatus/src/OffsetTimeColumn.h @@ -43,7 +43,6 @@ public: int type() { return COLTYPE_TIME; } void output(void *data, Query *query); Filter *createFilter(int operator_id, char *value); - string valueAsString(void *data __attribute__ ((__unused__)), Query *) { return "invalid"; } };

13 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011