Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

fixed: mssql.vbs script didn' t print an error if no sql server was recognized

by Sebastian Herbord

Module: check_mk Branch: master Commit: de84ededb8de2bb7188b269fb7e61fec89e05347 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de84ededb8de2b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jan 13 17:52:04 2016 +0100 fixed: mssql.vbs script didn't print an error if no sql server was recognized --- agents/windows/plugins/mssql.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index a387255..5a1e64d 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -117,7 +117,7 @@ If Err.Number <> 0 Then ' try MSSQL < 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") If Err.Number <> 0 Then - addOutput( "Error: " & Err.Number & " " & Err.Description ) + WScript.echo "Error: " & Err.Number & " " & Err.Description Err.Clear() wscript.quit() End If

8 years, 8 months

Updated bug entries #2418

by Mathias Kettner

Module: check_mk Branch: master Commit: c5c45f4c558adde3a1fa8168bc322b857eef6d96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5c45f4c558add… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 12 14:27:25 2016 +0100 Updated bug entries #2418 --- .bugs/2418 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.bugs/2418 b/.bugs/2418 new file mode 100644 index 0000000..0d93e47 --- /dev/null +++ b/.bugs/2418 @@ -0,0 +1,18 @@ +Title: Replace factory_settings[] and ..._default_levels with "default_params" in check_info +Component: core +State: open +Date: 2016-01-12 14:25:05 +Targetversion: future +Class: todo + +We can now remove the ..._default_levels in the checks because almost no +one uses them in main.mk manually. WATO does not need them. So rather +introduce a new optional key default_params in check_info["foo"] for setting +default params. + +If the type of those is dict, then merging takes place and the discovery +function must return a dict as params. + +If the type is not dict, then not merging takes place in the discovery +function can return None -> default params are being used, or any other +value -> that is being used.

8 years, 8 months

Maked (almost) all addColumn methods static, which they actually are.

by Sven Panne

Module: check_mk Branch: master Commit: f8ff06734777aeb1c1477bbb7765d23d72d7a3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8ff06734777ae… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 13 16:02:03 2016 +0100 Maked (almost) all addColumn methods static, which they actually are. --- livestatus/src/TableCommands.cc | 1 + livestatus/src/TableCommands.h | 2 +- livestatus/src/TableContactgroups.cc | 1 + livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.cc | 1 + livestatus/src/TableContacts.h | 2 +- livestatus/src/TableDownComm.cc | 2 +- livestatus/src/TableHostgroups.cc | 1 + livestatus/src/TableHostgroups.h | 2 +- livestatus/src/TableHosts.cc | 4 ++-- livestatus/src/TableHosts.h | 2 +- livestatus/src/TableLog.cc | 7 ++++--- livestatus/src/TableLog.h | 2 +- livestatus/src/TableServicegroups.cc | 1 + livestatus/src/TableServicegroups.h | 2 +- livestatus/src/TableServices.cc | 6 +++--- livestatus/src/TableStateHistory.cc | 5 +++-- livestatus/src/TableTimeperiods.cc | 1 + livestatus/src/TableTimeperiods.h | 2 +- 19 files changed, 27 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f8ff067347…

8 years, 8 months

Nitpicking: Make -Wpedantic happy.

by Sven Panne

