Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

5822 FIX WATO Web-API set_ruleset: Now able to delete complete rulesets from folders

by Andreas

Module: check_mk Branch: master Commit: 8e37367c0657d7b368f9c7aa25107c5439d137e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e37367c0657d7… Author: Andreas <ab(a)mathias-kettner.de> Date: Thu Jun 14 18:57:20 2018 +0200 5822 FIX WATO Web-API set_ruleset: Now able to delete complete rulesets from folders Removing all rulesets of a specific type from a folder always failed with the exception <tt>'list' object has no attribute 'get'</tt>. This has been fixed. Change-Id: Ie39dd3e99ec0d2a8b21c7abcad6174e7d7e64417 --- .werks/5822 | 13 +++++++++++++ web/plugins/webapi/webapi.py | 9 +++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/5822 b/.werks/5822 new file mode 100644 index 0000000..b4ab409 --- /dev/null +++ b/.werks/5822 @@ -0,0 +1,13 @@ +Title: WATO Web-API set_ruleset: Now able to delete complete rulesets from folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1528995338 + +Removing all rulesets of a specific type from a folder always failed with the exception +<tt>'list' object has no attribute 'get'</tt>. This has been fixed. + diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 0b4b4a5..fe047f6 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -783,15 +783,16 @@ class APICallRules(APICallCollection): for folder_path in folders_obsolete_ruleset: folder = watolib.Folder.folder(folder_path) - folder_rulesets = watolib.FolderRulesets(ruleset_name) - # TODO: Shouldn't this call .load()? - + folder_rulesets = watolib.FolderRulesets(folder) + folder_rulesets.load() # TODO: This add_change() call should be made by the data classes watolib.add_change("edit-ruleset", _("Deleted ruleset '%s' for '%s'") % (watolib.Ruleset(ruleset_name).title(), folder.title()), sites=folder.all_site_ids()) - folder_rulesets.from_config(folder, []) + new_ruleset = watolib.Ruleset(ruleset_name) + new_ruleset.from_config(folder, []) + folder_rulesets.set(ruleset_name, new_ruleset) folder_rulesets.save()

6 years

5821 FIX Fixed exception during configuration changes

by Andreas

Module: check_mk Branch: master Commit: 83b8c282655b612b48f3370be0fa0c6c3994dfcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83b8c282655b61… Author: Andreas <ab(a)mathias-kettner.de> Date: Thu Jun 14 17:39:20 2018 +0200 5821 FIX Fixed exception during configuration changes This exception could happens on various instances. For example when saving global settings or during the activate changes phase. The exception text showed <tt>super(type, obj): obj must be an instance or subtype of type</tt>. Change-Id: Iac78617d4be8f802915cda1ebf08d09694f50878 --- .werks/5821 | 14 ++++++++++++++ web/htdocs/backup.py | 2 ++ web/htdocs/gui_background_job.py | 9 ++++++++- web/htdocs/watolib.py | 11 +++++++---- web/plugins/webapi/webapi.py | 6 +++++- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.werks/5821 b/.werks/5821 new file mode 100644 index 0000000..bb96df8 --- /dev/null +++ b/.werks/5821 @@ -0,0 +1,14 @@ +Title: Fixed exception during configuration changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1528990598 + +This exception could happens on various instances. For example +when saving global settings or during the activate changes phase. + +The exception text showed <tt>super(type, obj): obj must be an instance or subtype of type</tt>. diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index f5bc8a2..f8adad4 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -1297,6 +1297,7 @@ class BackupTargetType(object): @classmethod def choices(cls): choices = [] + # TODO: subclasses with the same name may be registered multiple times, due to execfile for type_class in cls.__subclasses__(): # pylint: disable=no-member choices.append((type_class.ident, type_class.title(), type_class.valuespec())) return sorted(choices, key=lambda x: x[1]) @@ -1304,6 +1305,7 @@ class BackupTargetType(object): @classmethod def get_type(cls, type_ident): + # TODO: subclasses with the same name may be registered multiple times, due to execfile for type_class in cls.__subclasses__(): # pylint: disable=no-member if type_class.ident == type_ident: return type_class diff --git a/web/htdocs/gui_background_job.py b/web/htdocs/gui_background_job.py index 077846c..63c7cdf 100644 --- a/web/htdocs/gui_background_job.py +++ b/web/htdocs/gui_background_job.py @@ -185,8 +185,15 @@ class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions, background_job.Back @classmethod def get_concrete_subclasses(cls): - all_subclasses = [] + # Note: Due to the strange execfile plugin mechanism, there is a risk + # that a class gets declared multiple times. We always use the last + # declaration of the given class + classes = {} for subclass in cls.__subclasses__(): # pylint: disable=no-member + classes[subclass.__name__] = subclass + + all_subclasses = [] + for subclass in classes.values(): # Concrete subclasses have an attribute job_prefix if hasattr(subclass, "job_prefix"): all_subclasses.append(subclass) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b9181cd..655cdc9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -282,13 +282,16 @@ class ConfigDomain(object): @classmethod def all_classes(cls): - subclasses = cls.__subclasses__() # pylint: disable=no-member - # Classes may be registered twice, only store one of the occurances. # TODO(lm): Find the reason for this and solve this issue in the plugin mechanism. + # NOTE: One reason is the rampant execfile usage in the plugin folders + # each language change creates additional class definitions + + # The latest "fix" changes the behaviour to return the last declared class with the + # same class name. This is usually a better idea, than returning outdated classes classes = {} - for subclass in subclasses: - classes.setdefault(subclass.__name__, subclass) + for subclass in cls.__subclasses__(): # pylint: disable=no-member + classes[subclass.__name__] = subclass return classes.values() diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index ee553fe..0b4b4a5 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -134,7 +134,11 @@ def add_configuration_hash(response, configuration_object): class APICallCollection(object): @classmethod def all_classes(cls): - return cls.__subclasses__() # pylint: disable=no-member + classes = {} + for subclass in cls.__subclasses__(): # pylint: disable=no-member + classes[subclass.__name__] = subclass + + return classes.values() def get_api_calls(self):

