Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Host attributes can now be locked individually

by Lars Michelsen

Module: check_mk Branch: master Commit: 66eab3c7d01f803b433376640e9348a2b03971a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66eab3c7d01f80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 1 19:38:18 2018 +0100 Host attributes can now be locked individually This is will be needed for the dynamic configuration but is not limited to this feature. It may be used in other situations where some attributes of a host / folder are controlled by another tool instead of manual configuration and manual editing is not permitted. The locking is done for each object individually. Locked attributes can not be edited using the GUI anymore. The lock can currently only be set or removed using the Web API. Adding a lock is done by setting the "locked" attribute with a data structure like this: <pre> (...) "locked": { "locked_by": ("site_id", "dcd", "connection-id"), "attributes": [ "alias", "ipaddress", "ipv6address", ], }, (...) </pre> The structure above locks the host attributes alias, ipaddress and ipv6address. The locked_by attribute is the Check_MK installation global identity of the component that set the lock. This is either used as information for that component that this object belongs to it and tells other components that they are not allowed to edit these attributes. CMK-1144 Change-Id: I70c8a15d42a0b508a84775104520d206ae84476b --- cmk/gui/plugins/wato/builtin_attributes.py | 34 ++++++++++++++++++++++++++++++ cmk/gui/plugins/wato/utils/__init__.py | 19 +++++++++++++---- cmk/gui/watolib.py | 3 +++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index 6259000..82067e2 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -50,6 +50,7 @@ from cmk.gui.valuespec import ( AbsoluteDate, TextUnicode, SiteChoice, + ID, ) from cmk.gui.exceptions import MKUserError @@ -577,3 +578,36 @@ declare_host_attribute( show_in_table=True, show_in_folder=True, ) + +declare_host_attribute( + ValueSpecAttribute( + "locked", + Dictionary( + title=_("Locked"), + help=_("The host is (partially) managed by an automatic data source like the " + "Dynamic Configuration."), + elements=[ + ("locked_by", + Tuple( + orientation="horizontal", + title_br=False, + elements=[ + SiteChoice(), + ID(title=_("Program"),), + ID(title=_("Connection ID"),), + ], + title=_("Locked by"), + )), + ("attributes", ListOf( + ID(), + title=_("Locked attributes"), + )), + ], + )), + show_in_table=False, + show_in_form=True, + show_in_folder=True, + show_in_host_search=False, + show_inherited_value=False, + editable=False, +) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index afa6f79..add5d03 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -1340,6 +1340,7 @@ mode_registry = ModeRegistry() # parent: The parent folder of the objects to configure # myself: For mode "folder" the folder itself or None, if we edit a new folder # This is needed for handling mandatory attributes. +# TODO: Wow, this function REALLY has to be cleaned up def configure_attributes(new, hosts, for_what, @@ -1436,9 +1437,17 @@ def configure_attributes(new, # "bulk": determine, if this attribute has the same setting for all hosts. values = [] + num_have_locked_it = 0 num_haveit = 0 for host in hosts.itervalues(): - if host and host.has_explicit_attribute(attrname): + if not host: + continue + + locked = host.attribute("locked") + if locked and attrname in locked["attributes"]: + num_have_locked_it += 1 + + if host.has_explicit_attribute(attrname): num_haveit += 1 if host.attribute(attrname) not in values: values.append(host.attribute(attrname)) @@ -1532,7 +1541,9 @@ def configure_attributes(new, else: active = False - if not new and (not attr.editable() or not attr.may_edit()): + is_editable = attr.editable() and attr.may_edit() and num_have_locked_it == 0 + + if not new and not is_editable: # Bug in pylint 1.9.2 https://github.com/PyCQA/pylint/issues/1984, already fixed in master. if active: # pylint: disable=simplifiable-if-statement force_entry = True @@ -1562,7 +1573,7 @@ def configure_attributes(new, else: defvalue = attr.default_value() - if not new and (not attr.editable() or not attr.may_edit()): + if not new and not is_editable: # In edit mode only display non editable values, don't show the # input fields html.open_div(id_="attr_hidden_%s" % attrname, style="display:none;") @@ -1602,7 +1613,7 @@ def configure_attributes(new, value = values[0] elif for_what in ["host", "cluster", "folder"]: - if not new and (not attr.editable() or not attr.may_edit()) and active: + if not new and not is_editable and active: value = values[0] else: explanation = " (" + inherited_from + ")" diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 25f4f9b..345c021 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -1485,6 +1485,7 @@ class CREFolder(BaseFolder): return variables = self._load_hosts_file() + # Can either be set to True or a string (which will be used as host lock message) self._locked_hosts = variables["_lock"] # Add entries in clusters{} to all_hosts, prepare cluster to node mapping @@ -1817,7 +1818,9 @@ class CREFolder(BaseFolder): wato_info = self._load_wato_info() self._title = wato_info.get("title", self._fallback_title()) self._attributes = self._transform_old_attributes(wato_info.get("attributes", {})) + # Can either be set to True or a string (which will be used as host lock message) self._locked = wato_info.get("lock", False) + # Can either be set to True or a string (which will be used as host lock message) self._locked_subfolders = wato_info.get("lock_subfolders", False) if "num_hosts" in wato_info:

