Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

CascadingDropdown: allow list as an alternative encoding over tuple

by Mathias Kettner

Module: check_mk Branch: master Commit: 58b4cc18797a348feea27031900b30bf736ad2bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58b4cc18797a34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 14:42:30 2016 +0200 CascadingDropdown: allow list as an alternative encoding over tuple This is neccessary when working with backends that do no preserve tuples since they use JSON as an intermediate encoding --- web/htdocs/valuespec.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 22063ed..a6929ef 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1370,6 +1370,11 @@ class CascadingDropdown(ValueSpec): self._separator = kwargs.get("separator", ", ") self._sorted = kwargs.get("sorted", True) self._orientation = kwargs.get("orientation", "vertical") # or horizontal + if kwargs.get("encoding", "tuple") == "list": + self._encoding_type = list + else: + self._encoding_type = tuple + def normalize_choices(self, choices): new_choices = [] @@ -1388,7 +1393,7 @@ class CascadingDropdown(ValueSpec): def canonical_value(self): choices = self.choices() if choices[0][2]: - return (choices[0][0], choices[0][2].canonical_value()) + return self._encoding_type((choices[0][0], choices[0][2].canonical_value())) else: return choices[0][0] @@ -1398,7 +1403,7 @@ class CascadingDropdown(ValueSpec): except: choices = self.choices() if choices[0][2]: - return (choices[0][0], choices[0][2].default_value()) + return self._encoding_type((choices[0][0], choices[0][2].default_value())) else: return choices[0][0] @@ -1414,7 +1419,7 @@ class CascadingDropdown(ValueSpec): # selection, if the HTML variable varprefix_sel aleady # exists. if value == val or ( - type(value) == tuple and value[0] == val): + type(value) == self._encoding_type and value[0] == val): def_val = str(nr) vp = varprefix + "_sel" @@ -1449,7 +1454,7 @@ class CascadingDropdown(ValueSpec): disp = "none" else: # form painted the first time if value == val \ - or (type(value) == tuple and value[0] == val): + or (type(value) == self._encoding_type and value[0] == val): def_val_2 = value[1] disp = "" else: @@ -1480,17 +1485,17 @@ class CascadingDropdown(ValueSpec): sel = 0 val, title, vs = choices[sel] if vs: - val = (val, vs.from_html_vars(varprefix + "_%d" % sel)) + val = self._encoding_type((val, vs.from_html_vars(varprefix + "_%d" % sel))) return val def validate_datatype(self, value, varprefix): choices = self.choices() for nr, (val, title, vs) in enumerate(choices): if value == val or ( - type(value) == tuple and value[0] == val): + type(value) == self._encoding_type and value[0] == val): if vs: - if type(value) != tuple or len(value) != 2: - raise MKUserError(varprefix + "_sel", _("Value must a tuple with two elements.")) + if type(value) != self._encoding_type or len(value) != 2: + raise MKUserError(varprefix + "_sel", _("Value must a %s with two elements."), self._encoding_type.__name__) vs.validate_datatype(value[1], varprefix + "_%d" % nr) return raise MKUserError(varprefix, _("Value %r is not allowed here.") % value) @@ -1499,7 +1504,7 @@ class CascadingDropdown(ValueSpec): choices = self.choices() for nr, (val, title, vs) in enumerate(choices): if value == val or ( - type(value) == tuple and value[0] == val): + type(value) == self._encoding_type and value[0] == val): if vs: vs.validate_value(value[1], varprefix + "_%d" % nr) ValueSpec.custom_validate(self, value, varprefix)

8 years, 3 months

inv_tree_list instead of inv_tree

by Simon Betz

