Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: db9918d2cda22f106f7991d43bb4e2ac12962d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db9918d2cda22f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 09:51:28 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e7ff0db..ef6ece9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2493 +2513

8 years, 11 months

Check_MK Git: check_mk: Fixed help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a235072638f4d7ba07e6e6030baa5f4edb7aeff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a235072638f4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 27 14:38:30 2015 +0200 Fixed help text --- web/htdocs/wato.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1eb2e49..2813db0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7581,9 +7581,9 @@ def vs_ldap_connection(new): ("debug_log", Checkbox( title = _("Connection Diagnostics"), label = _("Activate logging of LDAP transactions"), - help = _("If this option is enabled, Check_MK will create a log file in " - "<tt>var/log/ldap.log</tt> within your site in OMD environments. " - "You should enable this option only for debugging."), + help = _("If this option is enabled, Check_MK will log LDAP related debug messages to <tt>%s</tt>. " + "You should enable this option only for debugging.") % \ + site_neutral_path(defaults.log_dir + "/web.log"), default_value = False )), ]

8 years, 11 months

Check_MK Git: check_mk: raritan_pdu_outletcount, raritan_pdu_plugs: added '.6' in oid in scan function to avoid exceptions for raritan-emx hosts

by Simon Betz

Module: check_mk Branch: master Commit: 12a685f6bfb831e7dbf90bd1e002e2ef92c0be56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12a685f6bfb831… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 28 09:49:28 2015 +0200 raritan_pdu_outletcount, raritan_pdu_plugs: added '.6' in oid in scan function to avoid exceptions for raritan-emx hosts --- checks/raritan_pdu_outletcount | 2 +- checks/raritan_pdu_plugs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/raritan_pdu_outletcount b/checks/raritan_pdu_outletcount index 383e07c..2aa1a9f 100644 --- a/checks/raritan_pdu_outletcount +++ b/checks/raritan_pdu_outletcount @@ -53,6 +53,6 @@ check_info['raritan_pdu_outletcount'] = { "group" : "plug_count", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.13742.6.3.2.2.1.4", ["1"]), # outletCount - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.") and \ + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.6") and \ oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") } diff --git a/checks/raritan_pdu_plugs b/checks/raritan_pdu_plugs index 6b37d29..41a42e2 100644 --- a/checks/raritan_pdu_plugs +++ b/checks/raritan_pdu_plugs @@ -80,6 +80,6 @@ check_info['raritan_pdu_plugs'] = { "3.5.3.1.3", # OutletName (eigene vergebene Bezeichnung für den Ausgang) "4.1.2.1.3", # Outlet state at present (sh.o. outlet_state_info im check) ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.") and \ + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13742.6") and \ oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") }

8 years, 11 months

Check_MK Git: check_mk: esx_vsphere_vm: nicer output texts for VMware Tools status

by Mathias Kettner

Module: check_mk Branch: master Commit: 649f8821b62b80617787175128650aac32529787 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=649f8821b62b80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 28 09:38:22 2015 +0200 esx_vsphere_vm: nicer output texts for VMware Tools status --- checks/esx_vsphere_vm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 7f8e249..4833ac2 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -238,10 +238,10 @@ def check_esx_vsphere_vm_guest_tools(_no_item, params, info): vm_status = data['guest.toolsVersionStatus'][0] guest_tools_map = { - "guestToolsCurrent": (0, "VMware Tools is installed, and the version is current"), - "guestToolsNeedUpgrade": (1, "VMware Tools is installed, but the version is not current"), - "guestToolsNotInstalled": (2, "VMware Tools has never been installed"), - "guestToolsUnmanaged": (1, "VMware Tools is installed, but it is not managed by VMWare") + "guestToolsCurrent": (0, "VMware Tools are installed and the version is current"), + "guestToolsNeedUpgrade": (1, "VMware Tools are installed, but the version is not current"), + "guestToolsNotInstalled": (2, "VMware Tools are not installed"), + "guestToolsUnmanaged": (1, "VMware Tools are installed, but are not managed by VMWare") } state, info = guest_tools_map.get(vm_status, (3, "Unknown status for VMware Tools"))

8 years, 11 months

Check_MK Git: check_mk: winperf_if: Fixed minor bug with some windows configurations

by Bastian Kuhn

Module: check_mk Branch: master Commit: ea9cf4916c84687af89aea48dc33194ec30a5b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea9cf4916c8468… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 28 09:36:58 2015 +0200 winperf_if: Fixed minor bug with some windows configurations --- checks/winperf_if | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/winperf_if b/checks/winperf_if index 8b982a0..dfd076d 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -118,8 +118,11 @@ def convert_winperf_if(info): guid_to_name = dict(zip(teaming_info[guid]["GUID"].split(";"), teaming_info[guid]["MemberDescriptions"].split(";"))) nic_name = canonize_nic_name(guid_to_name[guid]) - else: + elif "Name" in as_dict: nic_name = canonize_nic_name(as_dict["Name"]) + else: + # There seams a bug with some windows configurations + continue def transform_name(name): # Intel[R] PRO 1000 MT-Desktopadapter__3 (perf counter)

8 years, 11 months

Check_MK Git: check_mk: fixed merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 16c2e36463629ef152b61bdab686f67fbf56c744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16c2e36463629e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 28 09:33:58 2015 +0200 fixed merge conflict --- .werks/1274 | 10 ++++++++++ ChangeLog | 1 + checks/heartbeat_crm | 23 ++++++++++++++--------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/1274 b/.werks/1274 new file mode 100644 index 0000000..3321592 --- /dev/null +++ b/.werks/1274 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: Handle case of error messages from CRM +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438068579 + + diff --git a/ChangeLog b/ChangeLog index 29c311d..ae5df7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 2473 FIX: cisco_asa_failover: Reworked check to reflect expected primary/secondary states of devices... * 2476 FIX: check_bi_aggr: Fixed exception when authentication is enabled * 2477 FIX: SNMP: Fixed exception when processing specific SNMP data with missing columns... + * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 9fbc7ff..c567a59 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -100,18 +100,23 @@ def inventory_heartbeat_crm(info): # - Check the number of nodes/resources # - Check the age of "last updated" settings = host_extra_conf_merged(g_hostname, inventory_heartbeat_crm_rules) - last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) - if last_updated: - params = { - 'num_nodes' : num_nodes, - 'num_resources' : num_resources, - } - if settings.get('naildown_dc', False): - params['dc'] = dc - return [(None, params)] + try: + last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) + except: + # In the case that CRM is not working, add it as a service and show the error later + last_updated, dc, num_nodes, num_resources = 0,0,0,0 + params = { + 'num_nodes' : num_nodes, + 'num_resources' : num_resources, + } + if settings.get('naildown_dc', False): + params['dc'] = dc + return [(None, params)] def check_heartbeat_crm(item, params, info): if len(info) > 0: + if info[0][0].lower().startswith("critical"): + return 2, " ".join(info[0]) last_updated, dc, numNodes, numResources = heartbeat_crm_parse_general(info) # Convert old tuple params (pre 1.2.5i6)

8 years, 11 months

Check_MK Git: check_mk: ibm_svc_mdisk: after firmware update the output of the command 'lsmdisk -nohdr -delim :' in the special agent 'agent_ibmsvc' increased from 11/12 to 14

by Simon Betz

Module: check_mk Branch: master Commit: 914ea59685c2592eda6d01c81258c35b503f8785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=914ea59685c259… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 27 17:19:52 2015 +0200 ibm_svc_mdisk: after firmware update the output of the command 'lsmdisk -nohdr -delim :' in the special agent 'agent_ibmsvc' increased from 11/12 to 14 --- checks/ibm_svc_mdisk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ibm_svc_mdisk b/checks/ibm_svc_mdisk index d8939c8..720e00a 100644 --- a/checks/ibm_svc_mdisk +++ b/checks/ibm_svc_mdisk @@ -50,12 +50,12 @@ factory_settings['ibm_svc_mdisk_default_levels'] = { def inventory_ibm_svc_mdisk(info): for line in info: - if len(line) in (11, 12): + if len(line) > 10: yield line[1], {} def check_ibm_svc_mdisk(item, params, info): for line in info: - if len(line) in (11, 12) and line[1] == item: + if len(line) > 10 and line[1] == item: mdisk_status = line[2] mdisk_mode = line[3]

8 years, 11 months

Check_MK Git: check_mk: Updated werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c141ec0ed2d691cc1b69bb5e59f011cc3245eae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c141ec0ed2d69… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 27 14:59:27 2015 +0200 Updated werk --- .werks/2487 | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/2487 b/.werks/2487 index 84c4e2b..f5530e3 100644 --- a/.werks/2487 +++ b/.werks/2487 @@ -15,4 +15,5 @@ C+: RP:omd stop mysite RP:omd rm mysite RP:omd create mysite +RP:omd start mysite C-:

8 years, 11 months

Check_MK Git: check_mk: #2487 Remove dangerous Factory Reset button

by Mathias Kettner

Module: check_mk Branch: master Commit: 38fb4741bd6bf9396c47f13134b5e449be0f6113 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38fb4741bd6bf9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 27 14:58:40 2015 +0200 #2487 Remove dangerous Factory Reset button We removed the button Factory Reset completely from WATO. This button is dangerous. Also it does anyway just a reset of WATO - not of other data in the site like NagVis maps etc. For a real reset better remove and recreate the site with: C+: RP:omd stop mysite RP:omd rm mysite RP:omd create mysite C-: --- .werks/2487 | 18 ++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 48 ++++-------------------------------------------- 3 files changed, 23 insertions(+), 44 deletions(-) diff --git a/.werks/2487 b/.werks/2487 new file mode 100644 index 0000000..84c4e2b --- /dev/null +++ b/.werks/2487 @@ -0,0 +1,18 @@ +Title: Remove dangerous Factory Reset button +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1438001809 +Class: feature + +We removed the button Factory Reset completely from WATO. This button +is dangerous. Also it does anyway just a reset of WATO - not of other data +in the site like NagVis maps etc. For a real reset better remove and recreate +the site with: + +C+: +RP:omd stop mysite +RP:omd rm mysite +RP:omd create mysite +C-: diff --git a/ChangeLog b/ChangeLog index d3ec1b7..29c311d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 2463 Hiding not permitted actions from service discovery page when only permitted on host... * 2479 Allowing dots in host-, service- and contact groups now * 2486 Remove special handling for non-distributed-setups in WATO... + * 2487 Remove dangerous Factory Reset button... * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d8c9380..a5689e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -199,10 +199,9 @@ def page_handler(): lock_exclusive() try: - # Make information about current folder and hosts available - # To be able to perform a "factory reset" or a snapshot restore - # even with a broken config ignore exceptions in this function - # when running in "snapshot" mode + # Make information about current folder and hosts available To be able + # to restore a snapshot even with a broken config ignore exceptions + # in this function when running in "snapshot" mode prepare_folder_info() except: if current_mode == 'snapshot': @@ -6797,8 +6796,6 @@ def mode_snapshot(phase): elif phase == "buttons": home_button() changelog_button() - html.context_button(_("Factory Reset"), - make_action_link([("mode", "snapshot"),("_factory_reset","Yes")]), "factoryreset") return # Cleanup incompletely processed snapshot upload @@ -6983,18 +6980,6 @@ def mode_snapshot(phase): elif c == False: # not yet confirmed return "" - elif html.has_var("_factory_reset"): - c = wato_confirm(_("Confirm factory reset"), - _("If you proceed now, all hosts, folders, rules and other configurations " - "done with WATO will be deleted! Please consider making a snapshot before " - "you do this. Snapshots will not be deleted. Also the password of the currently " - "logged in user (%s) will be kept. " - "Do you really want to delete all or your configuration data?") % config.user_id) - if c: - factory_reset() - return None, _("Resetted WATO, wiped all configuration.") - elif c == False: # not yet confirmed - return "" return None else: @@ -7100,30 +7085,6 @@ def create_snapshot(data = {}): return snapshot_name -def factory_reset(): - # Darn. What makes things complicated here is that we need to conserve htpasswd, - # at least the account of the currently logged in user. - users = userdb.load_users(lock = True) - for id in users.keys(): - if id != config.user_id: - del users[id] - - to_delete = [ path for c,n,path - in backup_paths - if n != "auth.secret" ] + [ log_dir ] - for path in to_delete: - if os.path.isdir(path): - shutil.rmtree(path) - elif os.path.exists(path): - os.remove(path) - - make_nagios_directory(multisite_dir) - make_nagios_directory(root_dir) - - userdb.save_users(users) # make sure, omdadmin is present after this - log_pending(SYNCRESTART, None, "factory-reset", _("Complete reset to factory settings.")) - - #. # .--Value-Editor--------------------------------------------------------. # | __ __ _ _____ _ _ _ | @@ -19892,8 +19853,7 @@ def load_plugins(): _("Backup & Restore"), _("Access to the module Backup & Restore. Please note: a user with " "write access to this module " - "can make arbitrary changes to the configuration by restoring uploaded snapshots " - "and even do a complete factory reset!"), + "can make arbitrary changes to the configuration by restoring uploaded snapshots."), [ "admin", ]) config.declare_permission("wato.pattern_editor",

8 years, 11 months

Check_MK Git: check_mk: WATO now handles and displays configuration warnings

by Mathias Kettner

Module: check_mk Branch: master Commit: 13e39cf9607bbf3986f37d94dcdde792107d619b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13e39cf9607bbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 27 14:35:31 2015 +0200 WATO now handles and displays configuration warnings --- modules/automation.py | 4 ++- web/htdocs/check_mk.css | 14 +++++++++ web/htdocs/wato.py | 79 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 76 insertions(+), 21 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index ba2b78e..9051ed5 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -499,8 +499,9 @@ def automation_restart(job = "restart", use_rushd = True): try: if monitoring_core == "nagios": create_nagios_config(file(objects_file, "w")) + configuration_warnings = None # not supported else: - do_create_cmc_config(opt_cmc_relfilename, use_rushd = use_rushd) + configuration_warnings = do_create_cmc_config(opt_cmc_relfilename, use_rushd = use_rushd) if "do_bake_agents" in globals() and bake_agents_on_restart: do_bake_agents() @@ -535,6 +536,7 @@ def automation_restart(job = "restart", use_rushd = True): raise MKAutomationError(str(e)) sys.stdout = old_stdout + return configuration_warnings def automation_get_configuration(): # We read the list of variable names from stdin since diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 80349a2..c743867 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -331,6 +331,20 @@ div.warning a { color: #000; } +/* Warnings embedded in tables without margins and padding, those are + just needed for body */ + +td div.warning, td > div.error { + margin-top: 3px; + margin-bottom: 3px; + padding: 5px 10px; +} + +td div.warning ul, td > div.error ul { + margin: 5px 10px; + padding-left: 0px; +} + /*-ValueSpec---------------------------------------------------------------. | __ __ _ ____ | | \ \ / /_ _| |_ _ ___/ ___| _ __ ___ ___ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1eb2e49..d8c9380 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4834,12 +4834,11 @@ def mode_changelog(phase): response = synchronize_site(site, restart = action == "sync_restart") else: try: - restart_site(site) - response = True + response = restart_site(site) except Exception, e: response = "%s" % e - if response == True: + if type(response) == list: return else: raise MKUserError(None, _("Error on remote access to site: %s") % response) @@ -4995,12 +4994,17 @@ def mode_changelog(phase): html.buttonlink(restart_url, _("Restart")) # Last result + table.cell(_("Last Result")) result = srs.get("result", "") if len(result) > 20: result = html.strip_tags(result) - result = '%s...' % \ - (html.attrencode(result), result[:20]) - table.cell(_("Last Result"), result) + html.write('%s...' % \ + (html.attrencode(result), result[:20])) + + else: + configuration_warnings = srs.get("warnings", []) + if configuration_warnings: + html.write(render_replication_warnings(configuration_warnings)) table.end() @@ -11585,12 +11589,13 @@ def synchronize_site(site, restart): if site_is_local(site["id"]): if restart: start = time.time() - restart_site(site) + configuration_warnings = restart_site(site) update_replication_status(site["id"], - { "need_restart" : False }, - { "restart" : time.time() - start}) - - return True + { "need_restart" : False }, + { "restart" : time.time() - start}) + return configuration_warnings + else: + return [] create_sync_snapshot(site["id"]) try: @@ -11598,17 +11603,26 @@ def synchronize_site(site, restart): result = push_snapshot_to_site(site, restart) duration = time.time() - start update_replication_status(site["id"], {}, - { restart and "sync+restart" or "restart" : duration }) + { restart and "sync+restart" or "restart" : duration, + }) + + # Pre 1.2.7i3 sites return True on success and a string on error. + # 1.2.7i3 and later return a ist of warning messages on success. + # [] means OK and no warnings. The error handling is unchanged if result == True: + result = [] + if type(result) == list: update_replication_status(site["id"], { "need_sync": False, "result" : _("Success"), + "warnings" : result, }) if restart: update_replication_status(site["id"], { "need_restart": False }) else: update_replication_status(site["id"], { "result" : result }) return result + except Exception, e: update_replication_status(site["id"], { "result" : str(e) }) raise @@ -11617,10 +11631,11 @@ def synchronize_site(site, restart): # is only being called for the local site. def restart_site(site): start = time.time() - check_mk_automation(site["id"], config.wato_activation_method) + configuration_warnings = check_mk_automation(site["id"], config.wato_activation_method) duration = time.time() - start update_replication_status(site["id"], - { "need_restart" : False }, { "restart" : duration }) + { "need_restart" : False, "warnings" : configuration_warnings }, { "restart" : duration }) + return configuration_warnings def push_snapshot_to_site(site, do_restart): mode = site.get("replication", "slave") @@ -11732,7 +11747,8 @@ def ajax_profile_repl(): html.write(answer) -# AJAX handler for asynchronous site replication +# AJAX handler for asynchronous site replication. This is running on the +# master site. def ajax_replication(): site_id = html.var("site") repstatus = load_replication_status() @@ -11748,12 +11764,23 @@ def ajax_replication(): if need_sync: result = synchronize_site(site, need_restart) else: - restart_site(site) - result = True + result = restart_site(site) + except Exception, e: result = str(e) + + # Pre 1.2.7i3 sites return True on success and a string on error. + # 1.2.7i3 and later return a ist of warning messages on success. + # [] means OK and no warnings. The error handling is unchanged if result == True: - answer = "OK:" + _("Success"); + result = [] + + if type(result) == list: + configuration_warnings = result + if configuration_warnings: + answer = render_replication_warnings(configuration_warnings) + else: + answer = "OK:" + _("Success") # Make sure that the pending changes are clean as soon as the # last site has successfully been updated. if is_distributed() and global_replication_state() == "clean": @@ -11763,6 +11790,16 @@ def ajax_replication(): html.write(answer) +def render_replication_warnings(configuration_warnings): + html_code = "<div class=warning>" + html_code += "%s" % _("Warnings:") + html_code += "<ul>" + for warning in configuration_warnings: + html_code += "<li>%s</li>" % html.attrencode(warning) + html_code += "</ul>" + html_code += "</div>" + return html_code + #. # .--Automation-Webservice-----------------------------------------------. # | _ _ _ _ | @@ -11948,13 +11985,15 @@ def automation_push_snapshot(): # Restart monitoring core, if neccessary if html.var("restart", "no") == "yes": - check_mk_local_automation(config.wato_activation_method) + configuration_warnings = check_mk_local_automation(config.wato_activation_method) + else: + configuration_warnings = [] # Reload event console, if we have one if config.mkeventd_enabled: mkeventd_reload() - return True + return configuration_warnings except Exception, e: if config.debug: return _("Internal automation error: %s\n%s") % (str(e), format_exception())

8 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015