Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: c12bfcb097a860a1994f7d2c67cebe0280b6ed52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c12bfcb097a860… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 13:16:40 2016 +0100 Updated bug entries #0855 --- .bugs/855 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/855 b/.bugs/855 index c934747..f19f454 100644 --- a/.bugs/855 +++ b/.bugs/855 @@ -1,8 +1,11 @@ Title: PDF Export, Host down is red instead of blue in the timeline table Component: multisite -State: open +Class: bug +State: works4me Date: 2015-10-29 09:18:23 Targetversion: 1.2.7 -Class: bug Everywere the color for host down is a dark blue. Only in the PDF file, it's a red + +2016-01-19 13:16:39: changed state open -> works4me +Seems this has been fixed. The color is OK in my tests.

8 years, 8 months

#2926 FIX Fix exception in WATO when a check man page has not catalog entry

by Mathias Kettner

Module: check_mk Branch: master Commit: db86c1ccfbe9a843e3029f0007ca7a48f1bd5237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db86c1ccfbe9a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 13:13:42 2016 +0100 #2926 FIX Fix exception in WATO when a check man page has not catalog entry --- .bugs/849 | 7 ++++--- .werks/2926 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 16 +++++++--------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.bugs/849 b/.bugs/849 index af867e8..3a49909 100644 --- a/.bugs/849 +++ b/.bugs/849 @@ -1,8 +1,9 @@ Title: Manpage without Catalog breaks Check Plugins Section in Wato Component: wato -State: open +Class: bug +State: done Date: 2015-08-05 11:04:58 Targetversion: 1.2.7 -Class: bug -See topic \ No newline at end of file +See topic +2016-01-19 13:13:20: changed state open -> done diff --git a/.werks/2926 b/.werks/2926 new file mode 100644 index 0000000..eb67489 --- /dev/null +++ b/.werks/2926 @@ -0,0 +1,9 @@ +Title: Fix exception in WATO when a check man page has not catalog entry +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1453205601 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d1341f3..e315a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 2770 FIX: Check_MK is now warning the user about deprecated but configured checkgroup parameters... * 2848 FIX: Fixed cleanup of old autocheck files of cluster hosts... * 2894 FIX: Fixed broken cluster checks when using Nagios core... + * 2926 FIX: Fix exception in WATO when a check man page has not catalog entry Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index 74361b0..3e52e02 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2337,6 +2337,7 @@ def list_all_manuals(): table.sort() print_table(['Check type', 'Title'], [tty_bold, tty_normal], table) + def read_manpage_catalog(): load_module("catalog") global g_manpage_catalog @@ -2351,18 +2352,12 @@ def read_manpage_catalog(): except Exception, e: if opt_debug: raise - sys.stderr.write('ERROR: Skipping invalid manpage: %s: %s\n' % (checkname, e)) + raise MKGeneralException('ERROR: Skipping invalid manpage: %s: %s\n' % (checkname, e)) continue - try: + if "catalog" in parsed: cat = parsed["catalog"] - except KeyError: - if opt_debug: - raise - sys.stderr.write('ERROR: Skipping invalid manpage: %s (Catalog info missing)\n' % checkname) - continue - - if not cat: + else: cat = [ "unsorted" ] if cat[0] == "os": @@ -2554,7 +2549,10 @@ def load_manpage(checkname): header[key] = value.strip() header["agents"] = [ a.strip() for a in header["agents"].split(",") ] + if 'catalog' not in header: + header['catalog'] = [ 'unsorted' ] sections['header'] = header + return sections

8 years, 8 months

#2925 FIX Editing a notification rule for a missing user selected random other user

by Mathias Kettner