Module: check_mk Branch: master Commit: 0032b8adc79e6cf302c22ca0e3d2599e7df1843b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0032b8adc79e6c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 29 14:36:08 2016 +0200 inv_tree_list instead of inv_tree --- inventory/perle_chassis_slots | 2 +- inventory/perle_modules_mgt | 2 +- inventory/perle_psmu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/perle_chassis_slots b/inventory/perle_chassis_slots index 9472fee..a29d151 100644 --- a/inventory/perle_chassis_slots +++ b/inventory/perle_chassis_slots @@ -61,7 +61,7 @@ def inv_perle_chassis_slots(info): "10" : "cm4gpt", } - node = inv_tree("hardware.components.modules:") + node = inv_tree_list("hardware.components.modules:") for index, name, serial, bootloader, fw, \ alarms, diagstate, ty in info: diff --git a/inventory/perle_modules_mgt b/inventory/perle_modules_mgt index 693afff..1feff26 100644 --- a/inventory/perle_modules_mgt +++ b/inventory/perle_modules_mgt @@ -31,7 +31,7 @@ def inv_perle_modules_mgt(info): - node = inv_tree("hardware.components.modules:") + node = inv_tree_list("hardware.components.modules:") for index, name, descr, status in info: node.append({ "index" : index, diff --git a/inventory/perle_psmu b/inventory/perle_psmu index 3914a6f..11e02c8 100644 --- a/inventory/perle_psmu +++ b/inventory/perle_psmu @@ -42,7 +42,7 @@ def inv_perle_psmu(parsed): - node = inv_tree("hardware.components.psus:") + node = inv_tree_list("hardware.components.psus:") for itemname, data in parsed.items(): itemname_splitted = itemname.split(" ")

8 years, 3 months

3688 perle_chassis, perle_chassis.temp, perle_chassis_slots,

by Simon Betz

perle_modules_cm1000, perle_modules_cm1110, perle_modules_mgt, perle_psmu , perle_psmu.fan: new checks for Perle Mediaconverter devices which support the PERLE-MCR-MGT MIB Message-ID: <5773b87e.ecHX9Zq7HAND7eso%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5cce4f8ff2d12532262c87bbf3b006a122100664 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cce4f8ff2d125… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 29 14:00:39 2016 +0200 3688 perle_chassis, perle_chassis.temp, perle_chassis_slots, perle_modules_cm1000, perle_modules_cm1110, perle_modules_mgt, perle_psmu, perle_psmu.fan: new checks for Perle Mediaconverter devices which support the PERLE-MCR-MGT MIB --- .werks/3688 | 9 ++++ ChangeLog | 1 + checkman/perle_chassis | 20 +++++++ checkman/perle_chassis.temp | 16 ++++++ checkman/perle_chassis_slots | 20 +++++++ checkman/perle_modules_cm1000 | 26 +++++++++ checkman/perle_modules_cm1110 | 26 +++++++++ checkman/perle_modules_mgt | 16 ++++++ checkman/perle_psmu | 19 +++++++ checkman/perle_psmu.fan | 16 ++++++ checks/perle.include | 117 +++++++++++++++++++++++++++++++++++++++++ checks/perle_chassis | 86 ++++++++++++++++++++++++++++++ checks/perle_chassis_slots | 83 +++++++++++++++++++++++++++++ checks/perle_modules_cm1000 | 47 +++++++++++++++++ checks/perle_modules_cm1110 | 47 +++++++++++++++++ checks/perle_modules_mgt | 62 ++++++++++++++++++++++ checks/perle_psmu | 110 ++++++++++++++++++++++++++++++++++++++ inventory/perle_chassis | 61 +++++++++++++++++++++ inventory/perle_chassis_slots | 95 +++++++++++++++++++++++++++++++++ inventory/perle_modules_mgt | 55 +++++++++++++++++++ inventory/perle_psmu | 71 +++++++++++++++++++++++++ 21 files changed, 1003 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5cce4f8ff2…

8 years, 3 months

Updated bug entries #2497

by Mathias Kettner

Module: check_mk Branch: master Commit: 39125ad0fbcb65351ca348953b049f54c34d1926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39125ad0fbcb65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 12:30:39 2016 +0200 Updated bug entries #2497 --- .bugs/2497 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2497 b/.bugs/2497 new file mode 100644 index 0000000..dc39b93 --- /dev/null +++ b/.bugs/2497 @@ -0,0 +1,13 @@ +Title: Multisite cronjobs have config.user_id not set correcty +Component: multisite +State: open +Date: 2016-06-29 12:29:30 +Targetversion: future +Class: bug + +This value should be set to None (and maybe a buch of other user related +settings in config). There should *no* user be logged in, but all permissions +be active. + +Currently there seems to the randomly the user from the last login that +that Apache process has made.

8 years, 3 months

3687 Hostname translation for piggybacked host: now it' s possible to enter any number of regular expressions within this ruleset

by Simon Betz

Module: check_mk Branch: master Commit: 737c0e8432d825c9aeaaa393c6153d878eb29b78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=737c0e8432d825… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 29 10:32:11 2016 +0200 3687 Hostname translation for piggybacked host: now it's possible to enter any number of regular expressions within this ruleset Please note: You can add any number of expressions which are executed succesively until the first match. --- .werks/3687 | 9 ++++++ ChangeLog | 1 + modules/check_mk_base.py | 11 ++++++-- web/htdocs/wato.py | 68 ++++++++++++++++++++++++++++------------------ 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/.werks/3687 b/.werks/3687 new file mode 100644 index 0000000..aa68fd2 --- /dev/null +++ b/.werks/3687 @@ -0,0 +1,9 @@ +Title: Hostname translation for piggybacked host: now it's possible to enter any number of regular expressions within this ruleset +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1467188546 +Class: feature + +Please note: You can add any number of expressions which are executed succesively until the first match. diff --git a/ChangeLog b/ChangeLog index 97169e1..7c85fff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -383,6 +383,7 @@ * 3538 Now hiding the activate changes button as long as another activation process is running * 3618 Better layout for role & permission matrix, also allow sorting and searching * 3544 The edit host and diagnostic page are now able to handle SNMPv3 credentials... + * 3687 Hostname translation for piggybacked host: now it's possible to enter any number of regular expressions within this ruleset... * 3657 Custom host attributes can now be configured... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 180767d..a7ba470 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -643,9 +643,13 @@ def do_hostname_translation(translation, hostname): # We assume the incoming name is correctly encoded in UTF-8 hostname = decode_incoming_string(hostname) - # 3. Regular expression conversion - if "regex" in translation: - expr, subst = translation.get("regex") + # 3. Multiple regular expression conversion + if type(translation.get("regex")) == tuple: + translations = [translation.get("regex")] + else: + translations = translation.get("regex", []) + + for expr, subst in translations: if not expr.endswith('$'): expr += '$' rcomp = regex(expr) @@ -655,6 +659,7 @@ def do_hostname_translation(translation, hostname): hostname = subst for nr, text in enumerate(mo.groups("")): hostname = hostname.replace("\\%d" % (nr+1), text) + break # 4. Explicity mapping for from_host, to_host in translation.get("mapping", []): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2059d88..8ca319c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13719,29 +13719,40 @@ def HostnameTranslation(**kwargs): totext = _("Drop domain part (<tt>host123.foobar.de</tt> → <tt>host123</tt>)"), )), ( "regex", - Tuple( - title = _("Regular expression substitution"), - help = _("Please specify a regular expression in the first field. This expression should at " - "least contain one subexpression exclosed in brackets - for example <tt>vm_(.*)_prod</tt>. " - "In the second field you specify the translated host name and can refer to the first matched " - "group with <tt>\\1</tt>, the second with <tt>\\2</tt> and so on, for example <tt>\\1.example.org</tt>"), - elements = [ - RegExpUnicode( - title = _("Regular expression"), - help = _("Must contain at least one subgroup <tt>(...)</tt>"), - mingroups = 0, - maxgroups = 9, - size = 30, - allow_empty = False, - ), - TextUnicode( - title = _("Replacement"), - help = _("Use <tt>\\1</tt>, <tt>\\2</tt> etc. to replace matched subgroups"), - size = 30, - allow_empty = False, - ) - ] - )), + Transform( + ListOf( + Tuple( + orientation = "horizontal", + elements = [ + RegExpUnicode( + title = _("Regular expression"), + help = _("Must contain at least one subgroup <tt>(...)</tt>"), + mingroups = 0, + maxgroups = 9, + size = 30, + allow_empty = False, + ), + TextUnicode( + title = _("Replacement"), + help = _("Use <tt>\\1</tt>, <tt>\\2</tt> etc. to replace matched subgroups"), + size = 30, + allow_empty = False, + ) + ], + ), + title = _("Multiple regular expressions"), + help = _("You can add any number of expressions here which are executed succesively until the first match. " + "Please specify a regular expression in the first field. This expression should at " + "least contain one subexpression exclosed in brackets - for example <tt>vm_(.*)_prod</tt>. " + "In the second field you specify the translated host name and can refer to the first matched " + "group with <tt>\\1</tt>, the second with <tt>\\2</tt> and so on, for example <tt>\\1.example.org</tt>. " + ""), + add_label = _("Add expression"), + movable = False, + ), + forth = lambda x: type(x) == tuple and [x] or x, + ) + ), ( "mapping", ListOf( Tuple( @@ -13788,9 +13799,13 @@ def do_hostname_translation(translation, hostname): if translation.get("drop_domain") and not hostname[0].isdigit(): hostname = hostname.split(".", 1)[0] - # 3. Regular expression conversion - if "regex" in translation: - expr, subst = translation.get("regex") + # 3. Multiple regular expression conversion + if type(translation.get("regex")) == tuple: + translations = [translation.get("regex")] + else: + translations = translation.get("regex", []) + + for expr, subst in translations: if not expr.endswith('$'): expr += '$' rcomp = regex(expr) @@ -13800,6 +13815,7 @@ def do_hostname_translation(translation, hostname): hostname = subst for nr, text in enumerate(mo.groups("")): hostname = hostname.replace("\\%d" % (nr+1), text) + break # 4. Explicit mapping for from_host, to_host in translation.get("mapping", []):

8 years, 3 months

3657 Custom host attributes can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: b16015a540a6ec7571fdf98179e59cddad288e96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b16015a540a6ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 29 10:30:52 2016 +0200 3657 Custom host attributes can now be configured It is now possible to declare custom host attributes (just like for users). By default the custom attributes are just fields in the configuration GUI which you can use to store host related values in. Each of the attributes can be configured to be exported as custom variable to the monitoring core. In case you do this for a custom attribute, the variable will be available in the monitoring GUI, in notifications and via raw livestatus for your scripts or 3rd party tools. If you create a custom variable "my_custom_variable", it will result in a custom variable "_MY_CUSTOM_VARIABLE" in the monitoring core. --- .werks/3657 | 19 +++++++ ChangeLog | 1 + web/htdocs/userdb.py | 15 +++--- web/htdocs/wato.py | 122 ++++++++++++++++++++++++++++++++++---------- web/htdocs/watolib.py | 18 +++++++ web/plugins/config/wato.py | 1 + 6 files changed, 142 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b16015a540…

8 years, 3 months

further mk_inotify config fix

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e932641cb3523a4aae5deed1b976a7b19910bb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e932641cb3523… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 28 14:54:30 2016 +0200 further mk_inotify config fix --- agents/plugins/mk_inotify | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify index 8e1e330..ba8a190 100755 --- a/agents/plugins/mk_inotify +++ b/agents/plugins/mk_inotify @@ -325,6 +325,8 @@ def main(): attributes["mask"] = 0 for mode in attributes["modes"]: attributes["mask"] |= map_events[mode][0] + for mode in attributes["monitor_all"]: + attributes["mask"] |= map_events[mode][0] update_watched_folders()

8 years, 3 months

3148 FIX fixed Edit View/ Dashlet Dialogs offering non-sensical filter choices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 734a4992ed1442a5d5a92bf42aa618bbd9939228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=734a4992ed1442… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jun 28 11:11:45 2016 +0200 3148 FIX fixed Edit View/Dashlet Dialogs offering non-sensical filter choices This is actually two separate but similar bugfixes: When editing a dashlet that represented a view, the search/context filter offered all possible filter choices even when they made no sense for the data visualised. Also, when editing a aggregation group view (and potentially other views), the filter list offered the same filter option (aggregation group) twice, with different semantics, causing exceptions if either one of these options was used. --- .werks/3148 | 15 +++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 10 +++++-- web/htdocs/visuals.py | 69 ++++++++++++++++++++++++----------------------- 4 files changed, 60 insertions(+), 35 deletions(-) diff --git a/.werks/3148 b/.werks/3148 new file mode 100644 index 0000000..d23da64 --- /dev/null +++ b/.werks/3148 @@ -0,0 +1,15 @@ +Title: fixed Edit View/Dashlet Dialogs offering non-sensical filter choices +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467104831 + +This is actually two separate but similar bugfixes: +When editing a dashlet that represented a view, the search/context filter offered all possible +filter choices even when they made no sense for the data visualised. +Also, when editing a aggregation group view (and potentially other views), the filter list +offered the same filter option (aggregation group) twice, with different semantics, causing +exceptions if either one of these options was used. diff --git a/ChangeLog b/ChangeLog index a757976..aec3261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -368,6 +368,7 @@ * 3627 FIX: fixed double graphs of database size * 3586 FIX: Fixed file locking issues (rare and random errors that settings file could not be loaded) * 2239 FIX: Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree... + * 3148 FIX: fixed Edit View/Dashlet Dialogs offering non-sensical filter choices... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 06f3fec..76a5628 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1055,8 +1055,14 @@ def page_edit_dashlet(): ], ) - context_specs = visuals.get_context_specs(dashlet, - info_handler=lambda dashlet: dashlet_types[dashlet['type']].get('infos')) + def dashlet_info_handler(dashlet): + if dashlet['type'] == 'view': + import views + return views.get_view_infos(dashlet) + else: + return dashlet_types[dashlet['type']].get('infos') + + context_specs = visuals.get_context_specs(dashlet, info_handler=dashlet_info_handler) vs_type = None params = dashlet_type.get('parameters') diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 911b110..b21e795 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -497,43 +497,44 @@ def page_create_visual(what, info_keys, next_url = None): def get_context_specs(visual, info_handler): context_specs = [] info_keys = info_handler and info_handler(visual) or infos.keys() - for info_key in info_keys: - info = infos[info_key] - if info_key in visual['single_infos']: - params = info['single_spec'] - optional = True - isopen = True - vs = Dictionary( - title = info['title'], - # render = 'form', - form_isopen = isopen, - optional_keys = optional, - elements = params, - ) - else: - filter_list = VisualFilterList([info_key], title=info['title']) - filter_names = filter_list.filter_names() + single_info_keys = [key for key in info_keys if key in visual['single_infos']] + multi_info_keys = [key for key in info_keys if key not in single_info_keys] + + def visual_spec_single(info_key): + info = infos[info_key] + params = info['single_spec'] + optional = True + isopen = True + return Dictionary( + title = info['title'], + # render = 'form', + form_isopen = isopen, + optional_keys = optional, + elements = params, + ) + + def visual_spec_multi(info_key): + info = infos[info_key] + filter_list = VisualFilterList([info_key], title=info['title'], ignore=set(single_info_keys)) + filter_names = filter_list.filter_names() - if not filter_names: - continue # Skip infos which have no filters available + if not filter_names: + return [] # Skip infos which have no filters available - params = [ - ('filters', filter_list), - ] - optional = None - # Make it open by default when at least one filter is used - isopen = bool([ fn for fn in visual.get('context', {}).keys() - if fn in filter_names ]) - vs = filter_list + params = [ + ('filters', filter_list), + ] + optional = None + # Make it open by default when at least one filter is used + isopen = bool([ fn for fn in visual.get('context', {}).keys() + if fn in filter_names ]) + return filter_list + # single infos first, the rest afterwards + return [(info_key, visual_spec_single(info_key)) for info_key in single_info_keys] +\ + [(info_key, visual_spec_multi(info_key)) for info_key in multi_info_keys] - # Single info context specifications should be listed first - if info_key in visual['single_infos']: - context_specs.insert(0, (info_key, vs)) - else: - context_specs.append((info_key, vs)) - return context_specs def process_context_specs(context_specs): context = {} @@ -1116,13 +1117,15 @@ class VisualFilterList(ListOfMultiple): def __init__(self, infos, **kwargs): self._infos = infos + ignore = kwargs.get("ignore", set()) + # First get all filters useful for the infos, then create VisualFilter # valuespecs from them and then sort them fspecs = {} self._filters = {} for info in self._infos: for fname, filter in filters_allowed_for_info(info).items(): - if fname not in fspecs: + if fname not in fspecs and fname not in ignore: fspecs[fname] = VisualFilter(fname, title = filter.title, )

8 years, 3 months

3686 FIX hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99

by Simon Betz

Module: check_mk Branch: master Commit: 4fed2d570ee5a1689665fc9617cde36d4e32e279 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fed2d570ee5a1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 28 09:12:06 2016 +0200 3686 FIX hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 --- .werks/3686 | 10 ++++++++++ ChangeLog | 1 + checks/hp_proliant_temp | 11 +++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/3686 b/.werks/3686 new file mode 100644 index 0000000..7380c1c --- /dev/null +++ b/.werks/3686 @@ -0,0 +1,10 @@ +Title: hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467097884 + + diff --git a/ChangeLog b/ChangeLog index a965c56..a757976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -285,6 +285,7 @@ * 3654 FIX: apc_symmetra: Improved output in case of unknown battery state / calibration result * 3655 FIX: if64adm: Can now be used with OID range limits * 3685 FIX: brocade_fcport: fixed unknown state texts + * 3686 FIX: hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 9f99e51..8a70f84 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -38,11 +38,18 @@ def check_hp_proliant_temp(item, params, info): if format_hp_proliant_name(line) == item: chassis, index, name, value, threshold, status = line - threshold = float(threshold) + # This case means no threshold available and + # the devices' web interface displays "N/A" + if threshold == "-99": + devlevels = (None, None) + else: + threshold = float(threshold) + devlevels = (threshold, threshold) + snmp_status = hp_proliant_status_map[int(status)] return check_temperature(float(value), params, "hp_proliant_temp_%s" % item, - dev_levels=(threshold, threshold), + dev_levels=devlevels, dev_status=hp_proliant_status2nagios_map[snmp_status], dev_status_name="Unit: %s" % snmp_status) return 3, "item not found in snmp data"

8 years, 3 months

3685 FIX brocade_fcport: fixed unknown state texts

by Simon Betz

Module: check_mk Branch: master Commit: 4a39eec9eb4e05d5551f80dbfedf0f6414ee12b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a39eec9eb4e05… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 27 16:27:26 2016 +0200 3685 FIX brocade_fcport: fixed unknown state texts --- .werks/3685 | 10 +++++++++ ChangeLog | 1 + checks/brocade_fcport | 58 ++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/.werks/3685 b/.werks/3685 new file mode 100644 index 0000000..dcced1a --- /dev/null +++ b/.werks/3685 @@ -0,0 +1,10 @@ +Title: brocade_fcport: fixed unknown state texts +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467037616 + + diff --git a/ChangeLog b/ChangeLog index 5ba0426..a965c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -284,6 +284,7 @@ * 3147 FIX: windows agent: fixed bug where all placeholders in messages were replaced with the same parameter * 3654 FIX: apc_symmetra: Improved output in case of unknown battery state / calibration result * 3655 FIX: if64adm: Can now be used with OID range limits + * 3685 FIX: brocade_fcport: fixed unknown state texts Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 05a64d1..1969573 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -26,15 +26,53 @@ # lookup tables for check implementation # Taken from swFCPortPhyState -brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', - 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef', - 'validating', 'invalidModule', 'noSigDet', 'unkown' ] +brocade_fcport_phystates = { + 0 : '', + 1 : 'noCard', + 2 : 'noTransceiver', + 3 : 'laserFault', + 4 : 'noLight', + 5 : 'noSync', + 6 : 'inSync', + 7 : 'portFault', + 8 : 'diagFault', + 9 : 'lockRef', + 10 : 'validating', + 11 : 'invalidModule', + 12 : 'noSigDet', + 13 : 'unkown', +} + # Taken from swFCPortOpStatus -brocade_fcport_opstates = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] +brocade_fcport_opstates = { + 0 : 'unknown', + 1 : 'online', + 2 : 'offline', + 3 : 'testing', + 4 : 'faulty', +} + # Taken from swFCPortAdmStatus -brocade_fcport_admstates = [ '', 'online', 'offline', 'testing', 'faulty' ] +brocade_fcport_admstates = { + 0 : '', + 1 : 'online', + 2 : 'offline', + 3 : 'testing', + 4 : 'faulty', +} + # Taken from swFCPortSpeed -brocade_fcport_speed = [ 'unknown', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', 'unknown', '16Gbit' ] +brocade_fcport_speed = { + 0 : 'unknown', + 1 : '1Gbit', + 2 : '2Gbit', + 3 : 'auto-Neg', + 4 : '4Gbit', + 5 : '8Gbit', + 6 : '10Gbit', + 7 : 'unknown', + 8 : '16Gbit', +} # Taken from swNbBaudRate isl_speed = { @@ -139,7 +177,7 @@ def check_brocade_fcport(item, params, info): gbit = isl_speed.get( isl_ports.get( str(index) ) ) speedmsg = ("ISL at %.0fGbit/s" % gbit) else: # no ISL port - if brocade_fcport_speed[speed] in [ "auto-Neg", "unknown" ]: + if brocade_fcport_speed.get(speed, "unknown") in [ "auto-Neg", "unknown" ]: try: # extract the speed from IF-MIB::ifHighSpeed. # unfortunately ports in the IF-MIB and the brocade MIB @@ -289,7 +327,7 @@ def check_brocade_fcport(item, params, info): else: errorflag = "(!!)" summarystate = 2 - output.append("Phy:%s(%d)%s" % (brocade_fcport_phystates[phystate], phystate, errorflag)) + output.append("Phy:%s(%d)%s" % (brocade_fcport_phystates.get(phystate, "unknown"), phystate, errorflag)) errorflag = "" #unknown(0) online(1) offline(2) testing(3) faulty(4) ] @@ -301,7 +339,7 @@ def check_brocade_fcport(item, params, info): else: errorflag = "(!!)" summarystate = 2 - output.append("Op:%s(%d)%s" % (brocade_fcport_opstates[opstate], opstate, errorflag)) + output.append("Op:%s(%d)%s" % (brocade_fcport_opstates.get(opstate, "unknown"), opstate, errorflag)) errorflag = "" # online(1) offline(2) testing(3) faulty(4) @@ -313,7 +351,7 @@ def check_brocade_fcport(item, params, info): else: errorflag = "(!!)" summarystate = 2 - output.append("Adm:%s(%d)%s" % (brocade_fcport_admstates[admstate], admstate, errorflag)) + output.append("Adm:%s(%d)%s" % (brocade_fcport_admstates.get(admstate, "unknown"), admstate, errorflag)) return (summarystate, ', '.join(output), perfdata)

8 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016