5 years, 10 months

YAPF checks/{h,i,q}*

by Óscar Nájera

Module: check_mk Branch: master Commit: 6118ca7f81efb38b86ab933bdb95fcb3ecd26382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6118ca7f81efb3… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 15 14:09:48 2018 +0100 YAPF checks/{h,i,q}* CMK-1180 Change-Id: I5d6dcf121cfa4b5950d5bff75decef500c40235a --- checks/h3c_lanswitch_cpu | 12 +-- checks/h3c_lanswitch_sensors | 9 +-- checks/hitachi_hnas_vnode | 5 +- checks/hitachi_hus.include | 8 +- checks/hp_blade | 12 +-- checks/hp_blade_blades | 12 +-- checks/hp_blade_fan | 12 +-- checks/hp_blade_manager | 12 +-- checks/hp_blade_psu | 14 ++-- checks/hp_eml_sum | 27 ++++--- checks/hp_fan | 23 +++--- checks/hp_procurve_cpu | 18 ++--- checks/hp_procurve_mem | 20 ++--- checks/hp_procurve_sensors | 14 ++-- checks/hp_proliant | 2 +- checks/hp_proliant.include | 8 +- checks/hp_proliant_cpu | 26 +++---- checks/hp_proliant_da_cntlr | 34 ++++----- checks/hp_proliant_fans | 32 ++++---- checks/hp_proliant_power | 26 +++---- checks/hp_proliant_psu | 43 +++++------ checks/hp_proliant_raid | 27 +++---- checks/hp_psu | 27 +++---- checks/hp_sts_drvbox | 37 +++++----- checks/hp_webmgmt_status | 27 ++++--- checks/hpux_snmp_cs | 3 +- checks/ibm_imm_fan | 3 +- checks/ibm_imm_health | 8 +- checks/ibm_imm_temp | 4 +- checks/ibm_imm_voltage | 10 ++- checks/ibm_rsa_health | 17 +++-- checks/ibm_storage_ts | 103 +++++++++++++------------- checks/ibm_svc_array | 8 +- checks/ibm_svc_disks | 25 ++++--- checks/ibm_svc_enclosure | 21 ++++-- checks/ibm_svc_enclosurestats | 39 +++++----- checks/ibm_svc_eventlog | 11 ++- checks/ibm_svc_host | 52 +++++++------ checks/ibm_svc_license | 17 +++-- checks/ibm_svc_mdisk | 32 ++++---- checks/ibm_svc_mdiskgrp | 47 ++++++------ checks/ibm_svc_node | 12 +-- checks/ibm_svc_nodestats | 102 +++++++++++++++----------- checks/ibm_svc_portfc | 9 ++- checks/ibm_svc_portsas | 16 ++-- checks/ibm_svc_system | 10 ++- checks/ibm_svc_systemstats | 107 +++++++++++++++------------ checks/ibm_tape_library.include | 5 +- checks/ibm_tl_changer_devices | 26 +++---- checks/ibm_tl_media_access_devices | 72 +++++++++--------- checks/ibm_xraid_pdisks | 21 +++--- checks/icom_repeater | 95 +++++++++++++----------- checks/if | 11 ++- checks/if64 | 27 +++---- checks/if64.include | 45 ++++++------ checks/if64_tplink | 69 +++++++++--------- checks/if64adm | 35 +++++---- checks/if_brocade | 78 ++++++++++---------- checks/if_fortigate | 68 ++++++++--------- checks/if_lancom | 81 ++++++++++---------- checks/ifoperstatus | 26 ++++--- checks/infoblox.include | 138 +++++++++++++++++------------------ checks/infoblox_dhcp_stats | 57 ++++++++------- checks/infoblox_dns_stats | 45 ++++++------ checks/infoblox_grid_status | 25 ++++--- checks/infoblox_node_services | 28 +++---- checks/infoblox_replication_status | 32 ++++---- checks/infoblox_services | 28 +++---- checks/infoblox_temp | 69 ++++++++++-------- checks/informix_dbspaces | 29 +++----- checks/informix_locks | 12 ++- checks/informix_logusage | 20 ++--- checks/informix_sessions | 16 ++-- checks/informix_status | 9 +-- checks/informix_tabextents | 11 ++- checks/innovaphone.include | 3 +- checks/innovaphone_channels | 18 +++-- checks/innovaphone_cpu | 20 ++--- checks/innovaphone_licenses | 19 +++-- checks/innovaphone_mem | 20 ++--- checks/innovaphone_priports_l1 | 36 +++++---- checks/innovaphone_priports_l2 | 33 +++++---- checks/innovaphone_temp | 22 +++--- checks/inotify | 41 +++++++---- checks/intel_true_scale_chassis_temp | 45 ++++++------ checks/intel_true_scale_fans | 54 +++++++------- checks/intel_true_scale_psus | 72 +++++++++--------- checks/intel_true_scale_sensors_temp | 130 +++++++++++++++++---------------- checks/ipr400_in_voltage | 25 ++++--- checks/ipr400_temp | 23 +++--- checks/iptables | 24 +++--- checks/ironport_misc | 7 +- checks/isc_dhcpd | 26 +++---- checks/ispro.include | 16 ++-- checks/ispro_sensors_digital | 37 +++++----- checks/ispro_sensors_humid | 30 ++++---- checks/ispro_sensors_temp | 50 +++++++------ checks/qlogic_fcport | 57 ++++++++------- checks/qlogic_sanbox | 24 +++--- checks/qlogic_sanbox_fabric_element | 4 +- checks/qnap_disks | 4 +- checks/quantum_libsmall_door | 2 +- checks/quantum_libsmall_status | 37 +++++----- checks/quantum_storage_status | 55 +++++++------- 104 files changed, 1705 insertions(+), 1550 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6118ca7f81…

