Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

5853 FIX Fixed escaped HTML entities in view columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 93574619bd6e802b056c5f09f5229f8fdf176460 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93574619bd6e80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 14:26:25 2018 +0100 5853 FIX Fixed escaped HTML entities in view columns When creating a PDF report which contains a view element. The columns in this view could contain HTML escaped special characters like "&quot;". These signs are now displayed correctly in the PDF export. Change-Id: Icafe74d682d18daa979e9bb26c46e2dd48ed17fb --- .werks/5853 | 13 +++++++++++++ web/htdocs/htmllib.py | 7 +++++++ web/htdocs/views.py | 1 + 3 files changed, 21 insertions(+) diff --git a/.werks/5853 b/.werks/5853 new file mode 100644 index 0000000..e2c1aa6 --- /dev/null +++ b/.werks/5853 @@ -0,0 +1,13 @@ +Title: Fixed escaped HTML entities in view columns +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1519133099 + +When creating a PDF report which contains a view element. The columns +in this view could contain HTML escaped special characters like "&quot;". +These signs are now displayed correctly in the PDF export. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e114929..025b97a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -136,6 +136,13 @@ class Escaper(object): .replace(">", ">") + def unescape_attributes(self, value): + return value.replace("&", "&")\ + .replace(""", "\"")\ + .replace("<", "<")\ + .replace(">", ">") + + # render HTML text. # We only strip od some tags and allow some simple tags # such as <h1>, <b> or <i> to be part of the string. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 410c71a..cf1e5da 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -805,6 +805,7 @@ class Cell(object): else: txt = img_filename + txt = html.unescape_attributes(txt) txt = html.strip_tags(txt) return css_classes, txt

6 years, 4 months

Added typing module.

by Sven Panne

Module: check_mk Branch: master Commit: 1a637453a9ab4e53b8bcdda447e4456576610892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a637453a9ab4e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 13:13:31 2018 +0100 Added typing module. Change-Id: Idac0d5e1dc2709f5f821b696defa49c1e19cc1df --- omd/packages/python-modules/Makefile | 9 +++++---- omd/packages/python-modules/src/typing-3.6.4.tar.gz | Bin 0 -> 71347 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 7684b8f..618a45f 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -104,13 +104,14 @@ MODULES+=requests-2.13.0.tar.gz # Has requests as dependency -> must be built after MODULES += pyOpenSSL-16.2.0.tar.gz # Added for check_bi_aggr with kerberos support -MODULES+=pykerberos-1.2.1.tar.gz -MODULES+=requests-kerberos-0.11.0.tar.gz +MODULES += pykerberos-1.2.1.tar.gz +MODULES += requests-kerberos-0.11.0.tar.gz # Added for tinkerforge special agent -MODULES+=tinkerforge-2.1.15.tar.gz +MODULES += tinkerforge-2.1.15.tar.gz # Added for check_sftp -MODULES+=paramiko-2.1.2.tar.gz +MODULES += paramiko-2.1.2.tar.gz +MODULES += typing-3.6.4.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/typing-3.6.4.tar.gz b/omd/packages/python-modules/src/typing-3.6.4.tar.gz new file mode 100644 index 0000000..c345666 Binary files /dev/null and b/omd/packages/python-modules/src/typing-3.6.4.tar.gz differ

6 years, 4 months

Add management board tests involving the management board config ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 13811914e7ea51292ee87565bb7ef8ab64b9b8b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13811914e7ea51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:57:21 2018 +0100 Add management board tests involving the management board config ruleset Change-Id: I1c9d29706f9b2f640d7a5afd796d752f5cc79625 --- tests/cmk_base/test_mgmt_board.py | 100 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index ee43b27..3d55a1d 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -144,3 +144,103 @@ def test_mgmt_inherit_protocol(web): assert config.management_address_of("mgmt-host") == "127.0.0.1" assert config.management_protocol_of("mgmt-host") == "snmp" assert config.management_credentials_of("mgmt-host") == "FOLDER" + + +def test_mgmt_config_ruleset(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET"), + }, + ], + } + }) + + web.add_folder("folder1") + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "RULESET" + + +def test_mgmt_config_ruleset_overidden_by_explicit_setting(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET"), + }, + ], + } + }) + + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER" + + +def test_mgmt_config_ruleset_order(web): + web.set_ruleset("management_board_config", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET1"), + }, + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'value': ("snmp", "RULESET2"), + }, + ], + } + }) + + web.add_folder("folder1") + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "RULESET1"

6 years, 4 months

Removed none value from management board config ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fd4804ac3900716b9071e2f0dd95720d2b11f9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fd4804ac39007… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:47:49 2018 +0100 Removed none value from management board config ruleset Change-Id: I561d173d220967f9e5517112884a150df4b52f04 --- web/plugins/wato/check_mk_configuration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 091396b..635f49d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2333,7 +2333,6 @@ register_rule(group, CascadingDropdown( title=_("Management board config"), choices=[ - (None, _("No protocol specified"), FixedValue(None, totext="")), ("snmp", _("SNMP"), SNMPCredentials()), ], ),

6 years, 4 months

Only remove check variable settings from default_config when it was set before

by Lars Michelsen

Module: check_mk Branch: master Commit: e88012ed242fb5ba631c94c1faccd011458316ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88012ed242fb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:45:14 2018 +0100 Only remove check variable settings from default_config when it was set before Change-Id: Id4046592c86718fc492977be9d0c0e4f94d0d732 --- cmk_base/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index c1e94a8..52d6395 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -80,12 +80,18 @@ def add_check_variables(check_variables): # # In the same step we remove the check related configuration settings from the # config module because they are not needed there anymore. +# +# And also remove it from the default config (in case it was present) def set_check_variables_for_checks(): import cmk_base.checks global_dict = globals() for varname in cmk_base.checks.check_variable_names(): cmk_base.checks.set_check_variable(varname, global_dict.pop(varname)) - delattr(default_config, varname) + + try: + delattr(default_config, varname) + except AttributeError: + pass #.

6 years, 4 months

Add add_folder(), delete_folder(), folder_exists(), delete_folder() and host_exists() methods to web fixture

by Lars Michelsen

Module: check_mk Branch: master Commit: a2f9d6480745771f32976fa0bef2c05e6f30f161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2f9d648074577… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 11:27:24 2018 +0100 Add add_folder(), delete_folder(), folder_exists(), delete_folder() and host_exists() methods to web fixture Change-Id: I0ea581b7d061d938bb39df55f1d5df56100a7868 --- tests/testlib/__init__.py | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a6c99ea..556749c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1148,6 +1148,83 @@ class CMKWebSession(WebSession): return result + def host_exists(self, hostname): + try: + result = self._api_request("webapi.py?action=get_host", { + "request": json.dumps({ + "hostname": hostname, + }), + }) + except AssertionError, e: + if "No such host" in "%s" % e: + return False + else: + raise + + assert type(result) == dict + return "hostname" in result + + + def add_folder(self, folder_path, attributes=None, create_folders=True, expect_error=False): + if attributes == None: + attributes = {} + + result = self._api_request("webapi.py?action=add_folder", { + "request": json.dumps({ + "folder" : folder_path, + "attributes" : attributes or {}, + "create_parent_folders" : create_folders, + }), + }, expect_error=expect_error) + + assert result == None + + folder = self.get_folder(folder_path) + assert folder["attributes"] == attributes + + + def get_folder(self, folder_path, effective_attributes=False): + result = self._api_request("webapi.py?action=get_folder", { + "request": json.dumps({ + "folder" : folder_path, + "effective_attributes" : effective_attributes, + }), + }) + + assert type(result) == dict + assert "attributes" in result + + return result + + + def folder_exists(self, folder_path): + try: + result = self._api_request("webapi.py?action=get_folder", { + "request": json.dumps({ + "folder": folder_path, + }), + }) + except AssertionError, e: + if "does not exist" in "%s" % e: + return False + else: + raise + + assert type(result) == dict + return "folder" in result + + + def delete_folder(self, folder_path): + result = self._api_request("webapi.py?action=delete_folder", { + "request": json.dumps({ + "folder": folder_path, + }), + }) + + assert result == None + assert not self.folder_exists(folder_path) + + def get_ruleset(self, ruleset_name): result = self._api_request("webapi.py?action=get_ruleset&output_format=python", { "request": json.dumps({

6 years, 4 months

Really start with clean default settings when loading the config

by Lars Michelsen

Module: check_mk Branch: master Commit: a191b965eb132ad5b657702bb26d4072ec0c62b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a191b965eb132a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 09:22:37 2018 +0100 Really start with clean default settings when loading the config Change-Id: I6148acc20f4695ded306f4e0dccf5d6e960fa83a --- cmk_base/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 7450960..c1e94a8 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -26,6 +26,7 @@ import os import sys +import copy import marshal import cmk.paths @@ -51,7 +52,12 @@ def get_default_config(): """Provides a dictionary containing the Check_MK default configuration""" cfg = {} for key in get_variable_names(): - cfg[key] = getattr(default_config, key) + value = getattr(default_config, key) + + if isinstance(value, dict) or isinstance(value, list): + value = copy.deepcopy(value) + + cfg[key] = value return cfg

6 years, 4 months

Add more management board tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 652810f652a15255c148db835387781ff2c2f52f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=652810f652a152… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 11:30:52 2018 +0100 Add more management board tests Change-Id: Ided35be1bc222e5078210af4f0f6ddcd7a4b3de5 --- tests/cmk_base/test_mgmt_board.py | 148 +++++++++++++++++++++++++++++--------- 1 file changed, 114 insertions(+), 34 deletions(-) diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py index 06fa2a3..ee43b27 100644 --- a/tests/cmk_base/test_mgmt_board.py +++ b/tests/cmk_base/test_mgmt_board.py @@ -5,62 +5,142 @@ from testlib import web import cmk_base.config as config -(a)pytest.fixture(scope="module") -def test_cfg(web, site): - print "Applying default config" - web.add_host("mgmt-host1", attributes={ +(a)pytest.fixture(autouse=True) +def test_cfg(web): + import cmk.debug + cmk.debug.enable() + + yield + + # + # Cleanup code + # + print "Cleaning up test config" + + cmk.debug.disable() + + if web.host_exists("mgmt-host"): + web.delete_host("mgmt-host") + + if web.folder_exists("folder1"): + web.delete_folder("folder1") + + web.activate_changes() + + config.load() + + +def test_mgmt_explicit_settings(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": "snmp", "management_snmp_community": "HOST", }) - web.add_host("mgmt-host2", attributes={ + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" + + +def test_mgmt_explicit_address(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": "snmp", "management_address": "127.0.0.2", }) - web.add_host("mgmt-host3", attributes={ + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.2" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "public" + + +def test_mgmt_disabled(web): + web.add_host("mgmt-host", attributes={ "ipaddress": "127.0.0.1", "management_protocol": None, "management_address": "127.0.0.1", "management_snmp_community": "HOST", }) - web.activate_changes() + config.load() + assert config.has_management_board("mgmt-host") == False + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == None + assert config.management_credentials_of("mgmt-host") == "HOST" - import cmk.debug - cmk.debug.enable() - import cmk_base.checks as checks - checks.load() +def test_mgmt_inherit_credentials_explicit_host(web): + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_snmp_community": "HOST", + }) + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" - yield None - # - # Cleanup code - # - print "Cleaning up test config" - cmk.debug.disable() +def test_mgmt_inherit_credentials(web): + web.add_folder("folder1", attributes={ + "management_snmp_community": "FOLDER", + }) - web.delete_host("mgmt-host1") - web.delete_host("mgmt-host2") - web.delete_host("mgmt-host3") - web.activate_changes() + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + }) + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER" -def test_management_board_configc(test_cfg): - assert config.has_management_board("mgmt-host1") - assert config.management_address_of("mgmt-host1") == "127.0.0.1" - assert config.management_protocol_of("mgmt-host1") == "snmp" - assert config.management_credentials_of("mgmt-host1") == "HOST" - assert config.has_management_board("mgmt-host2") - assert config.management_address_of("mgmt-host2") == "127.0.0.2" - assert config.management_protocol_of("mgmt-host2") == "snmp" - assert config.management_credentials_of("mgmt-host2") == "public" +def test_mgmt_inherit_protocol_explicit_host(web): + web.add_folder("folder1", attributes={ + "management_protocol": None, + "management_snmp_community": "FOLDER", + }) - assert config.has_management_board("mgmt-host3") == False - assert config.management_address_of("mgmt-host3") == "127.0.0.1" - assert config.management_protocol_of("mgmt-host3") == None - assert config.management_credentials_of("mgmt-host3") == "HOST" + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_snmp_community": "HOST", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "HOST" + + + +def test_mgmt_inherit_protocol(web): + web.add_folder("folder1", attributes={ + "management_protocol": "snmp", + "management_snmp_community": "FOLDER", + }) + + web.add_host("mgmt-host", folder="folder1", attributes={ + "ipaddress": "127.0.0.1", + }) + + config.load() + assert config.has_management_board("mgmt-host") + assert config.management_address_of("mgmt-host") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host") == "snmp" + assert config.management_credentials_of("mgmt-host") == "FOLDER"

6 years, 4 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: 5cda19def6b43305cb78bc65a36e4fc710a4ec88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cda19def6b433… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 10:31:56 2018 +0100 Fixed typo. Change-Id: I2d5d7d319ea1e0b8c727dcc4514722fffa386787 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2ec6fc4..eafce62 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -294,7 +294,7 @@ class ECServerThread(threading.Thread): while not self._shal_terminate(): try: - with cmk.profile.Profile(enabled=profiling_enabled, + with cmk.profile.Profile(enabled=self.profiling_enabled, profile_file=os.path.join(g_state_dir, "%s.profile" % self.name)): self.serve() except Exception:

6 years, 4 months

Deobfuscate profiling flag handling.

by Sven Panne

Module: check_mk Branch: master Commit: e0c1df002873c9ce640c78a7279a7b6cdd251cc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c1df002873c9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 10:24:13 2018 +0100 Deobfuscate profiling flag handling. Change-Id: I842ea3bbc223a1375e27a36f73ae5294b21b11d1 --- bin/mkeventd | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 5cf91d2..2ec6fc4 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -78,7 +78,8 @@ logger = cmk.log.get_logger("mkeventd") opt_verbose = 0 opt_debug = False opt_foreground = False -opt_profile = {} +opt_profile_status = False +opt_profile_event = False opt_syslog = False opt_syslog_fd = None opt_syslog_tcp = False @@ -282,8 +283,9 @@ class ECLock(object): class ECServerThread(threading.Thread): - def __init__(self, name): + def __init__(self, name, profiling_enabled): super(ECServerThread, self).__init__(name=name) + self.profiling_enabled = profiling_enabled self._terminate_event = threading.Event() self.logger = logger.getChild(name) @@ -292,7 +294,7 @@ class ECServerThread(threading.Thread): while not self._shal_terminate(): try: - with cmk.profile.Profile(enabled=opt_profile.get(self.name), + with cmk.profile.Profile(enabled=profiling_enabled, profile_file=os.path.join(g_state_dir, "%s.profile" % self.name)): self.serve() except Exception: @@ -1286,7 +1288,8 @@ class EventServer(ECServerThread): "Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12} def __init__(self): - super(EventServer, self).__init__(name="EventServer") + super(EventServer, self).__init__(name="EventServer", + profiling_enabled=opt_profile_event) self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -3540,7 +3543,8 @@ class StatusTableStatus(StatusTable): class StatusServer(ECServerThread): def __init__(self): - super(StatusServer, self).__init__(name="StatusServer") + super(StatusServer, self).__init__(name="StatusServer", + profiling_enabled=opt_profile_status) self._socket = None self._tcp_socket = None self._reopen_sockets = False @@ -5146,12 +5150,10 @@ if __name__ == "__main__": opt_snmptrap = True elif o == '--snmptrap-fd': opt_snmptrap_fd = int(a) - elif o.startswith('--profile-'): - what = o.split("-")[-1] - if what == "status": - opt_profile["StatusServer"] = True - elif what == "event": - opt_profile["EventServer"] = True + elif o == '--profile-status': + opt_profile_status = True + elif o == '--profile-event': + opt_profile_event = True cmk.log.open_log(sys.stderr) cmk.log.set_verbosity(opt_verbose)

6 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018