Module: check_mk Branch: master Commit: 0dccf586af43aacae58ec662c009eb4746da9f73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dccf586af43aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 13:02:20 2016 +0100 #2925 FIX Editing a notification rule for a missing user selected random other user This problem happened when a user was removed from the system but a notification rule still referred to that user. You cannot save any changes now unless you select another user or deselect the whole option now. --- .bugs/2360 | 9 ++++++--- .bugs/848 | 7 +++++-- .werks/2925 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 32 +++++++++++++++++++++++--------- web/htdocs/wato.py | 1 + 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/.bugs/2360 b/.bugs/2360 index 9078342..7ab250a 100644 --- a/.bugs/2360 +++ b/.bugs/2360 @@ -1,8 +1,11 @@ Title: "Fake check results" on hosts doesn't work Component: multisite -State: open +Class: bug +State: works4me Date: 2015-08-31 16:26:06 Targetversion: 1.2.7 -Class: bug -The "Fake check results" feature on hosts allows to set the status of the host to "up", "down" or "unreachable" but this has no effect, the host status stays as it was. \ No newline at end of file +The "Fake check results" feature on hosts allows to set the status of the host to "up", "down" or "unreachable" but this has no effect, the host status stays as it was. +2016-01-19 12:39:14: changed state open -> works4me +Works for me. Could be be cause of Smart PING that updates the +state *really* fast. diff --git a/.bugs/848 b/.bugs/848 index e1bb1c3..ae25f84 100644 --- a/.bugs/848 +++ b/.bugs/848 @@ -1,8 +1,11 @@ Title: RBN: Rules after user removal Component: wato -State: open +Class: bug +State: done Date: 2015-05-13 14:56:09 Targetversion: 1.2.7 -Class: bug After removing a user in wato and editing a rbn rule explicity containg this user, the next user from the list will choiced when saving + +2016-01-19 13:00:26: changed state open -> done +The user is now forced to select a different user. diff --git a/.werks/2925 b/.werks/2925 new file mode 100644 index 0000000..40af2f8 --- /dev/null +++ b/.werks/2925 @@ -0,0 +1,11 @@ +Title: Editing a notification rule for a missing user selected random other user +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1453204832 +Class: fix + +This problem happened when a user was removed from the system but a +notification rule still referred to that user. You cannot save any changes +now unless you select another user or deselect the whole option now. diff --git a/ChangeLog b/ChangeLog index 248f06a..d1341f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -249,6 +249,7 @@ * 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... + * 2925 FIX: Editing a notification rule for a missing user selected random other user... Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3e77416..c691b3c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1225,14 +1225,14 @@ class Checkbox(ValueSpec): class DropdownChoice(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._choices = kwargs["choices"] - self._help_separator = kwargs.get("help_separator") - self._label = kwargs.get("label") - self._prefix_values = kwargs.get("prefix_values", False) - self._sorted = kwargs.get("sorted", False) - self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) - - self._no_preselect = kwargs.get("no_preselect", False) + self._choices = kwargs["choices"] + self._help_separator = kwargs.get("help_separator") + self._label = kwargs.get("label") + self._prefix_values = kwargs.get("prefix_values", False) + self._sorted = kwargs.get("sorted", False) + self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) + self._invalid_choice = kwargs.get("invalid_choice", "replace") # also possible: "complain" + self._no_preselect = kwargs.get("no_preselect", False) self._no_preselect_value = kwargs.get("no_preselect_value", None) self._no_preselect_title = kwargs.get("no_preselect_title", "") # if not preselected self._no_preselect_error = kwargs.get("no_preselect_error", _("Please make a selection")) @@ -1268,6 +1268,11 @@ class DropdownChoice(ValueSpec): options.append((str(n),) + entry[1:]) if entry[0] == value: defval = str(n) + + if self._invalid_choice == "complain" and self._value_is_invalid(value): + defval = "invalid" + options.append((defval, _("(element does not exist anymore)"))) + if len(options) == 0: html.write(self._empty_text) elif len(options[0]) == 3: @@ -1294,7 +1299,10 @@ class DropdownChoice(ValueSpec): val = entry[0] if sel == str(n): return val - return self.default_value() # can only happen if user garbled URL or len(choices) == 0 + if self._invalid_choice == "replace": + return self.default_value() # garbled URL or len(choices) == 0 + else: + raise MKUserError(varprefix, _("The selected element is not longer available. Please select something else.")) def validate_value(self, value, varprefix): if self._no_preselect and value == self._no_preselect_value: @@ -1314,6 +1322,12 @@ class DropdownChoice(ValueSpec): raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % (value, ", ".join([v for (v,t) in choices]))) + def _value_is_invalid(self, value): + for entry in self.choices(): + if entry[0] == value: + return False + return True + # Special conveniance variant for monitoring states class MonitoringState(DropdownChoice): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 64f5cf3..102d926 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10495,6 +10495,7 @@ class UserSelection(DropdownChoice): def __init__(self, **kwargs): only_contacts = kwargs.get("only_contacts", False) kwargs["choices"] = generate_wato_users_elements_function(kwargs.get("none"), only_contacts = only_contacts) + kwargs["invalid_choice"] = "complain" # handle vanished users correctly! DropdownChoice.__init__(self, **kwargs) def value_to_text(self, value):

8 years, 8 months

WATO BI: fix exception after deletion of rules

by Mathias Kettner

