Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3223 FIX Fixed exception in network scan when hosts can not be resolved

by Lars Michelsen

Module: check_mk Branch: master Commit: a236bd0322ff2387f937d3e16cbf3eb09fa29b35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a236bd0322ff23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 12:05:35 2016 +0100 #3223 FIX Fixed exception in network scan when hosts can not be resolved --- .werks/3223 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3223 b/.werks/3223 new file mode 100644 index 0000000..c79893a --- /dev/null +++ b/.werks/3223 @@ -0,0 +1,10 @@ +Title: Fixed exception in network scan when hosts can not be resolved +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455707111 + + diff --git a/ChangeLog b/ChangeLog index acb7bbd..01c621d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 3215 FIX: WATO git ignore files are now updated on each commit * 3216 FIX: Fixed exception when trying to edit an already deleted user * 3222 FIX: Fixed broken duplicate user id validation when creating new users + * 3223 FIX: Fixed exception in network scan when hosts can not be resolved Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2f12de9..c132dd4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15250,7 +15250,7 @@ def ping_worker(addresses, hosts): try: host_name = socket.gethostbyaddr(ipaddress)[0] except socket.error: - host_name = address + host_name = ipaddress hosts.append((host_name, ipaddress))

8 years, 4 months

#3222 FIX Fixed broken duplicate user id validation when creating new users

by Lars Michelsen

Module: check_mk Branch: master Commit: 812149399e849bacbea55cc5b6a1b12a68407885 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=812149399e849b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 12:03:01 2016 +0100 #3222 FIX Fixed broken duplicate user id validation when creating new users --- .werks/3222 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 10 +++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.werks/3222 b/.werks/3222 new file mode 100644 index 0000000..be7aa70 --- /dev/null +++ b/.werks/3222 @@ -0,0 +1,10 @@ +Title: Fixed broken duplicate user id validation when creating new users +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455706956 + + diff --git a/ChangeLog b/ChangeLog index 6a3ec05..acb7bbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... * 3215 FIX: WATO git ignore files are now updated on each commit * 3216 FIX: Fixed exception when trying to edit an already deleted user + * 3222 FIX: Fixed broken duplicate user id validation when creating new users Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 158112a..2f12de9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10056,7 +10056,6 @@ def mode_edit_user(phase): if new: vs_user_id = UserID( - validate_value = validate_user_id, allow_empty = False ) else: @@ -10101,6 +10100,9 @@ def mode_edit_user(phase): id = vs_user_id.from_html_vars("user_id") vs_user_id.validate_value(id, "user_id") + if id in users: + raise MKUserError("user_id", _("This username is already being used by another user.")) + new_user = {} users[id] = new_user else: @@ -10489,12 +10491,6 @@ def filter_hidden_users(users): return users -def validate_user_id(value, varprefix): - users = userdb.load_users(lock = phase == 'action') - if new and id in users: - raise MKUserError(varprefix, _("This username is already being used by another user.")) - - def generate_wato_users_elements_function(none_value, only_contacts = False): def get_wato_users(nv): users = filter_hidden_users(userdb.load_users())

8 years, 4 months

Fixed broken debug error handling in case of notification rules can not be loaded

by Lars Michelsen

Module: check_mk Branch: master Commit: 389fa488fa8c20004c6652db167a1b5891030d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=389fa488fa8c20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:57:31 2016 +0100 Fixed broken debug error handling in case of notification rules can not be loaded --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb51ddb..158112a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6929,6 +6929,7 @@ def load_notification_rules(): filename = wato_root_dir + "notifications.mk" if not os.path.exists(filename): return [] + try: vars = { "notification_rules" : [] } execfile(filename, vars, vars) @@ -6941,7 +6942,7 @@ def load_notification_rules(): del rule["notify_method"] rule["notify_plugin"] = ( plugin, method ) return notification_rules - except: + except Exception, e: if config.debug: raise MKGeneralException(_("Cannot read configuration file %s: %s" % (filename, e)))

8 years, 4 months

inventory views: Fixed error handling in case of invalid inventory paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 5400d24d673207e356d46aadbf563e0b2b278440 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5400d24d673207… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:43:11 2016 +0100 inventory views: Fixed error handling in case of invalid inventory paths --- web/htdocs/inventory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index b50da71..595ff5a 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import defaults, re, os +from lib import MKGeneralException # Load data of a host, cache it in the current HTTP request def host(hostname):

