Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Add filter name to css classes for easier styling

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d0c9af01a794cd679b415d65384e7eaf96764fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0c9af01a794c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 22:37:20 2019 +0100 Add filter name to css classes for easier styling Change-Id: I3e1cd67261f5b3154d2291e0e644379390f6e3d4 --- cmk/gui/visuals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index e4e1ce3..d395c6d 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -1034,7 +1034,7 @@ class ContactGroupChoice(DualListChoice): def show_filter(f): - html.open_div(class_=["floatfilter", "double" if f.double_height() else "single"]) + html.open_div(class_=["floatfilter", "double" if f.double_height() else "single", f.ident]) html.div(f.title, class_="legend") html.open_div(class_="content") try:

5 years, 4 months

added WK6708: WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description

by Andreas Boesl

Module: check_mk Branch: master Commit: df2d50713ab27c335ffa69d22b45388349fd3c48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df2d50713ab27c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 13:56:45 2019 +0100 added WK6708: WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description Change-Id: Ibbad87e80394fba81736fda23593f67932964bec --- .werks/6708 | 14 ++++++++++++++ cmk/gui/wato/pages/services.py | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/6708 b/.werks/6708 new file mode 100644 index 0000000..20a148a --- /dev/null +++ b/.werks/6708 @@ -0,0 +1,14 @@ +Title: WATO service discovery: Fixed incorrect creation of disable rule for duplicate service description +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551265114 + +Different check_types may have the same service description, for example <tt>CPU utilization</tt>. +If you created a <tt>Disabled check</tt> rule for some SNMP based CPU utilization check and +used the service discovery page, a <tt>Disabled service</tt> rule was automatically created for this SNMP +based check. As a side effect, the TCP based CPU utilization check was disabled as well.. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index e625cec..ac8c0c0 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -656,7 +656,8 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): return discovery_result def _do_discovery(self, discovery_result, request): - services_to_save, remove_disabled_rule, add_disabled_rule = {}, [], [] + services_to_save, remove_disabled_rule, add_disabled_rule, saved_services = {}, set(), set( + ), set() apply_changes = False for table_source, check_type, _checkgroup, item, paramstring, _params, \ descr, _state, _output, _perfdata in discovery_result.check_table: @@ -682,12 +683,14 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): if table_source == DiscoveryState.UNDECIDED: if table_target == DiscoveryState.MONITORED: services_to_save[(check_type, item)] = paramstring + saved_services.add(descr) elif table_target == DiscoveryState.IGNORED: add_disabled_rule.append(descr) elif table_source == DiscoveryState.VANISHED: if table_target != DiscoveryState.REMOVED: services_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if table_target == DiscoveryState.IGNORED: add_disabled_rule.append(descr) @@ -697,6 +700,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): DiscoveryState.IGNORED, ]: services_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if table_target == DiscoveryState.IGNORED: add_disabled_rule.append(descr) @@ -712,6 +716,7 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): DiscoveryState.IGNORED, ]: services_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if table_target == DiscoveryState.IGNORED: add_disabled_rule.append(descr) @@ -720,10 +725,12 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): DiscoveryState.CLUSTERED_OLD, ]: services_to_save[(check_type, item)] = paramstring + saved_services.add(descr) if apply_changes: need_sync = False if remove_disabled_rule or add_disabled_rule: + add_disabled_rule = add_disabled_rule - remove_disabled_rule - saved_services self._save_host_service_enable_disable_rules(remove_disabled_rule, add_disabled_rule) need_sync = True

5 years, 4 months

