Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Remove unused parameter from PluginCommandLine

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5f907a27146e9654b0f30e7c0bdd08ef5ccf87b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f907a27146e96… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Apr 16 11:56:41 2018 +0200 Remove unused parameter from PluginCommandLine Change-Id: I96b94c2148d157e8007e412b4d00acf3a76baee4 --- web/plugins/wato/active_checks.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9edd30c..170a8ad 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1533,7 +1533,7 @@ register_rule(group, match = 'all' ) -def PluginCommandLine(addhelp = ""): +def PluginCommandLine(): return TextAscii( title = _("Command line"), help = _("Please enter the complete shell command including path name and arguments to execute. " @@ -1569,10 +1569,7 @@ register_rule(group, default_value = _("Customcheck")) ), ( "command_line", - PluginCommandLine(addhelp = _(" " - "Passive checks: Do no specify a command line if you want " - "to define passive checks."), - ), + PluginCommandLine(), ), ( "command_name", TextAscii(

6 years, 2 months

Win-agent integration tests: retry 20 min if VM occupied

by Jukka Aro

Module: check_mk Branch: master Commit: 212d25e90cca96afdd0025b847e2af2a7f35014a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=212d25e90cca96… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Apr 16 10:33:25 2018 +0200 Win-agent integration tests: retry 20 min if VM occupied Retry obtaining test lock 20 times at intervals of 60s if the VM running the tests is occupied. This has become essential as at least 1.5.0 and master builds are sharing the same VM so another build is likely to be running on the same VM much more often than before. --- agents/windows/it/conftest.py | 12 +++++++++--- agents/windows/it/lock.py | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/agents/windows/it/conftest.py b/agents/windows/it/conftest.py index e306010..83f73e5 100644 --- a/agents/windows/it/conftest.py +++ b/agents/windows/it/conftest.py @@ -18,19 +18,25 @@ def lock_cmd(subcmd): ] -def acquire_lock(): +def lock_operation(command): + # Copy essential sources always to remote host. This is necessary as + # another test executor might have removed the files meanwhile. files = [os.path.join(localdir, f) for f in ['lock.py', 'remote.py']] cmds = [[ 'scp', sshopts, ] + files + ['%s@%s:%s' % (remoteuser, remote_ip, remotedir)], - lock_cmd('acquire')] + lock_cmd(command)] for cmd in cmds: assert_subprocess(cmd) +def acquire_lock(): + lock_operation('acquire') + + def release_lock(): - assert_subprocess(lock_cmd('release')) + lock_operation('release') def scp_agent_exe(): diff --git a/agents/windows/it/lock.py b/agents/windows/it/lock.py index 0d5d647..ac1a5d8 100644 --- a/agents/windows/it/lock.py +++ b/agents/windows/it/lock.py @@ -6,6 +6,7 @@ from contextlib import contextmanager import os import sys +import time from win32api import GetLastError from win32event import CreateMutex, ReleaseMutex from winerror import ERROR_ALREADY_EXISTS @@ -14,7 +15,7 @@ from remote import remotedir lockname = os.path.join(remotedir, 'test.lock') mutexname = '__test_lock__' - +retry_count = 20 @contextmanager def synchronized(): @@ -31,12 +32,17 @@ def synchronized(): def acquire(): - with synchronized(): - if os.path.exists(lockname): - sys.stderr.write( - 'Lock file exists. Is another test process running?') - sys.exit(1) - open(lockname, 'w').close() + for i in range(retry_count): + with synchronized(): + if not os.path.exists(lockname): + open(lockname, 'w').close() + return + sys.stderr.write('Lock file exists. Waiting 60s...') + time.sleep(60) + + sys.stderr.write('Lock file still exists after waiting %d minutes. ' + 'Another test process hung?') + sys.exit(1) def release():

6 years, 2 months

Win-agent: check correct retval of GetProcessTimes

by Jukka Aro

Module: check_mk Branch: master Commit: af47a37e216462c89efa8c188d67c68db297e410 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af47a37e216462… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 13 15:51:27 2018 +0200 Win-agent: check correct retval of GetProcessTimes GetProcessTimes returns nonzero upon success and zero upon failure. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionPS.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index c092de8..362875e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3246 +3248 diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 310fd39..13a1e97 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -29,6 +29,7 @@ #include "PerfCounter.h" #include "SectionHeader.h" #include "dynamic_func.h" +#include "win_error.h" namespace { @@ -296,11 +297,14 @@ bool SectionPS::outputNative(std::ostream &out) { FILETIME createTime, exitTime, kernelTime, userTime; ULARGE_INTEGER kernelmodetime, usermodetime; if (_winapi.GetProcessTimes(hProcess.get(), &createTime, &exitTime, - &kernelTime, &userTime) != -1) { + &kernelTime, &userTime) != 0) { kernelmodetime.LowPart = kernelTime.dwLowDateTime; kernelmodetime.HighPart = kernelTime.dwHighDateTime; usermodetime.LowPart = userTime.dwLowDateTime; usermodetime.HighPart = userTime.dwHighDateTime; + } else { + Error(_logger) << "GetProcessTimes failed: " + << get_win_error_as_string(_winapi); } DWORD processHandleCount = 0;

6 years, 2 months

5976 FIX Fixed possible "AttributeError" exception on custom graph list page

by Lars Michelsen

Module: check_mk Branch: master Commit: b6b775f3867c5bce44ff2f7904e7fe800366d1b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6b775f3867c5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 09:27:20 2018 +0200 5976 FIX Fixed possible "AttributeError" exception on custom graph list page When a user opened up the custom graph list page while another user had a custom graph that was not published to other users, this lead to an exception on this page. Change-Id: I84ccf4efbf43527f8f3fdb12b8551c7f7bbba02f --- .werks/5976 | 13 +++++++++++++ web/htdocs/pagetypes.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5976 b/.werks/5976 new file mode 100644 index 0000000..76545c5 --- /dev/null +++ b/.werks/5976 @@ -0,0 +1,13 @@ +Title: Fixed possible "AttributeError" exception on custom graph list page +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523863569 + +When a user opened up the custom graph list page while another user +had a custom graph that was not published to other users, this lead +to an exception on this page. diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index de0bc4f..1bd8050 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -497,7 +497,7 @@ class Overridable(Base): # Is this the visual which would be shown to the user in case the user # requests a visual with the current name? page = self.find_page(self.name()) - if page.owner() != self.owner(): + if page and page.owner() != self.owner(): return False return self.is_public()

6 years, 2 months

Remove _what from CustomAttrMode and separate loading of custom_attrs.mk

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f6cbc91f39ddbef97851913163552dbefb900f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6cbc91f39ddbe… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Apr 12 15:34:22 2018 +0200 Remove _what from CustomAttrMode and separate loading of custom_attrs.mk Change-Id: I0057e67b359179fd73c954e07386eb84e0cbdf80 --- web/htdocs/wato.py | 60 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e3bbe0e..806df06 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15533,13 +15533,21 @@ def update_host_custom_attrs(): watolib.Folder.root_folder().rewrite_hosts_files() +def load_custom_attrs_from_mk_file(lock): + filename = os.path.join(multisite_dir, "custom_attrs.mk") + vars = store.load_mk_file(filename, { + 'wato_user_attrs': [], + 'wato_host_attrs': [], + }, lock=lock) + + attrs = {} + for what in [ "user", "host" ]: + attrs[what] = vars.get("wato_%s_attrs" % what, []) + return attrs + + class CustomAttrMode(WatoMode): - def __init__(self, what): - # TODO: move _what to the subclasses. - # Note: _what is used in _from_vars defined in the subclass - # ModeEditCustomAttr but called in the base class WatoMode. - # Therefore, we have to set it before init right now. - self._what = what + def __init__(self): super(CustomAttrMode, self).__init__() @@ -15551,22 +15559,10 @@ class CustomAttrMode(WatoMode): def _load_attributes(self, lock=False): - self._all_attrs = self._load(lock=lock) - self._attrs = self._all_attrs.get(self._what, {}) - - - def _load(self, lock): - # TODO: cleanup that the method knows the subclasses 'user' and 'host' implicitely - filename = os.path.join(multisite_dir, "custom_attrs.mk") - vars = store.load_mk_file(filename, { - 'wato_user_attrs': [], - 'wato_host_attrs': [], - }, lock=lock) - - attrs = {} - for what in [ "user", "host" ]: - attrs[what] = vars.get("wato_%s_attrs" % what, []) - return attrs + # TODO: Inappropriate Intimacy: A custom host attribute shouldn't know + # custom user attributes (and vice versa). The only reason for this + # is that custom_attrs.mk contains both types. + self._all_attrs = load_custom_attrs_from_mk_file(lock) def _update_config(self): @@ -15589,7 +15585,16 @@ class CustomAttrMode(WatoMode): class ModeEditCustomAttr(CustomAttrMode): def __init__(self, what): - super(ModeEditCustomAttr, self).__init__(what) + # TODO: move _what to the subclasses. + # Note: _what is used in _from_vars but called in the base class WatoMode. + # Therefore, we have to set it before super(...).__init__() right now. + self._what = what + super(ModeEditCustomAttr, self).__init__() + + + @property + def _attrs(self): + return self._all_attrs[self._what] def _from_vars(self): @@ -15796,10 +15801,17 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): class ModeCustomAttrs(CustomAttrMode): def __init__(self, what): - super(ModeCustomAttrs, self).__init__(what) + # TODO: move _what to the subclasses. + super(ModeCustomAttrs, self).__init__() + self._what = what self._load_attributes(lock=html.is_transaction()) + @property + def _attrs(self): + return self._all_attrs[self._what] + + def action(self): if html.var('_delete'): delname = html.var("_delete")

6 years, 2 months

Remove _what from CustomAttrMode._save_attributes in wato.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b2dfc9159442a3feb73d01d652783a84f0388ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2dfc9159442a3… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 11 19:09:49 2018 +0200 Remove _what from CustomAttrMode._save_attributes in wato.py Change-Id: Ie8fd91d1733b62ed6c6b6b786c9848e779ea71b2 --- web/htdocs/wato.py | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 103ed30..e3bbe0e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15521,6 +15521,18 @@ class ModePatternEditor(WatoMode): # | Mange custom attributes of users (in future hosts etc.) | # '----------------------------------------------------------------------' + +def update_user_custom_attrs(): + userdb.declare_custom_user_attrs() + userdb.rewrite_users() + + +def update_host_custom_attrs(): + declare_custom_host_attrs() + watolib.Folder.invalidate_caches() + watolib.Folder.root_folder().rewrite_hosts_files() + + class CustomAttrMode(WatoMode): def __init__(self, what): # TODO: move _what to the subclasses. @@ -15544,6 +15556,7 @@ class CustomAttrMode(WatoMode): def _load(self, lock): + # TODO: cleanup that the method knows the subclasses 'user' and 'host' implicitely filename = os.path.join(multisite_dir, "custom_attrs.mk") vars = store.load_mk_file(filename, { 'wato_user_attrs': [], @@ -15556,23 +15569,17 @@ class CustomAttrMode(WatoMode): return attrs - def _save_attributes(self): - self._save(self._all_attrs) - if self._what == "user": - userdb.declare_custom_user_attrs() - userdb.rewrite_users() - else: - declare_custom_host_attrs() - watolib.Folder.invalidate_caches() - watolib.Folder.root_folder().rewrite_hosts_files() + def _update_config(self): + raise NotImplementedError() - def _save(self, attrs): + def _save_attributes(self): + # TODO: cleanup that the method knows the subclasses 'user' and 'host' implicitely output = watolib.wato_fileheader() for what in [ "user", "host" ]: - if what in attrs and len(attrs[what]) > 0: + if what in self._all_attrs and len(self._all_attrs[what]) > 0: output += "if type(wato_%s_attrs) != list:\n wato_%s_attrs = []\n" % (what, what) - output += "wato_%s_attrs += %s\n\n" % (what, pprint.pformat(attrs[what])) + output += "wato_%s_attrs += %s\n\n" % (what, pprint.pformat(self._all_attrs[what])) make_nagios_directory(multisite_dir) store.save_file(multisite_dir + "custom_attrs.mk", output) @@ -15660,6 +15667,7 @@ class ModeEditCustomAttr(CustomAttrMode): self._attr['user_editable'] = user_editable self._save_attributes() + self._update_config() return self._what + "_attrs" @@ -15749,6 +15757,10 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): def __init__(self): super(ModeEditCustomUserAttr, self).__init__('user') + + def _update_config(self): + update_user_custom_attrs() + def title(self): if self._new: return _("Create User Attribute") @@ -15765,6 +15777,10 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): def __init__(self): super(ModeEditCustomHostAttr, self).__init__('host') + + def _update_config(self): + update_host_custom_attrs() + def title(self): if self._new: return _("Create Host Attribute") @@ -15806,6 +15822,7 @@ class ModeCustomAttrs(CustomAttrMode): if attr['name'] == delname: self._attrs.pop(index) self._save_attributes() + self._update_config() add_change("edit-%sattrs" % self._what, _("Deleted attribute %s") % (delname)) elif c == False: return "" @@ -15840,6 +15857,10 @@ class ModeCustomUserAttrs(ModeCustomAttrs): super(ModeCustomUserAttrs, self).__init__('user') + def _update_config(self): + update_user_custom_attrs() + + def title(self): return _("Custom User Attributes") @@ -15855,6 +15876,10 @@ class ModeCustomHostAttrs(ModeCustomAttrs): super(ModeCustomHostAttrs, self).__init__('host') + def _update_config(self): + update_host_custom_attrs() + + def title(self): return _("Custom Host Attributes")

6 years, 2 months

Remove common base class CustomAttrMode

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 888aee983d9c20928ee13cfa796f7df369d11da5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=888aee983d9c20… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Apr 12 18:07:11 2018 +0200 Remove common base class CustomAttrMode Change-Id: I866d8fb926a3b69114f72829ecb3d6829952fd2c --- web/htdocs/wato.py | 115 ++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 63 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 806df06..248acb5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15522,6 +15522,28 @@ class ModePatternEditor(WatoMode): # '----------------------------------------------------------------------' +def declare_custom_host_attrs(): + # First remove all previously registered custom host attributes + for attr_name in watolib.all_host_attribute_names(): + if attr_name not in builtin_host_attribute_names and not\ + attr_name.startswith("tag_"): + watolib.undeclare_host_attribute(attr_name) + + # now declare the custom attributes + for attr in config.wato_host_attrs: + vs = globals()[attr['type']](title = attr['title'], help = attr['help']) + + if attr['add_custom_macro']: + a = watolib.NagiosValueSpecAttribute(attr["name"], "_" + attr["name"], vs) + else: + a = ValueSpecAttribute(attr["name"], vs) + + declare_host_attribute(a, + show_in_table = attr['show_in_table'], + topic = attr['topic'], + ) + + def update_user_custom_attrs(): userdb.declare_custom_user_attrs() userdb.rewrite_users() @@ -15546,44 +15568,24 @@ def load_custom_attrs_from_mk_file(lock): return attrs -class CustomAttrMode(WatoMode): - def __init__(self): - super(CustomAttrMode, self).__init__() - - - @classmethod - def custom_attr_types(cls): - return [ - ('TextAscii', _('Simple Text')), - ] - - - def _load_attributes(self, lock=False): - # TODO: Inappropriate Intimacy: A custom host attribute shouldn't know - # custom user attributes (and vice versa). The only reason for this - # is that custom_attrs.mk contains both types. - self._all_attrs = load_custom_attrs_from_mk_file(lock) - - - def _update_config(self): - raise NotImplementedError() - - - def _save_attributes(self): - # TODO: cleanup that the method knows the subclasses 'user' and 'host' implicitely - output = watolib.wato_fileheader() - for what in [ "user", "host" ]: - if what in self._all_attrs and len(self._all_attrs[what]) > 0: - output += "if type(wato_%s_attrs) != list:\n wato_%s_attrs = []\n" % (what, what) - output += "wato_%s_attrs += %s\n\n" % (what, pprint.pformat(self._all_attrs[what])) +def save_custom_attrs_to_mk_file(attrs): + output = watolib.wato_fileheader() + for what in [ "user", "host" ]: + if what in attrs and len(attrs[what]) > 0: + output += "if type(wato_%s_attrs) != list:\n wato_%s_attrs = []\n" % (what, what) + output += "wato_%s_attrs += %s\n\n" % (what, pprint.pformat(attrs[what])) - make_nagios_directory(multisite_dir) - store.save_file(multisite_dir + "custom_attrs.mk", output) + make_nagios_directory(multisite_dir) + store.save_file(multisite_dir + "custom_attrs.mk", output) +def custom_attr_types(): + return [ + ('TextAscii', _('Simple Text')), + ] -class ModeEditCustomAttr(CustomAttrMode): +class ModeEditCustomAttr(WatoMode): def __init__(self, what): # TODO: move _what to the subclasses. # Note: _what is used in _from_vars but called in the base class WatoMode. @@ -15597,11 +15599,15 @@ class ModeEditCustomAttr(CustomAttrMode): return self._all_attrs[self._what] + def _update_config(self): + raise NotImplementedError() + + def _from_vars(self): self._name = html.var("edit") # missing -> new custom attr self._new = self._name == None - self._load_attributes(lock=html.is_transaction()) + self._all_attrs = load_custom_attrs_from_mk_file(lock=html.is_transaction()) if not self._new: self._attr = [ a for a in self._attrs if a['name'] == self._name ] @@ -15648,7 +15654,7 @@ class ModeEditCustomAttr(CustomAttrMode): raise MKUserError("name", _("Sorry, there is already an attribute with that name.")) ty = html.var('type', '').strip() - if ty not in [ t[0] for t in self.custom_attr_types() ]: + if ty not in [ t[0] for t in custom_attr_types() ]: raise MKUserError('type', _('The choosen attribute type is invalid.')) self._attr = { @@ -15671,7 +15677,7 @@ class ModeEditCustomAttr(CustomAttrMode): if self._what == "user": self._attr['user_editable'] = user_editable - self._save_attributes() + save_custom_attrs_to_mk_file(self._all_attrs) self._update_config() return self._what + "_attrs" @@ -15719,9 +15725,9 @@ class ModeEditCustomAttr(CustomAttrMode): forms.section(_('Data type')) html.help(_('The type of information to be stored in this attribute.')) if self._new: - html.dropdown('type', self.custom_attr_types(), deflt=self._attr.get('type')) + html.dropdown('type', custom_attr_types(), deflt=self._attr.get('type')) else: - html.write(dict(self.custom_attr_types())[self._attr.get('type')]) + html.write(dict(custom_attr_types())[self._attr.get('type')]) if self._what == "user": forms.section(_('Editable by Users')) @@ -15799,12 +15805,12 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): -class ModeCustomAttrs(CustomAttrMode): +class ModeCustomAttrs(WatoMode): def __init__(self, what): # TODO: move _what to the subclasses. super(ModeCustomAttrs, self).__init__() self._what = what - self._load_attributes(lock=html.is_transaction()) + self._all_attrs = load_custom_attrs_from_mk_file(lock=html.is_transaction()) @property @@ -15812,6 +15818,10 @@ class ModeCustomAttrs(CustomAttrMode): return self._all_attrs[self._what] + def _update_config(self): + raise NotImplementedError() + + def action(self): if html.var('_delete'): delname = html.var("_delete") @@ -15833,7 +15843,7 @@ class ModeCustomAttrs(CustomAttrMode): for index, attr in enumerate(self._attrs): if attr['name'] == delname: self._attrs.pop(index) - self._save_attributes() + save_custom_attrs_to_mk_file(self._all_attrs) self._update_config() add_change("edit-%sattrs" % self._what, _("Deleted attribute %s") % (delname)) elif c == False: @@ -15858,7 +15868,7 @@ class ModeCustomAttrs(CustomAttrMode): table.cell(_("Name"), custom_attr['name']) table.cell(_("Title"), custom_attr['title']) - table.cell(_("Type"), dict(ModeEditCustomAttr.custom_attr_types())[custom_attr['type']]) + table.cell(_("Type"), dict(custom_attr_types())[custom_attr['type']]) table.end() @@ -15906,27 +15916,6 @@ class ModeCustomHostAttrs(ModeCustomAttrs): -def declare_custom_host_attrs(): - # First remove all previously registered custom host attributes - for attr_name in watolib.all_host_attribute_names(): - if attr_name not in builtin_host_attribute_names and not\ - attr_name.startswith("tag_"): - watolib.undeclare_host_attribute(attr_name) - - # now declare the custom attributes - for attr in config.wato_host_attrs: - vs = globals()[attr['type']](title = attr['title'], help = attr['help']) - - if attr['add_custom_macro']: - a = watolib.NagiosValueSpecAttribute(attr["name"], "_" + attr["name"], vs) - else: - a = ValueSpecAttribute(attr["name"], vs) - - declare_host_attribute(a, - show_in_table = attr['show_in_table'], - topic = attr['topic'], - ) - #. # .--Check Plugins-------------------------------------------------------. # | ____ _ _ ____ _ _ |

6 years, 2 months

Remove _what from ModeEditCustomAttr

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e9dab4344a1ae88bf5f7856b328b420a25ada7f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9dab4344a1ae8… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Apr 12 18:54:44 2018 +0200 Remove _what from ModeEditCustomAttr Change-Id: I00f3b4a9a8f42cf6c5c3410f6ecfcbc1267645ea --- web/htdocs/wato.py | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 73323e1..d432944 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15586,23 +15586,20 @@ def custom_attr_types(): class ModeEditCustomAttr(WatoMode): - def __init__(self, what): - # TODO: move _what to the subclasses. - # Note: _what is used in _from_vars but called in the base class WatoMode. - # Therefore, we have to set it before super(...).__init__() right now. - self._what = what + def __init__(self): super(ModeEditCustomAttr, self).__init__() + @property + def _type(self): + raise NotImplementedError() @property def _attrs(self): - return self._all_attrs[self._what] - + return self._all_attrs[self._type] def _update_config(self): raise NotImplementedError() - def _from_vars(self): self._name = html.var("edit") # missing -> new custom attr self._new = self._name == None @@ -15621,12 +15618,11 @@ class ModeEditCustomAttr(WatoMode): else: self._attr = {} - def title(self): raise NotImplementedError() - def action(self): + # TODO: remove subclass specific things specifict things (everything with _type == 'user') if not html.check_transaction(): return @@ -15640,7 +15636,7 @@ class ModeEditCustomAttr(WatoMode): topic = html.var('topic', '').strip() help = html.get_unicode_input('help').strip() - if self._what == "user": + if self._type == "user": user_editable = html.get_checkbox('user_editable') show_in_table = html.get_checkbox('show_in_table') add_custom_macro = html.get_checkbox('add_custom_macro') @@ -15666,9 +15662,9 @@ class ModeEditCustomAttr(WatoMode): } self._attrs.append(self._attr) - add_change("edit-%sattr" % self._what, _("Create new %s attribute %s") % (self._what, self._name)) + add_change("edit-%sattr" % self._type, _("Create new %s attribute %s") % (self._type, self._name)) else: - add_change("edit-%sattr" % self._what, _("Modified %s attribute %s") % (self._what, self._name)) + add_change("edit-%sattr" % self._type, _("Modified %s attribute %s") % (self._type, self._name)) self._attr.update({ 'title' : title, 'topic' : topic, @@ -15677,16 +15673,16 @@ class ModeEditCustomAttr(WatoMode): 'add_custom_macro' : add_custom_macro, }) - if self._what == "user": + if self._type == "user": self._attr['user_editable'] = user_editable save_custom_attrs_to_mk_file(self._all_attrs) self._update_config() - return self._what + "_attrs" - + return self._type + "_attrs" def page(self): + # TODO: remove subclass specific things specifict things (everything with _type == 'user') html.begin_form("attr") forms.header(_("Properties")) forms.section(_("Name"), simple = not self._new) @@ -15706,7 +15702,7 @@ class ModeEditCustomAttr(WatoMode): forms.section(_('Topic')) html.help(_('The attribute is added to this section in the edit dialog.')) - if self._what == "user": + if self._type == "user": topics = [ ('ident', _('Identity')), ('security', _('Security')), @@ -15732,7 +15728,7 @@ class ModeEditCustomAttr(WatoMode): else: html.write(dict(custom_attr_types())[self._attr.get('type')]) - if self._what == "user": + if self._type == "user": forms.section(_('Editable by Users')) html.help(_('It is possible to let users edit their custom attributes.')) html.checkbox('user_editable', self._attr.get('user_editable', True), @@ -15745,7 +15741,7 @@ class ModeEditCustomAttr(WatoMode): label = _("Show the setting of the attribute in the list table")) forms.section(_('Add as custom macro')) - if self._what == "user": + if self._type == "user": html.help(_('The attribute can be added to the contact definiton in order ' 'to use it for notifications.')) label = _("Make this variable available in notifications") @@ -15766,11 +15762,13 @@ class ModeEditCustomAttr(WatoMode): html.end_form() - class ModeEditCustomUserAttr(ModeEditCustomAttr): def __init__(self): - super(ModeEditCustomUserAttr, self).__init__('user') + super(ModeEditCustomUserAttr, self).__init__() + @property + def _type(self): + return 'user' def _update_config(self): update_user_custom_attrs() @@ -15781,7 +15779,6 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): else: return _("Edit User Attribute") - def buttons(self): html.context_button(_("Back"), watolib.folder_preserving_link([ ("mode", "user_attrs")]), "back") @@ -15789,8 +15786,11 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): class ModeEditCustomHostAttr(ModeEditCustomAttr): def __init__(self): - super(ModeEditCustomHostAttr, self).__init__('host') + super(ModeEditCustomHostAttr, self).__init__() + @property + def _type(self): + return 'host' def _update_config(self): update_host_custom_attrs() @@ -15801,13 +15801,11 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): else: return _("Edit Host Attribute") - def buttons(self): html.context_button(_("Back"), watolib.folder_preserving_link([ ("mode", "host_attrs")]), "back") - class ModeCustomAttrs(WatoMode): def __init__(self): super(ModeCustomAttrs, self).__init__()

6 years, 2 months

Remove _what from ModeCustomAttrs

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7357eaeadd3270c583f42bc78a22159d82cd7049 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7357eaeadd3270… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Apr 12 18:37:06 2018 +0200 Remove _what from ModeCustomAttrs Change-Id: Iee997b3d7492481be2197bba6d4935f0dff6ee12 --- web/htdocs/wato.py | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 248acb5..73323e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15607,6 +15607,9 @@ class ModeEditCustomAttr(WatoMode): self._name = html.var("edit") # missing -> new custom attr self._new = self._name == None + # TODO: Inappropriate Intimacy: custom host attributes should not now about + # custom user attributes and vice versa. The only reason they now about + # each other now is that they are stored in one file. self._all_attrs = load_custom_attrs_from_mk_file(lock=html.is_transaction()) if not self._new: @@ -15806,35 +15809,32 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): class ModeCustomAttrs(WatoMode): - def __init__(self, what): - # TODO: move _what to the subclasses. + def __init__(self): super(ModeCustomAttrs, self).__init__() - self._what = what + # TODO: Inappropriate Intimacy: custom host attributes should not now about + # custom user attributes and vice versa. The only reason they now about + # each other now is that they are stored in one file. self._all_attrs = load_custom_attrs_from_mk_file(lock=html.is_transaction()) + @property + def _type(self): + raise NotImplementedError() @property def _attrs(self): - return self._all_attrs[self._what] + return self._all_attrs[self._type] + def title(self): + raise NotImplementedError() def _update_config(self): raise NotImplementedError() - def action(self): if html.var('_delete'): delname = html.var("_delete") - # FIXME: Find usages and warn - #if usages: - # message = "%s %s:<ul>" % \ - # (_("You cannot delete this %s attribute.") % self._what, - # _("It is still in use by")) - # for title, link in usages: - # message += '<li><a href="%s">%s</a></li>\n' % (link, title) - # message += "</ul>" - # raise MKUserError(None, message) + # FIXME: Raise an error if the attribute is still used confirm_txt = _('Do you really want to delete the custom attribute "%s"?') % (delname) @@ -15845,22 +15845,21 @@ class ModeCustomAttrs(WatoMode): self._attrs.pop(index) save_custom_attrs_to_mk_file(self._all_attrs) self._update_config() - add_change("edit-%sattrs" % self._what, _("Deleted attribute %s") % (delname)) + add_change("edit-%sattrs" % self._type, _("Deleted attribute %s") % (delname)) elif c == False: return "" - def page(self): if not self._attrs: html.div(_("No custom attributes are defined yet."), class_="info") return - table.begin(self._what + "attrs") + table.begin(self._type + "attrs") for custom_attr in sorted(self._attrs, key=lambda x: x['title']): table.row() table.cell(_("Actions"), css="buttons") - edit_url = watolib.folder_preserving_link([("mode", "edit_%s_attr" % self._what), + edit_url = watolib.folder_preserving_link([("mode", "edit_%s_attr" % self._type), ("edit", custom_attr['name'])]) delete_url = html.makeactionuri([("_delete", custom_attr['name'])]) html.icon_button(edit_url, _("Properties"), "edit") @@ -15873,49 +15872,47 @@ class ModeCustomAttrs(WatoMode): table.end() - class ModeCustomUserAttrs(ModeCustomAttrs): def __init__(self): - super(ModeCustomUserAttrs, self).__init__('user') + super(ModeCustomUserAttrs, self).__init__() + @property + def _type(self): + return 'user' def _update_config(self): update_user_custom_attrs() - def title(self): return _("Custom User Attributes") - def buttons(self): html.context_button(_("Users"), watolib.folder_preserving_link([("mode", "users")]), "back") html.context_button(_("New attribute"), watolib.folder_preserving_link([("mode", "edit_user_attr")]), "new") - class ModeCustomHostAttrs(ModeCustomAttrs): def __init__(self): - super(ModeCustomHostAttrs, self).__init__('host') + super(ModeCustomHostAttrs, self).__init__() + @property + def _type(self): + return 'host' def _update_config(self): update_host_custom_attrs() - def title(self): return _("Custom Host Attributes") - def buttons(self): html.context_button(_("Folder"), watolib.folder_preserving_link([("mode", "folder")]), "back") html.context_button(_("New attribute"), watolib.folder_preserving_link([("mode", "edit_host_attr")]), "new") - def get_attributes(self): return self._attrs - #. # .--Check Plugins-------------------------------------------------------. # | ____ _ _ ____ _ _ |

6 years, 2 months

Move subclass specific things in ModeEditCustomAttrs to the subclasses

by Tom Baerwinkel

Module: check_mk Branch: master Commit: baac5db21063ae804acb06d3301cac5bdd362b54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baac5db21063ae… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Apr 13 09:14:26 2018 +0200 Move subclass specific things in ModeEditCustomAttrs to the subclasses Change-Id: I6f5a43fdabc2651556e75ea240baed1718c66343 --- web/htdocs/wato.py | 105 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d432944..7c044da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15621,6 +15621,9 @@ class ModeEditCustomAttr(WatoMode): def title(self): raise NotImplementedError() + def _add_extra_attrs_from_html_vars(self): + pass + def action(self): # TODO: remove subclass specific things specifict things (everything with _type == 'user') if not html.check_transaction(): @@ -15636,8 +15639,6 @@ class ModeEditCustomAttr(WatoMode): topic = html.var('topic', '').strip() help = html.get_unicode_input('help').strip() - if self._type == "user": - user_editable = html.get_checkbox('user_editable') show_in_table = html.get_checkbox('show_in_table') add_custom_macro = html.get_checkbox('add_custom_macro') @@ -15673,21 +15674,35 @@ class ModeEditCustomAttr(WatoMode): 'add_custom_macro' : add_custom_macro, }) - if self._type == "user": - self._attr['user_editable'] = user_editable + self._add_extra_attrs_from_html_vars() save_custom_attrs_to_mk_file(self._all_attrs) self._update_config() return self._type + "_attrs" + @property + def _topics(self): + raise NotImplementedError() + + @property + def _macro_help(self): + raise NotImplementedError() + + @property + def _macro_label(self): + raise NotImplementedError() + + def _add_extra_form_sections(self): + pass + def page(self): # TODO: remove subclass specific things specifict things (everything with _type == 'user') html.begin_form("attr") forms.header(_("Properties")) forms.section(_("Name"), simple = not self._new) html.help(_("The name of the attribute is used as an internal key. It cannot be " - "changed later.")) + "changed later.")) if self._new: html.text_input("name", self._attr.get('name')) html.set_focus("name") @@ -15701,21 +15716,8 @@ class ModeEditCustomAttr(WatoMode): forms.section(_('Topic')) html.help(_('The attribute is added to this section in the edit dialog.')) - - if self._type == "user": - topics = [ - ('ident', _('Identity')), - ('security', _('Security')), - ('notify', _('Notifications')), - ('personal', _('Personal Settings')), - ] - default_topic = "personal" - else: - topics = list(set([ (a[1], a[1]) for a in watolib.all_host_attributes() if a[1] != None ])) - topics.insert(0, (_("Custom attributes"), _("Custom attributes"))) - default_topic = _("Custom attributes") - - html.dropdown('topic', topics, deflt=self._attr.get('topic', 'personal')) + # TODO: is deflt set correctly? + html.dropdown('topic', self._topics, deflt=self._attr.get('topic', 'personal')) forms.section(_('Help Text') + "*") html.help(_('You might want to add some helpful description for the attribute.')) @@ -15728,11 +15730,7 @@ class ModeEditCustomAttr(WatoMode): else: html.write(dict(custom_attr_types())[self._attr.get('type')]) - if self._type == "user": - forms.section(_('Editable by Users')) - html.help(_('It is possible to let users edit their custom attributes.')) - html.checkbox('user_editable', self._attr.get('user_editable', True), - label = _("Users can change this attribute in their personal settings")) + self._add_extra_form_sections() forms.section(_('Show in Table')) html.help(_('This attribute is only visibile on the detail pages by default, but ' @@ -15741,19 +15739,9 @@ class ModeEditCustomAttr(WatoMode): label = _("Show the setting of the attribute in the list table")) forms.section(_('Add as custom macro')) - if self._type == "user": - html.help(_('The attribute can be added to the contact definiton in order ' - 'to use it for notifications.')) - label = _("Make this variable available in notifications") - else: - html.help(_("The attribute can be added to the host definition in order to " - "use it as monitoring macro in different places, for example " - "as macro in check commands or notifications.")) - label = _("Make this variable available as monitoring macro, " - "e.g. in check commands or in notifications.") - + html.help(self._macro_help) html.checkbox('add_custom_macro', self._attr.get('add_custom_macro', False), - label=label) + label=self._macro_label) forms.end() html.show_localization_hint() @@ -15770,9 +15758,35 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): def _type(self): return 'user' + @property + def _topics(self): + return [ + ('ident', _('Identity')), + ('security', _('Security')), + ('notify', _('Notifications')), + ('personal', _('Personal Settings')), + ] + + @property + def _macro_help(self): + return _('The attribute can be added to the contact definiton in order to use it for notifications.') + + @property + def _macro_label(self): + return _("Make this variable available in notifications") + def _update_config(self): update_user_custom_attrs() + def _add_extra_attrs_from_html_vars(self): + self._attr['user_editable'] = html.get_checkbox('user_editable') + + def _add_extra_form_sections(self): + forms.section(_('Editable by Users')) + html.help(_('It is possible to let users edit their custom attributes.')) + html.checkbox('user_editable', self._attr.get('user_editable', True), + label = _("Users can change this attribute in their personal settings")) + def title(self): if self._new: return _("Create User Attribute") @@ -15792,6 +15806,23 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): def _type(self): return 'host' + @property + def _topics(self): + topics = list(set([ (a[1], a[1]) for a in watolib.all_host_attributes() if a[1] != None ])) + topics.insert(0, (_("Custom attributes"), _("Custom attributes"))) + return topics + + @property + def _macro_help(self): + return _("The attribute can be added to the host definition in order to " + "use it as monitoring macro in different places, for example " + "as macro in check commands or notifications.") + + @property + def _macro_label(self): + return _("Make this variable available as monitoring macro, " + "e.g. in check commands or in notifications.") + def _update_config(self): update_host_custom_attrs()

6 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018