5 years, 10 months

Add plugin hierarchy for watolib (preparing for dcd config domain)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ad1dba81e1dcbd3924dfac9ab9ced392a97ecac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad1dba81e1dcb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 5 22:48:04 2018 +0100 Add plugin hierarchy for watolib (preparing for dcd config domain) CMK-1141 Change-Id: I3021bf38e684bd4e4c2387316f4808bcfe55495a --- cmk/gui/plugins/wato/utils/__init__.py | 8 +- cmk/gui/plugins/watolib/__init__.py | 54 +++++++++ cmk/gui/plugins/watolib/utils.py | 201 +++++++++++++++++++++++++++++++++ cmk/gui/wato/__init__.py | 8 +- cmk/gui/wato/pages/global_settings.py | 25 ++-- cmk/gui/watolib.py | 180 +++-------------------------- 6 files changed, 293 insertions(+), 183 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ad1dba81e…

5 years, 10 months

mk_jolokia: refactoring II

by Moritz Kiemer

Module: check_mk Branch: master Commit: 56c0d7ad7cef9fcc3ea2487a3925b415789ff75c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56c0d7ad7cef9f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 15 09:53:56 2018 +0100 mk_jolokia: refactoring II Change-Id: Ifffa1d508ffc675697a355a6225bc6e824554ab7 --- agents/plugins/mk_jolokia | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index c20b6c3..4e05bc0 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -431,16 +431,19 @@ def yield_configured_instances(): # of dicts). instances = custom_config.pop("instances", [{}]) for inst in instances: - config = {k: inst.get(k, custom_config[k]) for k in custom_config} + yield {k: inst.get(k, custom_config[k]) for k in custom_config} - if not config["instance"]: - config["instance"] = str(config["port"]) - config["instance"] = config["instance"].replace(" ", "_") - if config.get("server") == "use fqdn": - config["server"] = socket.getfqdn() +def sanitize_config(config): - yield config + if not config["instance"]: + config["instance"] = str(config["port"]) + config["instance"] = config["instance"].replace(" ", "_") + + if config.get("server") == "use fqdn": + config["server"] = socket.getfqdn() + + return config QUERY_SPECS_GENERIC = [ @@ -539,8 +542,12 @@ QUERY_SPECS_SPECIFIC = { socket.setdefaulttimeout(1.0) -def main(): - for instance in yield_configured_instances(): +def main(configs_iterable=None): + if configs_iterable is None: + configs_iterable = yield_configured_instances() + + for config in configs_iterable: + instance = sanitize_config(config) try: query_instance(instance) except SkipInstance:

5 years, 10 months

YAPF: Fixed issue with trailing backslashes in check declarations

by Lars Michelsen

Module: check_mk Branch: master Commit: 700ee77c5d348f5dddd293a4fe38a6b526d35c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=700ee77c5d348f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 15 13:24:14 2018 +0100 YAPF: Fixed issue with trailing backslashes in check declarations Change-Id: I4ae27d539ad71b04163eb5f308941e3d1a1fb345 --- checks/aironet_clients | 41 +++++++++++++++++++++-------------------- checks/aironet_errors | 26 ++++++++++++-------------- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 15 +++++++-------- checks/blade_powermod | 14 ++++++-------- checks/bluecoat_diskcpu | 15 ++++++--------- checks/cisco_fan | 13 ++++++------- checks/cisco_fantray | 3 +-- checks/cisco_fru_power | 3 +-- checks/cisco_temp | 2 +- checks/cpsecure_sessions | 15 ++++++--------- checks/decru_cpu | 13 ++++++------- checks/decru_fans | 13 ++++++------- checks/decru_perf | 14 ++++++-------- checks/decru_power | 12 +++++------- checks/decru_temps | 17 ++++++++--------- checks/dell_powerconnect_cpu | 14 +++++++------- checks/df_netapp | 16 +++++++--------- checks/df_netapp32 | 19 ++++++++----------- checks/f5_bigip_chassis_temp | 2 +- checks/f5_bigip_cluster | 2 +- checks/f5_bigip_cluster_v11 | 2 +- checks/f5_bigip_cpu_temp | 2 +- checks/f5_bigip_fans | 2 +- checks/f5_bigip_pool | 2 +- checks/f5_bigip_psu | 2 +- checks/fjdarye100_cadaps | 11 +++++------ checks/fjdarye100_cmods | 12 +++++------- checks/fjdarye100_cmods_mem | 12 +++++------- checks/fjdarye100_conencs | 12 +++++------- checks/fjdarye100_cpsus | 12 +++++------- checks/fjdarye100_devencs | 12 +++++------- checks/fjdarye100_rluns | 13 ++++++------- checks/fjdarye100_sum | 16 ++++++---------- checks/fjdarye100_syscaps | 12 +++++------- checks/fjdarye101_cadaps | 13 ++++++------- checks/fjdarye101_cmods | 13 ++++++------- checks/fjdarye101_cmods_mem | 13 ++++++------- checks/fjdarye101_conencs | 13 ++++++------- checks/fjdarye101_rluns | 13 ++++++------- checks/fjdarye101_sum | 13 ++++++------- checks/fjdarye101_syscaps | 14 ++++++-------- checks/fjdarye500_cadaps | 14 ++++++-------- checks/fjdarye500_cmods | 14 ++++++-------- checks/fjdarye500_cmods_flash | 14 ++++++-------- checks/fjdarye500_cmods_mem | 14 ++++++-------- checks/fjdarye500_conencs | 14 ++++++-------- checks/fjdarye500_cpsus | 14 ++++++-------- checks/fjdarye500_devencs | 14 ++++++-------- checks/fjdarye500_expanders | 14 ++++++-------- checks/fjdarye500_inletthmls | 14 ++++++-------- checks/fjdarye500_sum | 14 ++++++-------- checks/fjdarye500_syscaps | 14 ++++++-------- checks/fjdarye500_thmls | 14 ++++++-------- checks/fjdarye60_cadaps | 12 +++++------- checks/fjdarye60_cmods | 12 +++++------- checks/fjdarye60_cmods_flash | 12 +++++------- checks/fjdarye60_cmods_mem | 12 +++++------- checks/fjdarye60_conencs | 12 +++++------- checks/fjdarye60_devencs | 12 +++++------- checks/fjdarye60_expanders | 12 +++++------- checks/fjdarye60_inletthmls | 12 +++++------- checks/fjdarye60_psus | 12 +++++------- checks/fjdarye60_rluns | 14 ++++++-------- checks/fjdarye60_sum | 12 +++++------- checks/fjdarye60_syscaps | 12 +++++------- checks/fjdarye60_thmls | 12 +++++------- 69 files changed, 357 insertions(+), 458 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=700ee77c5d…