7186 Add painters & filters for host & service custom attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: c0d1918591d8f2cac90e06ca25ec25217be52fdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0d1918591d8f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 15:52:40 2019 +0100 7186 Add painters & filters for host & service custom attributes In addition to the already existing "Custom variables" painters that render a table of custom variables, painters and filters have been added to work with single custom attributes. The naming has been cleaned up: All elements now use the term "Custom attributes" instead of "Custom variables". CMK-1727 Change-Id: If1d8e4881a198769d9a63f733adeaf5d2865673f --- .werks/7186 | 15 +++++ cmk/gui/plugins/views/painters.py | 110 +++++++++++++++++++++++++++++++++++-- cmk/gui/plugins/visuals/filters.py | 79 ++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 4 deletions(-) diff --git a/.werks/7186 b/.werks/7186 new file mode 100644 index 0000000..18d8a50 --- /dev/null +++ b/.werks/7186 @@ -0,0 +1,15 @@ +Title: Add painters & filters for host & service custom attributes +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551192605 +Class: feature + +In addition to the already existing "Custom variables" painters that render a +table of custom variables, painters and filters have been added to work with +single custom attributes. + +The naming has been cleaned up: All elements now use the term "Custom attributes" +instead of "Custom variables". diff --git a/cmk/gui/plugins/views/painters.py b/cmk/gui/plugins/views/painters.py index 55e7440..c692a55 100644 --- a/cmk/gui/plugins/views/painters.py +++ b/cmk/gui/plugins/views/painters.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import os import time @@ -1750,14 +1751,14 @@ def paint_custom_vars(what, row, blacklist=None): @painter_registry.register -class PainterSvcCustomVars(Painter): +class PainterServiceCustomVariables(Painter): @property def ident(self): return "svc_custom_vars" @property def title(self): - return _("Service custom variables") + return _("Service custom attributes") @property def columns(self): @@ -1770,6 +1771,107 @@ class PainterSvcCustomVars(Painter): return paint_custom_vars('service', row) +class ABCPainterCustomVariable(Painter): + __metaclass__ = abc.ABCMeta + + @property + def title(self): + return self._dynamic_title + + @property + def short_title(self): + return self._dynamic_title + + def _dynamic_title(self, params=None): + if params is None: + # Happens in view editor when adding a painter + return self._default_title + + try: + return config.custom_service_attributes[params["ident"]]["title"] + except KeyError: + return self._default_title + + @abc.abstractproperty + def _default_title(self): + raise NotImplementedError() + + @abc.abstractproperty + def _object_type(self): + raise NotImplementedError() + + @abc.abstractmethod + def _custom_attribute_choices(self): + raise NotImplementedError() + + @property + def parameters(self): + return Dictionary( + elements=[ + ("ident", DropdownChoice( + choices=self._custom_attribute_choices, + title=_("ID"), + )), + ], + title=_("Options"), + optional_keys=[], + ) + + def render(self, row, cell): + params = cell.painter_parameters() + return paint_custom_var(self._object_type, params["ident"].upper(), row) + + +(a)painter_registry.register +class PainterServiceCustomVariable(ABCPainterCustomVariable): + @property + def ident(self): + return "service_custom_variable" + + @property + def columns(self): + return ['service_custom_variable_names', 'service_custom_variable_values'] + + @property + def _default_title(self): + return _("Service custom attribute") + + @property + def _object_type(self): + return "service" + + def _custom_attribute_choices(self): + choices = [] + for ident, attr_spec in config.custom_service_attributes.items(): + choices.append((ident, attr_spec["title"])) + return sorted(choices, key=lambda x: x[1]) + + +(a)painter_registry.register +class PainterHostCustomVariable(ABCPainterCustomVariable): + @property + def ident(self): + return "host_custom_variable" + + @property + def columns(self): + return ['host_custom_variable_names', 'host_custom_variable_values'] + + @property + def _default_title(self): + return _("Host custom attribute") + + @property + def _object_type(self): + return "host" + + def _custom_attribute_choices(self): + choices = [] + for attr_spec in config.wato_host_attrs: + choices.append((attr_spec["name"], attr_spec["title"])) + return sorted(choices, key=lambda x: x[1]) + + #. # .--Hosts---------------------------------------------------------------. # | _ _ _ | @@ -3288,14 +3390,14 @@ class PainterHostServicelevel(Painter): @painter_registry.register -class PainterHostCustomVars(Painter): +class PainterHostCustomVariables(Painter): @property def ident(self): return "host_custom_vars" @property def title(self): - return _("Host custom variables") + return _("Host custom attributes") @property def columns(self): diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index 34c6439..bdb5eb5 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import re import json @@ -2580,6 +2581,84 @@ class FilterHostAuxTags(Filter): return True +class ABCFilterCustomAttribute(Filter): + __metaclass__ = abc.ABCMeta + + @property + def sort_index(self): + return 103 + + def __init__(self, info): + Filter.__init__( + self, info=info, htmlvars=[self.name_varname, self.value_varname], link_columns=[]) + + @property + def name_varname(self): + return "%s_name" % self.ident + + @property + def value_varname(self): + return "%s_value" % self.ident + + def display(self): + html.dropdown(self.name_varname, [("", "")] + self._custom_attribute_choices()) + html.text_input(self.value_varname) + + @abc.abstractmethod + def _custom_attribute_choices(self): + raise NotImplementedError() + + def filter(self, infoname): + if not html.get_ascii_input(self.name_varname): + return "" + + attribute_id = html.get_item_input(self.name_varname, + dict(self._custom_attribute_choices()))[1] + value = html.get_unicode_input(self.value_varname) + return "Filter: %s_custom_variables ~~ %s ^%s\n" % ( + self.info, livestatus.lqencode(attribute_id.upper()), livestatus.lqencode(value)) + + +(a)filter_registry.register +class FilterCustomServiceAttribute(ABCFilterCustomAttribute): + @property + def ident(self): + return "service_custom_variable" + + @property + def title(self): + return _("Service custom attribute") + + def __init__(self): + ABCFilterCustomAttribute.__init__(self, info="service") + + def _custom_attribute_choices(self): + choices = [] + for ident, attr_spec in config.custom_service_attributes.items(): + choices.append((ident, attr_spec["title"])) + return sorted(choices, key=lambda x: x[1]) + + +(a)filter_registry.register +class FilterCustomHostAttribute(ABCFilterCustomAttribute): + @property + def ident(self): + return "host_custom_variable" + + @property + def title(self): + return _("Host custom attribute") + + def __init__(self): + ABCFilterCustomAttribute.__init__(self, info="host") + + def _custom_attribute_choices(self): + choices = [] + for attr_spec in config.wato_host_attrs: + choices.append((attr_spec["name"], attr_spec["title"])) + return sorted(choices, key=lambda x: x[1]) + + # choices = [ (value, "readable"), .. ] class FilterECServiceLevelRange(Filter): def __init__(self, info):