Module: check_mk Branch: master Commit: c61b38588575b8ecd47f7ea5fe3b00c78df8353c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c61b38588575b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 12:18:43 2016 +0100 WATO BI: fix exception after deletion of rules --- web/plugins/wato/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index e512195..9b119a3 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -180,7 +180,7 @@ class ModeBI(WatoMode): append_to = converted_aggregations append_to.append(self._convert_aggregation_to_bi(aggregation)) - converted_pack = pack + converted_pack = pack.copy() converted_pack["aggregations"] = converted_aggregations converted_pack["host_aggregations"] = converted_host_aggregations converted_pack["rules"] = converted_rules

8 years, 8 months

#2828 FIX win_disks: now able to handle disks with missing size or media type information

by Andreas Boesl

Module: check_mk Branch: master Commit: 9ae41d13a7a003547d850ad9ac467d885c951cf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae41d13a7a003… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 19 12:02:32 2016 +0100 #2828 FIX win_disks: now able to handle disks with missing size or media type information --- .werks/2828 | 9 +++++++++ ChangeLog | 1 + inventory/win_disks | 6 ++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2828 b/.werks/2828 new file mode 100644 index 0000000..1765109 --- /dev/null +++ b/.werks/2828 @@ -0,0 +1,9 @@ +Title: win_disks: now able to handle disks with missing size or media type information +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i4 +Date: 1453201303 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3da32c6..248f06a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -284,6 +284,7 @@ * 2714 FIX: Fixed visibility of folding arrows by making them dark * 2439 FIX: solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER... * 2827 FIX: win_disks, win_video: now able to detect multiple instances + * 2828 FIX: win_disks: now able to handle disks with missing size or media type information 1.2.7i3: diff --git a/inventory/win_disks b/inventory/win_disks index aa04853..1884f99 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -88,9 +88,11 @@ def inv_win_disks(info): elif varname == "SerialNumber": array["serial"] = value elif varname == "Size": - array["size"] = int(value) + if value != "": + array["size"] = int(value) elif varname == "MediaType": - array["type"] = value + if value != "": + array["type"] = value elif varname == "Signature": if value != "": array["signature"] = int(value)

8 years, 8 months

#2827 FIX win_disks, win_video: now able to detect multiple instances

by Andreas Boesl

Module: check_mk Branch: master Commit: 5338a908b54a4725ce82e1ff48c158aca0d2ddf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5338a908b54a47… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 19 10:14:49 2016 +0100 #2827 FIX win_disks, win_video: now able to detect multiple instances --- .werks/2827 | 9 +++++++++ ChangeLog | 1 + inventory/win_disks | 11 +++++++++++ inventory/win_video | 10 ++++++++++ 4 files changed, 31 insertions(+) diff --git a/.werks/2827 b/.werks/2827 new file mode 100644 index 0000000..9156129 --- /dev/null +++ b/.werks/2827 @@ -0,0 +1,9 @@ +Title: win_disks, win_video: now able to detect multiple instances +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i4 +Date: 1453194865 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fcc2752..3da32c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -283,6 +283,7 @@ * 2667 FIX: solaris_mem: fix exception in inventory plugin * 2714 FIX: Fixed visibility of folding arrows by making them dark * 2439 FIX: solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER... + * 2827 FIX: win_disks, win_video: now able to detect multiple instances 1.2.7i3: diff --git a/inventory/win_disks b/inventory/win_disks index 4a532d6..aa04853 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -60,12 +60,23 @@ def inv_win_disks(info): node = inv_tree("hardware.storage.disks:") array = {} + first_varname = None + for line in info: if len(line) > 2: line = [ line[0], ":".join(line[1:]) ] varname, value = line varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) + + if first_varname and varname == first_varname: + # Looks like we have a new instance + node.append(array) + array = {} + + if not first_varname: + first_varname = varname + if varname == "Manufacturer": array["vendor"] = value elif varname == "InterfaceType": diff --git a/inventory/win_video b/inventory/win_video index d09a7b4..c19b9dc 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -39,12 +39,22 @@ def inv_win_video(info): node = inv_tree("hardware.video:") array = {} + first_varname = None for line in info: if len(line) > 2: line = [ line[0], ":".join(line[1:]) ] varname, value = line varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) + + if first_varname and varname == first_varname: + # Looks like we have a new instance + node.append(array) + array = {} + + if not first_varname: + first_varname = varname + if varname == "Name": array["name"] = value elif varname == "DriverVersion":

8 years, 8 months

changed service description in solaris_fmadm

by Simon Betz