5 years, 10 months

Moved site_exists() and site_version() to site context

by Lars Michelsen

Module: check_mk Branch: master Commit: ac3143d768b0827adc8ec0a2fbcdf49cbe654a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac3143d768b082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 10 23:06:55 2018 +0200 Moved site_exists() and site_version() to site context Change-Id: I99af424b44bbe9386474ba21509458d461bab359 --- omd/packages/omd/omdlib/main.py | 135 +++++++++++++++++++++++----------------- 1 file changed, 79 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac3143d768…

5 years, 10 months

Add some unit tests for SiteContext()

by Lars Michelsen

Module: check_mk Branch: master Commit: dc96d0e7c593216ea8ffb5a4ed0e5d8f024e78ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc96d0e7c59321… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Aug 11 19:06:30 2018 +0200 Add some unit tests for SiteContext() Change-Id: Ia4a43509d9257b3a53b028d8860e8d05b40eb3f7 --- tests/unit/omdlib/test_site_context.py | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/unit/omdlib/test_site_context.py b/tests/unit/omdlib/test_site_context.py new file mode 100644 index 0000000..acf3098 --- /dev/null +++ b/tests/unit/omdlib/test_site_context.py @@ -0,0 +1,42 @@ +import os + +import omdlib.main + +def test_root_context(): + site = omdlib.main.RootContext() + assert site.name == None + assert site.dir == "/" + + +def test_site_context(monkeypatch): + site = omdlib.main.SiteContext("dingeling") + assert site.name == "dingeling" + assert site.dir == "/omd/sites/dingeling" + assert site.tmp_dir == "/omd/sites/dingeling/tmp" + + +def test_site_context_version(monkeypatch): + site = omdlib.main.SiteContext("dingeling") + monkeypatch.setattr(os, "readlink", lambda x: "../2018.08.11.cee") + assert site.version == "2018.08.11.cee" + + +def test_site_context_exists(monkeypatch): + monkeypatch.setattr(os.path, "exists", lambda p: p == "/omd/sites/dingeling") + + site = omdlib.main.SiteContext("dingeling") + assert site.exists() + + site = omdlib.main.SiteContext("dingelang") + assert not site.exists() + + +def test_site_context_is_empty(monkeypatch): + monkeypatch.setattr(os, "listdir", lambda p: + [] if p == "/omd/sites/dingeling" else ["abc", "version"]) + + site = omdlib.main.SiteContext("dingeling") + assert site.is_empty() + + site = omdlib.main.SiteContext("dingelang") + assert not site.is_empty()

5 years, 10 months

Cleaned up site_is_empty()

by Lars Michelsen