8 years, 4 months

edit_dictionaries: Fixed broken exception handling in case of non MKUserError() exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 8043ef1502e5d929a51695f61b549e38273fe6fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8043ef1502e5d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:41:05 2016 +0100 edit_dictionaries: Fixed broken exception handling in case of non MKUserError() exceptions --- web/htdocs/forms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 6927756..c14cb19 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -94,9 +94,12 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, edited_value = entries.from_html_vars(keyname) entries.validate_value(edited_value, keyname) new_value[keyname].update(edited_value) - except Exception, e: + except MKUserError, e: messages.append("%s: %s" % (entries.title() or _("Properties"), e)) html.add_user_error(e.varname, e) + except Exception, e: + messages.append("%s: %s" % (entries.title() or _("Properties"), e)) + html.add_user_error(None, e) if validate and not html.has_user_errors(): try:

8 years, 4 months

Color: Added missing but referenced attribute _allow_empty

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d49713509e32fe50cad35082abaab74f2bb06da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d49713509e32f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:36:23 2016 +0100 Color: Added missing but referenced attribute _allow_empty --- web/htdocs/valuespec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c2ce3fe..fa1f1b6 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3573,6 +3573,7 @@ class Color(ValueSpec): kwargs["regex_error"] = _("The color needs to be given in hex format.") ValueSpec.__init__(self, **kwargs) self._on_change = kwargs.get("on_change") + self._allow_empty = kwargs.get("allow_empty", True) def render_input(self, varprefix, value):

8 years, 4 months

ElementSelection: Added missing but referenced method get_elements()

by Lars Michelsen

Module: check_mk Branch: master Commit: f4af44093ecf6b84534c80207568b65bd1b975ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4af44093ecf6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:33:59 2016 +0100 ElementSelection: Added missing but referenced method get_elements() --- web/htdocs/valuespec.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 28b455e..c2ce3fe 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3086,6 +3086,9 @@ class ElementSelection(ValueSpec): self._elements = self.get_elements() self._loaded_at = id(html) # unique for each query! + def get_elements(self): + raise Exception("You need to implement a get_elements() method.") + def canonical_value(self): self.load_elements() if len(self._elements) > 0:

8 years, 4 months

HTTPUrl valuespec: Fixed exception in rendering of value

by Lars Michelsen

Module: check_mk Branch: master Commit: a027f1933e898f8cb94e55e4b44f8cf2c2305f73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a027f1933e898f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:20:09 2016 +0100 HTTPUrl valuespec: Fixed exception in rendering of value --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 451a918..063cd10 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -646,7 +646,7 @@ class HTTPUrl(TextAscii): return value def value_to_text(self, url): - if not url.startswith("http://") and not value.startswith("https://"): + if not url.startswith("http://") and not url.startswith("https://"): url = "http://" + url try: parts = urlparse.urlparse(url)

8 years, 4 months

Raising real exception in case of non implemented function call

by Lars Michelsen

Module: check_mk Branch: master Commit: eac9cff323e90c69ec3d98b0f31f48e84cd77e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eac9cff323e90c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:19:47 2016 +0100 Raising real exception in case of non implemented function call --- web/htdocs/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 6b59171..8495a16 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1277,7 +1277,7 @@ def find_next_choord(broken, scale): # '----------------------------------------------------------------------' def get_bi_availability_rawdata(filterheaders, only_sites, av_object, include_output, avoptions): - raise XXX + raise Exception("Not implemented yet. Sorry.") def get_bi_spans(tree, aggr_group, avoptions, timewarp): time_range, range_title = avoptions["range"]

8 years, 4 months

Removed irrelevant+broken code (seems like it was copy/pasted)

by Lars Michelsen

Module: check_mk Branch: master Commit: cb7461c8bd963847dde60f98e5149ed54baac9b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb7461c8bd9638… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 11:25:05 2016 +0100 Removed irrelevant+broken code (seems like it was copy/pasted) --- web/htdocs/valuespec.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 063cd10..f8b6f6c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1575,11 +1575,8 @@ class ListChoice(ValueSpec): self._elements = self._choices else: self._elements = self._choices() - return - - if self._loaded_at != id(html): - self._elements = self.get_elements() - self._loaded_at = id(html) # unique for each query! + else: + self._elements = [] def canonical_value(self): return []

8 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016