Module: check_mk Branch: master Commit: 670cba22e3b70381d6c8aff7f47e7a8e1c8875ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=670cba22e3b703… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 13 15:43:59 2016 +0100 Nitpicking: Make -Wpedantic happy. --- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/waittriggers.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 4b04765..80c5428 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -828,7 +828,7 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) _abort_query = !query->processDataset(hs_state); hs_state->_from = hs_state->_until; -}; +} bool TableStateHistory::isAuthorized(contact *ctc, void *data) { diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index 2bdf241..a50b703 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -53,7 +53,7 @@ condition_variable cond_downtime; condition_variable cond_comment; condition_variable cond_command; condition_variable cond_program; -}; +} struct trigger *trigger_all() {

8 years, 8 months

Make *all* Column fields private, having some public fields is just confusing.

by Sven Panne

Module: check_mk Branch: master Commit: afeafe888fb782e2cdf85a0bbf09b9f5c826b47b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afeafe888fb782… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 13 15:24:12 2016 +0100 Make *all* Column fields private, having some public fields is just confusing. --- livestatus/src/Column.h | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index c594d2a..9c4a56b 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -45,7 +45,6 @@ class Column { std::string _name; std::string _description; -public: int _indirect_offset; int _extra_offset;

8 years, 8 months

icons_and_actions_of: The checkname is now optional

by Lars Michelsen

Module: check_mk Branch: master Commit: aeb5298db9666c7757fea81154e09040f4d54cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb5298db9666c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 13 13:24:16 2016 +0100 icons_and_actions_of: The checkname is now optional --- modules/check_mk.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 438c505..e8c1ad4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1116,11 +1116,12 @@ def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, param actions = set(service_extra_conf(hostname, svcdesc, service_icons_and_actions)) # Some WATO rules might register icons on their own - checkgroup = check_info[checkname]["group"] - if checkgroup in [ 'ps', 'services' ] and type(params) == dict: - icon = params.get('icon') - if icon: - actions.add(icon) + if checkname: + checkgroup = check_info[checkname]["group"] + if checkgroup in [ 'ps', 'services' ] and type(params) == dict: + icon = params.get('icon') + if icon: + actions.add(icon) return list(actions)

8 years, 8 months

#2901 FIX Fixed issue editing availability annotations

by Lars Michelsen

Module: check_mk Branch: master Commit: b111ab7718e251fde58340ee2e2849c1e9ba21aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b111ab7718e251… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 13 10:58:33 2016 +0100 #2901 FIX Fixed issue editing availability annotations Fixed a possible "Internal Server Error" when trying to edit annotations of the Check_MK Availability which contains special characters in the text. --- .werks/2901 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 10 +++++++++- web/plugins/views/availability.py | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2901 b/.werks/2901 new file mode 100644 index 0000000..c331de6 --- /dev/null +++ b/.werks/2901 @@ -0,0 +1,10 @@ +Title: Fixed issue editing availability annotations +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1452679030 +Class: fix + +Fixed a possible "Internal Server Error" when trying to edit annotations of +the Check_MK Availability which contains special characters in the text. diff --git a/ChangeLog b/ChangeLog index 32c20d9..687eb47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ * 2895 FIX: Fixed broken "back to view" links after checkbox actions in views... * 2896 FIX: Improved handling of wrong encoded input strings... * 2822 FIX: Availabiltiy: Fixed exception while rendering the timeline... + * 2901 FIX: Fixed issue editing availability annotations... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 56c5ff9..a354f3b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -181,7 +181,15 @@ class html(GUITester): def flush(self): if self.plugged: - self.lowlevel_write(self.plugged_text) + text = self.plugged_text + + # encode when really writing out the data. Not when writing plugged, + # because the plugged code will be handled somehow by our code. We + # only encode when leaving the pythonic world. + if type(text) == unicode: + text = text.encode("utf-8") + + self.lowlevel_write(text) self.plugged_text = '' def drain(self): diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 43f0225..68dc92f 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -715,6 +715,7 @@ def edit_annotation(): annotation["service"] = service annotation["site"] = site_id + # FIXME: Why use plugging here? Can we clean this up? html.plug() title = _("Edit annotation of ") + hostname

8 years, 8 months

WATO rework. fixed exception in parameter overview

by Andreas Boesl

Module: check_mk Branch: master Commit: 9c9eb89225ff7455233fb8543c593c3b12e60708 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c9eb89225ff74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 13 10:47:38 2016 +0100 WATO rework. fixed exception in parameter overview --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e42cfa..e2281ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2196,12 +2196,12 @@ def mode_object_parameters(phase): url = folder_preserving_link([ ('mode', 'edit_rule'), ('varname', "custom_checks"), - ('rule_folder', rule[0][".path"]), + ('rule_folder', rule[0].path()), ('rulenr', rel_nr), ('host', hostname)]) html.write('<table class=setting><tr><td class=reason><a href="%s">%s %d %s %s</a></td>' % ( - url, _("Rule"), rel_nr + 1, _("in"), rule[0]["title"])) + url, _("Rule"), rel_nr + 1, _("in"), rule[0].title())) html.write("<td class=settingvalue used>") if "command_line" in serviceinfo: html.write("<tt>%s</tt>" % serviceinfo["command_line"])

8 years, 8 months

#2825 FIX Parameter overview page no longer raises an exception in certain scenarios

by Andreas Boesl