6 years

Cleanup of exclusion of if64 and if64adm

by Simon Betz

Module: check_mk Branch: master Commit: 4281bc80050cecf4f7bb7b990ce05a67ff9e7cd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4281bc80050cec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 14 16:33:26 2018 +0200 Cleanup of exclusion of if64 and if64adm Change-Id: I60be4989d7bd63d44eb30594d39042e53d90941d --- checks/fsc_if64 | 3 +-- checks/if64 | 3 +-- checks/if64.include | 6 ++++-- checks/if64adm | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/checks/fsc_if64 b/checks/fsc_if64 index e1360e9..11b2dc7 100644 --- a/checks/fsc_if64 +++ b/checks/fsc_if64 @@ -317,8 +317,7 @@ check_info['fsc_if64'] = { 'has_perfdata' : True, 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( '.1.3.6.1.2.1', if64_snmp_end_oids ), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, False), + 'snmp_scan_function' : if64_scan_function, 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels', diff --git a/checks/if64 b/checks/if64 index c069154..4ee3ba1 100644 --- a/checks/if64 +++ b/checks/if64 @@ -40,8 +40,7 @@ check_info["if64"] = { 'has_perfdata' : True, 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, False), + 'snmp_scan_function' : if64_scan_function, 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels', diff --git a/checks/if64.include b/checks/if64.include index 2d9ffe2..18e61cf 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -50,6 +50,9 @@ def need_if64adm(): def if64_scan_function(oid, use_if64adm): + if if64_disabled(host_name()): + return False + ignored_strings = [ "LANCOM", "ELSA", @@ -65,8 +68,7 @@ def if64_scan_function(oid, use_if64adm): string in oid(".1.3.6.1.2.1.1.2.0"): return False - if need_if64adm() != use_if64adm or \ - if64_disabled(host_name()): + if need_if64adm() != use_if64adm: return False if oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None: diff --git a/checks/if64adm b/checks/if64adm index 8fccd41..b93d010 100644 --- a/checks/if64adm +++ b/checks/if64adm @@ -54,8 +54,7 @@ check_info["if64adm"] = { 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids + [ "2.2.1.7", # ifAdminStatus ]), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, True), + 'snmp_scan_function' : lambda oid: if64_scan_function(oid, True), 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels',

6 years

Humidity rule: Fix match_type

by Konstantin Büttner

Module: check_mk Branch: master Commit: babc758f0cdd03ea319218d8904bbabec2b01d98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=babc758f0cdd03… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 14 15:53:21 2018 +0200 Humidity rule: Fix match_type Change-Id: Icc4b7678d4113c76cc5d9c3d9f53a89724f76e71 --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 268fd11..923e331 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -9761,7 +9761,7 @@ register_check_parameters( title = _("Sensor name"), help = _("The identifier of the sensor."), ), - match_type = "first", + match_type = "dict", ) register_check_parameters(

6 years

Move the non-constant state out of check_api.

by Sven Panne

Module: check_mk Branch: master Commit: e0290a1ec3d49058e0847ce8b5cd1fb9c66ed340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0290a1ec3d490… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 14 14:50:48 2018 +0200 Move the non-constant state out of check_api. This module should basically act as a template for checks contexts, having modifiable state in it which is shared across all contexts is highly obscure. Furthermore, this decouples checks and check_api a bit more, we are currently left with a single connection in that direction. Change-Id: I6a101019d247ef3bcc4b54165bd4dbe74b38b1df --- cmk_base/automations/check_mk.py | 3 ++- cmk_base/check_api.py | 30 ++++++------------------------ cmk_base/check_api_utils.py | 36 ++++++++++++++++++++++++++++++++++++ cmk_base/check_table.py | 3 ++- cmk_base/checking.py | 5 +++-- cmk_base/checks.py | 11 +---------- cmk_base/core_nagios.py | 3 ++- cmk_base/discovery.py | 4 ++-- cmk_base/snmp_scan.py | 3 ++- 9 files changed, 56 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e0290a1ec3…

6 years

Fix typo in comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: 33c2ad4adfc9673482f215849b8c1febe90784cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c2ad4adfc967… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 14 14:39:24 2018 +0200 Fix typo in comment Change-Id: Ic4ce8eccf38dee3b4109cd5d1015467d56d7f15c --- 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 fd2ccd9..12d2c4e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -358,7 +358,7 @@ class Integer(ValueSpec): value, self._maxvalue)) ValueSpec.custom_validate(self, value, varprefix) -# Filesize in Byte,Kbyte,Mbyte,Gigatbyte, Terrabyte +# Filesize in Byte, KByte, MByte, Gigabyte, Terabyte class Filesize(Integer): def __init__(self, **kwargs): Integer.__init__(self, **kwargs)

6 years

Moved some check API constants to a separate module for now.

by Sven Panne

Module: check_mk Branch: master Commit: 2676b456202da54229cb5a38dd0f8632e5f654f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2676b456202da5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 14 12:13:49 2018 +0200 Moved some check API constants to a separate module for now. This reduces the imports of check_api and is a prerequisite for breaking two cycles. More to come... Change-Id: Iaabcbfb09b83519e46263fee7a0ff4381683ca78 --- cmk_base/check_api.py | 18 +++++-------- cmk_base/check_api_utils.py | 54 +++++++++++++++++++++++++++++++++++++++ cmk_base/checks.py | 13 +++++----- cmk_base/data_sources/abstract.py | 4 +-- cmk_base/discovery.py | 6 ++--- cmk_base/inventory.py | 8 +++--- 6 files changed, 77 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2676b45620…

6 years

Removed dead import.

by Sven Panne

Module: check_mk Branch: master Commit: 2b2db743e0d8c5a42eaaff928fa7cbd9d06cdeee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b2db743e0d8c5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 14 11:52:39 2018 +0200 Removed dead import. Change-Id: Iabad90e447cf10be1e9640d8f82c9ecbab656b45 --- cmk_base/inventory_plugins.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk_base/inventory_plugins.py b/cmk_base/inventory_plugins.py index 8f4614b..193322d 100644 --- a/cmk_base/inventory_plugins.py +++ b/cmk_base/inventory_plugins.py @@ -30,7 +30,6 @@ import cmk.paths from cmk.exceptions import MKGeneralException import cmk_base.checks as checks -import cmk_base.check_api as check_api import cmk_base.console as console import cmk_base.check_utils

6 years

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 501f76166787415dbd92728039cb027faeb48875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=501f7616678741… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 14 11:33:41 2018 +0200 Minor code cleanup Change-Id: I91e56b78155c3ed11b3c4f546b1ec099ac0af16c --- checks/temperature.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 73268d5..f3aee28 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -243,9 +243,9 @@ def check_temperature_trend(temp, params, output_unit, crit, crit_lower, unique_ # dev_status_name: the device name (will be added in the check output) # Note: you must not specify dev_status and dev_levels at the same time! -def check_temperature(reading, params, unique_name, dev_unit = "c", - dev_levels = None, dev_levels_lower = None, - dev_status = None, dev_status_name = None): +def check_temperature(reading, params, unique_name, dev_unit="c", + dev_levels=None, dev_levels_lower=None, + dev_status=None, dev_status_name=None): def check_temp_levels(temp, warn, crit, warn_lower, crit_lower):

6 years

quantum_libsmall_door: Get rid of useless if info construct

by Konstantin Büttner

Module: check_mk Branch: master Commit: 151ecb0dfd1b1cd8ba34f5840be82b6bc3c80a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=151ecb0dfd1b1c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 13 09:38:25 2018 +0200 quantum_libsmall_door: Get rid of useless if info construct --- checks/quantum_libsmall_door | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/quantum_libsmall_door b/checks/quantum_libsmall_door index 21548b0..afc7142 100644 --- a/checks/quantum_libsmall_door +++ b/checks/quantum_libsmall_door @@ -26,8 +26,7 @@ def inventory_quantum_libsmall_door(info): - if info: - return [ (None, None) ] + return [ (None, None) ] def check_quantum_libsmall_door(_no_item, _no_params, info):

6 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018