Module: check_mk Branch: master Commit: 2d4a420ba7b35bd6c80afa18ee8f0afef9ea73d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d4a420ba7b35b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 18 17:11:22 2016 +0100 changed service description in solaris_fmadm --- checks/solaris_fmadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/solaris_fmadm b/checks/solaris_fmadm index 5693e01..701afc5 100644 --- a/checks/solaris_fmadm +++ b/checks/solaris_fmadm @@ -100,7 +100,7 @@ def inventory_solaris_fmadm(info): return [ (None, None) ] -def check_solaris_fmadm(item, params, info): +def check_solaris_fmadm(_no_item, params, info): if not info: return 0, "No faults detected" @@ -122,5 +122,5 @@ def check_solaris_fmadm(item, params, info): check_info['solaris_fmadm'] = { 'inventory_function' : inventory_solaris_fmadm, 'check_function' : check_solaris_fmadm, - 'service_description' : 'Fault class', + 'service_description' : 'FMD Status', }

8 years, 8 months

The web cron url is now writing OK when finished. Just to be sure it did not fail silently.

by Lars Michelsen

Module: check_mk Branch: master Commit: 35146d94a2e43d90d998090680ca1ad385f5b1a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35146d94a2e43d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 18 15:21:28 2016 +0100 The web cron url is now writing OK when finished. Just to be sure it did not fail silently. --- web/htdocs/cron.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/cron.py b/web/htdocs/cron.py index 7812478..92c69a8 100644 --- a/web/htdocs/cron.py +++ b/web/htdocs/cron.py @@ -71,3 +71,5 @@ def page_run_cron(): import traceback logger(LOG_ERR, "Exception in cron_job [%s]:\n%s" % (cron_job.__name__, traceback.format_exc())) + + html.write("OK\n")

8 years, 8 months

value_to_text() of Dictionaries can now return a custom text when the value is at default value

by Lars Michelsen

Module: check_mk Branch: master Commit: 93c57c2330cad814a3d2aed87e2d6f26f2c40b68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93c57c2330cad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 18 15:22:15 2016 +0100 value_to_text() of Dictionaries can now return a custom text when the value is at default value --- web/htdocs/valuespec.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4b40b57..3e77416 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2771,6 +2771,10 @@ class Dictionary(ValueSpec): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] self._empty_text = kwargs.get("empty_text", _("(no parameters)")) + # Optionally a text can be specified to be shown by value_to_text() + # when the value equal the default value of the value spec. Normally + # the default values are shown. + self._default_text = kwargs.get("default_text", None) self._required_keys = kwargs.get("required_keys", []) self._ignored_keys = kwargs.get("ignored_keys", []) self._default_keys = kwargs.get("default_keys", []) # keys present in default value @@ -2965,6 +2969,9 @@ class Dictionary(ValueSpec): if not value: return self._empty_text + if self._default_text and value == self.default_value(): + return self._default_text + if not oneline: s = '<table class=vs_dict_text>' else:

8 years, 8 months

network scan: Fixed issues in distributed setups

by Lars Michelsen

Module: check_mk Branch: master Commit: 83bfa3f76f0e09c453415514e816413cba8254d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bfa3f76f0e09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 18 16:16:18 2016 +0100 network scan: Fixed issues in distributed setups --- web/htdocs/wato.py | 7 +++++-- web/htdocs/watolib.py | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6cd160..97e8c69 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15006,9 +15006,12 @@ def execute_network_scan_job(): if config.site_is_local(folder.site_id()): found = do_network_scan(folder) else: - found = do_remote_automation(folder.site_id(), "network-scan", + found = do_remote_automation(config.site(folder.site_id()), "network-scan", [("folder", folder.path())]) + if not type(found) == list: + raise MKGeneralException(_("Received an invalid network scan result: %r") % found) + add_scanned_hosts_to_folder(folder, found) result.update({ @@ -15201,7 +15204,7 @@ def scan_ip_addresses(folder, ip_addresses): num_addresses = len(ip_addresses) # dont start more threads than needed - parallel_pings = min(folder.attribute("network_scan")["max_parallel_pings"], num_addresses) + parallel_pings = min(folder.attribute("network_scan").get("max_parallel_pings", 100), num_addresses) # Initalize all workers threads = [] diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index d47c4e9..5467a66 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3101,14 +3101,16 @@ def do_remote_automation(site, command, vars): vars_encoded = html.urlencode_vars(vars) response = get_url(url, site.get('insecure', False), post_data=vars_encoded) + if not response: raise MKAutomationException("Empty output from remote site.") + try: response = eval(response) except: - # The remote site will send non-Python data in case of an - # error. + # The remote site will send non-Python data in case of an error. raise MKAutomationException("<pre>%s</pre>" % response) + return response @@ -3127,7 +3129,7 @@ def is_distributed(sites = None): def is_wato_slave_site(): - return has_distributed_wato_file() + return has_distributed_wato_file() and not has_wato_slave_sites() def has_wato_slave_sites():

8 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
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