Module: check_mk Branch: master Commit: 12d6172cafda8a73856b436fd716532bddd8afa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12d6172cafda8a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 13 10:35:33 2016 +0100 #2825 FIX Parameter overview page no longer raises an exception in certain scenarios The parameter overview page raised an exception when the host in question never got a service discovery and had an active check configured. It also crashed for any "Classical active and passive Monitoring checks" check with configured rule options, e.g a comment was set or the rule was deactivated. --- .werks/2825 | 13 +++++++++++ ChangeLog | 1 + modules/automation.py | 59 +++++++++++++++++++++++++++---------------------- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/.werks/2825 b/.werks/2825 new file mode 100644 index 0000000..b97cc30 --- /dev/null +++ b/.werks/2825 @@ -0,0 +1,13 @@ +Title: Parameter overview page no longer raises an exception in certain scenarios +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1452677246 +Class: fix + +The parameter overview page raised an exception when the host in question never +got a service discovery and had an active check configured. + +It also crashed for any "Classical active and passive Monitoring checks" check +with configured rule options, e.g a comment was set or the rule was deactivated. diff --git a/ChangeLog b/ChangeLog index 32c20d9..28e5c20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ * 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with umlauts... * 2845 FIX: LDAP: Fixed exception in connection test on complain issue during connection creation * 2779 FIX: Fix moving of folders... + * 2825 FIX: Parameter overview page no longer raises an exception in certain scenarios... Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/modules/automation.py b/modules/automation.py index 84d9420..1944d3d 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -309,39 +309,46 @@ def automation_analyse_service(args): # our service there try: path = "%s/%s.mk" % (autochecksdir, hostname) - for entry in eval(file(path).read()): - if len(entry) == 4: # old format - hn, ct, item, params = entry - else: - ct, item, params = entry # new format without host name - hn = hostname - - if (ct, item) not in check_table: - continue # this is a removed duplicate or clustered service - descr = service_description(ct, item) - if hn == hostname and descr == servicedesc: - dlv = check_info[ct].get("default_levels_variable") - if dlv: - fs = factory_settings.get(dlv, None) + if os.path.exists(path): + for entry in eval(file(path).read()): + if len(entry) == 4: # old format + hn, ct, item, params = entry else: - fs = None - - return { - "origin" : "auto", - "checktype" : ct, - "checkgroup" : check_info[ct].get("group"), - "item" : item, - "inv_parameters" : params, - "factory_settings" : fs, - "parameters" : compute_check_parameters(hostname, ct, item, params), - } + ct, item, params = entry # new format without host name + hn = hostname + + if (ct, item) not in check_table: + continue # this is a removed duplicate or clustered service + descr = service_description(ct, item) + if hn == hostname and descr == servicedesc: + dlv = check_info[ct].get("default_levels_variable") + if dlv: + fs = factory_settings.get(dlv, None) + else: + fs = None + + return { + "origin" : "auto", + "checktype" : ct, + "checkgroup" : check_info[ct].get("group"), + "item" : item, + "inv_parameters" : params, + "factory_settings" : fs, + "parameters" : compute_check_parameters(hostname, ct, item, params), + } except: if opt_debug: raise # 3. Classical checks for nr, entry in enumerate(custom_checks): - rule, tags, hosts = entry + if len(entry) == 4: + rule, tags, hosts, options = entry + if options.get("disabled"): + continue + else: + rule, tags, hosts = entry + matching_hosts = all_matching_hosts(tags, hosts, with_foreign_hosts = True) if hostname in matching_hosts: desc = rule["service_description"]

8 years, 8 months

#2900 Bulk Host import can now handle CSV files including several host attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: fe67df25c0a37604faaf5e2591ac17602b01e935 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe67df25c0a376… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 13 10:11:48 2016 +0100 #2900 Bulk Host import can now handle CSV files including several host attributes The Bulk Host Import feature of WATO could be used for importing a list of host names before. But more complex imports like adding hosts together with a collection of initial attributes was not possible. The import has now been extended that one can upload whole CSV files or paste the contents of a CSV file into a form. Then, after the upload, a preview page is displayed to configure the parameters how to parse the CSV file and which column to assign to which host attribute. --- .werks/2900 | 15 ++ ChangeLog | 1 + web/htdocs/valuespec.py | 30 +++ web/htdocs/wato.py | 512 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 416 insertions(+), 142 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fe67df25c0…

8 years, 8 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 January 2016