5 years, 4 months

Updated package-lock.json

by Lars Michelsen

Module: check_mk Branch: master Commit: c3a51987233912ff82fd1f2363d772d61f80cf2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a51987233912… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 13:52:12 2019 +0100 Updated package-lock.json Change-Id: Ib147bbf4fe69281b7eec6372436df5740d4cb00b --- package-lock.json | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f08f2a..914ce39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3040,7 +3040,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3083,7 +3084,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -3094,7 +3096,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3211,7 +3214,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3223,6 +3227,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3245,12 +3250,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3269,6 +3276,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3349,7 +3357,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3361,6 +3370,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3446,7 +3456,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3482,6 +3493,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3501,6 +3513,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3544,12 +3557,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } },

5 years, 4 months

Styling of new host/service custom variable filter

by Lars Michelsen

Module: check_mk Branch: master Commit: ea476c2c95ad43b32033744221f60fc94eaeff3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea476c2c95ad43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 22:49:06 2019 +0100 Styling of new host/service custom variable filter Change-Id: I902fd2fddacc96f301db4b344ce6aa29cc30a1d5 --- web/htdocs/themes/classic/scss/_views.scss | 10 ++++++++++ web/htdocs/themes/facelift/scss/_main.scss | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/web/htdocs/themes/classic/scss/_views.scss b/web/htdocs/themes/classic/scss/_views.scss index 40ad3db..50ae6a0 100644 --- a/web/htdocs/themes/classic/scss/_views.scss +++ b/web/htdocs/themes/classic/scss/_views.scss @@ -146,6 +146,16 @@ div.floatfilter .content .filtertime select { width: 136px; } +div.floatfilter.service_custom_variable input, div.floatfilter.host_custom_variable input, +div.floatfilter.service_custom_variable select, div.floatfilter.host_custom_variable select { + display: inline-block; + width: 45%; +} + +div.floatfilter.service_custom_variable select, div.floatfilter.host_custom_variable select { + margin-right: 10px; +} + /* Improving styling of floatfilters that are contained in a ListOf() */ table.valuespec_listof.filter { width: 300px; diff --git a/web/htdocs/themes/facelift/scss/_main.scss b/web/htdocs/themes/facelift/scss/_main.scss index b199bd8..6974e83 100644 --- a/web/htdocs/themes/facelift/scss/_main.scss +++ b/web/htdocs/themes/facelift/scss/_main.scss @@ -1546,6 +1546,7 @@ div.info { width: 100%; } .filterform > tbody > tr > td div.floatfilter .content { width: 100%; + display: block; box-sizing: border-box; padding: 12px; } .filterform > tbody > tr > td div.floatfilter .content .checkbox { @@ -1566,6 +1567,16 @@ div.info { width: 100%; border-spacing: 2px 2px; } +div.floatfilter.service_custom_variable input, div.floatfilter.host_custom_variable input, +div.floatfilter.service_custom_variable select, div.floatfilter.host_custom_variable select { + display: inline-block; + width: 45%; +} + +div.floatfilter.service_custom_variable select, div.floatfilter.host_custom_variable select { + margin-right: 10px; +} + .age input, .age select, .age textarea, .age div.snapin select, div.snapin .age select, .age div.snapin textarea, div.snapin .age textarea, .age #mk_side_search_field { box-sizing: content-box !important; }

5 years, 4 months

7185 Custom service attributes can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: ccbd9b872f96c020b7c355e9b9ac00debb467773 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccbd9b872f96c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 13:18:52 2019 +0100 7185 Custom service attributes can now be configured It is now possible to configure arbitrary custom attributes for all services just like it was already possible for hosts and users in previous versions. The configuration procedure is working equally, you first need to define an attribute in the first place, to be able to refer to the attribute and assign it to services. The definition of custom attributes is done using the Global Setting "Custom service attributes". Once you have defined a custom service attribute, you can assign it to a collection of services using the equal named ruleset "Custom service attributes". In general, you should keep the number of rules low. To support you in this, the rule is structured so that you can select several custom attributes for each rule. CMK-1727 Change-Id: I9e8f21b04f4f5909b0f1881238864cd8dfa3a514 --- .werks/7185 | 29 ++++++ cmk/gui/plugins/config/base.py | 3 + cmk/gui/plugins/wato/check_mk_configuration.py | 134 +++++++++++++++++++++++++ cmk_base/core_config.py | 7 ++ cmk_base/core_nagios.py | 5 + cmk_base/default_config/base.py | 1 + tests/unit/cmk/gui/watolib/test_watolib.py | 1 + tests/unit/cmk_base/test_core_config.py | 21 ++++ 8 files changed, 201 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ccbd9b872f…

5 years, 4 months

Fixed missing lock release if a timeout occurs while loading data from a file

by Simon Betz

Module: check_mk Branch: master Commit: d4c878f51e686acf2f3068ec22222f214c4b19de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4c878f51e686a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 26 15:51:41 2019 +0100 Fixed missing lock release if a timeout occurs while loading data from a file Change-Id: Ibc86a999978cf85d324fd71600da10b4067f888d --- .werks/7103 | 13 +++++++++++++ cmk/utils/store.py | 3 +++ 2 files changed, 16 insertions(+) diff --git a/.werks/7103 b/.werks/7103 new file mode 100644 index 0000000..f85203d --- /dev/null +++ b/.werks/7103 @@ -0,0 +1,13 @@ +Title: Fixed possibly permanent PENDING or STALE services +Level: 1 +Component: config +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551192479 +Class: fix + +This was caused by a missing lock release if a timeout occurs +while loading data from a file. +For example loading or saving files which contain counter +values for calculating rate or average values. diff --git a/cmk/utils/store.py b/cmk/utils/store.py index 62d96ba..0b71ecd 100644 --- a/cmk/utils/store.py +++ b/cmk/utils/store.py @@ -149,7 +149,10 @@ def load_data_from_file(path, default=None, lock=False): return default except MKTimeout: + if lock: + release_lock(path) raise + except Exception as e: if lock: release_lock(path)

5 years, 4 months

Keep correct site version in cmk.__version__ after .f12

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cf4b0476998f2fe25b0d58007f10e2484065bc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf4b0476998f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 11:56:42 2019 +0100 Keep correct site version in cmk.__version__ after .f12 Change-Id: I988349b02f9dbfff43ccd41d4a01eca6237f4869 --- cmk/.f12 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmk/.f12 b/cmk/.f12 index 3990212..b9ad161 100755 --- a/cmk/.f12 +++ b/cmk/.f12 @@ -5,6 +5,9 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE +CMK_VERSION=$(basename $(readlink $ROOT/version)) +CMK_VERSION=${CMK_VERSION%.*} + echo "Update site $SITE..." echo "Copy CRE files..." @@ -14,6 +17,10 @@ sudo rsync \ --exclude=cme \ --exclude=cme.py \ -a * $ROOT/lib/python/cmk/ + +# Restore site version after .f12 +sudo sed -i "s|^__version__.*$|__version__ = \"$CMK_VERSION\"|g" $ROOT/lib/python/cmk/__init__.py + sudo pycompile -q $ROOT/lib/python/cmk/ # Also deploy all other directories of same type

5 years, 4 months

Fixed duplicate class definition

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c72d4a5c01c99fff90a7f59bc6eea02a5401818 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c72d4a5c01c99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 11:09:36 2019 +0100 Fixed duplicate class definition Change-Id: I791e8c40538857c60107d24676127bb09df6e4bd --- cmk/gui/plugins/views/painters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/painters.py b/cmk/gui/plugins/views/painters.py index 9a97114..55e7440 100644 --- a/cmk/gui/plugins/views/painters.py +++ b/cmk/gui/plugins/views/painters.py @@ -2697,7 +2697,7 @@ class PainterHostAddresses(Painter): @painter_registry.register -class PainterHostAddresses(Painter): +class PainterHostAddressesAdditional(Painter): @property def ident(self): return "host_addresses_additional"

5 years, 4 months

added WK6707: SNMP with IPv6only hosts: Fixed bug which caused connection errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 84c5a6b6f85907ee091d37b35f5ed55d6bf340b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84c5a6b6f85907… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 09:57:43 2019 +0100 added WK6707: SNMP with IPv6only hosts: Fixed bug which caused connection errors Change-Id: I1f7d0ae58a45429b9f74e5e1ecace445dad8ab14 --- .werks/6707 | 12 ++++++++++++ cmk_base/classic_snmp.py | 18 +++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.werks/6707 b/.werks/6707 new file mode 100644 index 0000000..1194119 --- /dev/null +++ b/.werks/6707 @@ -0,0 +1,12 @@ +Title: SNMP with IPv6only hosts: Fixed bug which caused connection errors +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551188496 + +IPv6 addresses were not correctly quoted with brackets, hereby causing +connection errors with classic and inline-snmp connections. diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index eed8d95..ae63dd3 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -50,12 +50,13 @@ from cmk_base.exceptions import MKSNMPError def walk(host_config, oid, hex_plain=False, context_name=None): protospec = _snmp_proto_spec(host_config) + + ipaddress = host_config.ipaddress + if protospec == "udp6:": + ipaddress = "[" + ipaddress + "]" portspec = _snmp_port_spec(host_config) command = _snmp_walk_command(host_config, context_name) - command += [ - "-OQ", "-OU", "-On", "-Ot", - "%s%s%s" % (protospec, host_config.ipaddress, portspec), oid - ] + command += ["-OQ", "-OU", "-On", "-Ot", "%s%s%s" % (protospec, ipaddress, portspec), oid] console.vverbose("Running '%s'\n" % subprocess.list2cmdline(command)) @@ -92,8 +93,8 @@ def walk(host_config, oid, hex_plain=False, context_name=None): if exitstatus: console.verbose(tty.red + tty.bold + "ERROR: " + tty.normal + "SNMP error: %s\n" % error.strip()) - raise MKSNMPError("SNMP Error on %s: %s (Exit-Code: %d)" % (host_config.ipaddress, - error.strip(), exitstatus)) + raise MKSNMPError( + "SNMP Error on %s: %s (Exit-Code: %d)" % (ipaddress, error.strip(), exitstatus)) return rowinfo @@ -143,10 +144,13 @@ def get(host_config, oid, context_name=None): commandtype = "get" protospec = _snmp_proto_spec(host_config) + ipaddress = host_config.ipaddress + if protospec == "udp6:": + ipaddress = "[" + ipaddress + "]" portspec = _snmp_port_spec(host_config) command = _snmp_base_command(commandtype, host_config, context_name) + \ [ "-On", "-OQ", "-Oe", "-Ot", - "%s%s%s" % (protospec, host_config.ipaddress, portspec), + "%s%s%s" % (protospec, ipaddress, portspec), oid_prefix ] console.vverbose("Running '%s'\n" % subprocess.list2cmdline(command))

5 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019