Module: check_mk Branch: master Commit: adbbf865a63eb54bf5211f256d0fa1ff47f2b1a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adbbf865a63eb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 10 23:49:13 2018 +0200 Cleaned up site_is_empty() Change-Id: If95d537e3ccbe6debf22151e816d17c77163be45 --- omd/packages/omd/omdlib/main.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index ffa087f..3bf4271 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -579,12 +579,6 @@ def site_is_stopped(sitename): def site_is_running(sitename): return check_status(sitename, False) == 0 -def site_is_empty(site): - for entry in os.listdir(site.dir): - if entry not in [ '.', '..' ]: - return False - return True - # Determines wether a specific site is set to autostart. Note that # this needs to be called from a non-site-specific context and # can there not use the g_site... variables. @@ -2648,7 +2642,7 @@ def main_init(args, options): bail_out("Cannot initialize site that is not disabled.\n" "Please call 'omd disable %s' first." % g_site.name) - if not site_is_empty(g_site): + if not g_site.is_empty(): if not opt_force: bail_out("The site's home directory is not empty. Please add use\n" "'omd --force init %s' if you want to erase all data." % g_site.name) @@ -4110,6 +4104,11 @@ class AbstractSiteContext(object): raise NotImplementedError() + @abc.abstractmethod + def is_empty(self): + raise NotImplementedError() + + class SiteContext(AbstractSiteContext): @property @@ -4159,6 +4158,14 @@ class SiteContext(AbstractSiteContext): return os.path.exists(self.dir) + def is_empty(self): + for entry in os.listdir(self.dir): + if entry not in [ '.', '..' ]: + return False + return True + + + class RootContext(AbstractSiteContext): def __init__(self): @@ -4187,6 +4194,10 @@ class RootContext(AbstractSiteContext): return False + def is_empty(self): + return False + + exclude_options = [ ( "no-rrds", None, False, "do not copy RRD files (performance data)"),

5 years, 10 months

mk_jolokia: refactoring I

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9b7e9020fa87af694b239794a46111f8731e3a7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b7e9020fa87af… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 15 09:53:24 2018 +0100 mk_jolokia: refactoring I Change-Id: I5bac0d390b3e9ad0ba9026e2dd46cc25d4f2a999 --- agents/plugins/mk_jolokia | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index b45ac17..c20b6c3 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -153,25 +153,7 @@ def cached(function): return cached_function -def fetch_url_get(base_url, path, function): - if path: - url = "%s/%s/%s" % (base_url, function, path) - else: - url = base_url + "/" - - if VERBOSE: - sys.stderr.write("DEBUG: Fetching: %s\n" % url) - try: - json_data = urllib2.urlopen(url).read() - if VERBOSE: - sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) - except () if DEBUG else Exception, exc: - sys.stderr.write("ERROR: %s\n" % exc) - return [] - return json_data - - -def fetch_url_post(base_url, path, service_url, service_user, service_password, function): +def _get_post_data(path, service_url, service_user, service_password, function): segments = path.split("/") data = { @@ -184,19 +166,22 @@ def fetch_url_post(base_url, path, service_url, service_user, service_password, } if len(segments) > 2: data["path"] = segments[2] - if service_user: data["target"]["user"] = service_user data["target"]["password"] = service_password + return json.dumps(data) + + +def fetch_url(request_url, post_data=None): if VERBOSE: - sys.stderr.write("DEBUG: Fetching: %s\n" % base_url) + sys.stderr.write("DEBUG: Fetching: %s\n" % request_url) try: - json_data = urllib2.urlopen(base_url, data=json.dumps(data)).read() + json_data = urllib2.urlopen(request_url, data=post_data).read() if VERBOSE: sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) except () if DEBUG else Exception, exc: - sys.stderr.write("ERROR: %s\n" % exc) + sys.stderr.write("ERROR: %s\n\n" % exc) return [] return json_data @@ -214,10 +199,11 @@ def fetch_var(protocol, base_url = "%s://%s:%d/%s" % (protocol, server, port, suburi) if service_url is not None: - json_data = fetch_url_post(base_url, path, service_url, service_user, service_password, - function) + post_data = _get_post_data(path, service_url, service_user, service_password, function) + json_data = fetch_url(base_url, post_data) else: - json_data = fetch_url_get(base_url, path, function) + request_url = "%s/%s/%s" % (base_url, function, path) if path else base_url + "/" + json_data = fetch_url(request_url) try: obj = json.loads(json_data)

5 years, 10 months

Moved site_dir() and tmp_dir() to site context

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ea9a7aee3ec647860b5583405f3213a28854830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea9a7aee3ec64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 10 23:37:54 2018 +0200 Moved site_dir() and tmp_dir() to site context Change-Id: I76fa6c34f8a93ee1ec261ac5c389e265940479d4 --- omd/packages/omd/omdlib/main.py | 288 ++++++++++++++++++++-------------------- 1 file changed, 147 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ea9a7aee3…

5 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018