Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

5038 FIX Datasource programs: Prevent zombie processes in case of timeouts

by Lars Michelsen

Module: check_mk Branch: master Commit: 3113d9985d346e3380d9a7a81f476b6f11c80fd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3113d9985d346e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 16:59:19 2017 +0200 5038 FIX Datasource programs: Prevent zombie processes in case of timeouts When using datasource programs (like e.g. special agents or SSH command line calls) to get agent data from hosts it may happen that these programs remain open as zombie processes. Check_MK has been extended to deal with this situation and clean up these processes. Details: When the program execution takes too long Check_MK sends a SIGTERM to the process group of the executed program. After sending the signal Check_MK is now waiting for the process to finish. Change-Id: I9f2dbfa0839f8089bcc86bf67ec270aedf7adf3a --- .werks/5038 | 18 ++++++++++++++++++ cmk_base/agent_data.py | 1 + 2 files changed, 19 insertions(+) diff --git a/.werks/5038 b/.werks/5038 new file mode 100644 index 0000000..8e17bb7 --- /dev/null +++ b/.werks/5038 @@ -0,0 +1,18 @@ +Title: Datasource programs: Prevent zombie processes in case of timeouts +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500907925 + +When using datasource programs (like e.g. special agents or SSH command line calls) +to get agent data from hosts it may happen that these programs remain open as +zombie processes. Check_MK has been extended to deal with this situation and clean +up these processes. + +Details: When the program execution takes too long Check_MK sends a SIGTERM to the +process group of the executed program. After sending the signal Check_MK is now +waiting for the process to finish. diff --git a/cmk_base/agent_data.py b/cmk_base/agent_data.py index 456bf5d..5183715 100644 --- a/cmk_base/agent_data.py +++ b/cmk_base/agent_data.py @@ -812,6 +812,7 @@ def get_agent_info_program(commandline): # On timeout exception try to stop the process to prevent child process "leakage" if p: os.killpg(os.getpgid(p.pid), signal.SIGTERM) + p.wait() raise except Exception, e: raise MKAgentError("Could not execute '%s': %s" % (exepath, e))

6 years, 11 months

Refactored global settings page to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 838c2e6c311957e93b799af996c5258024e65139 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=838c2e6c311957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 10:19:50 2017 +0200 Refactored global settings page to WatoMode Change-Id: I84182784abcfcb04f99974f8dfc6cd9f84756b47 --- web/htdocs/wato.py | 347 +++++++++++++++++++++++++++-------------------------- 1 file changed, 179 insertions(+), 168 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=838c2e6c31…

6 years, 11 months

5039 Livestatus proxy: Connection parameters can now be configured globally

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ce9c073804494e19a284fa67a8e53a7b41daba5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ce9c073804494… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 17:02:47 2017 +0200 5039 Livestatus proxy: Connection parameters can now be configured globally The connection parameters of the Livestatus Proxy can now be configured globally to specify a default set of parameters for all sites. Each site can now either be configured to use the global defaults or set it's own parameters. For most environments it is sufficient to configure the global defaults and make all sites use the defaults. Using the global defaults makes it a lot easier to maintain the settings since you don't need to configure the settings for each site individually anymore. Change-Id: I718aa6ccc6c5a7c4044f304f808c08178f8ac2e7 --- .werks/5039 | 20 +++++++ web/htdocs/wato.py | 44 +++++++------- web/htdocs/watolib.py | 157 ++++++++++++-------------------------------------- 3 files changed, 80 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ce9c07380…

6 years, 11 months

5040 Site specific global settings: Distinguishing between factory and global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: dee3f13ec796fee422638ffea079aaebc70f77f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dee3f13ec796fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 09:56:04 2017 +0200 5040 Site specific global settings: Distinguishing between factory and global settings When editing site specific globals it the factory settings and possible globally configured settings are displayed together with a status information which value is inherited. Change-Id: Id5db89ffd6cac60cca7d160b63fe3375188d93e0 --- .werks/5040 | 11 ++++++++++ web/htdocs/wato.css | 6 ++++++ web/htdocs/wato.py | 58 ++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/.werks/5040 b/.werks/5040 new file mode 100644 index 0000000..72f02c8 --- /dev/null +++ b/.werks/5040 @@ -0,0 +1,11 @@ +Title: Site specific global settings: Distinguishing between factory and global settings +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1500969257 +Class: feature + +When editing site specific globals it the factory settings and possible globally configured +settings are displayed together with a status information which value is inherited. diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 388e819..c9d2274 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -839,6 +839,12 @@ div.varname { padding: 1px 4px 2px 4px; } +.wato div.globalvars td.simple a.modified.globally, +.wato div.globalvars td.simple div.toggle_switch_container.modified.globally, +.wato div.globalvars td.content a.modified.globally > table { + box-shadow: 3px 3px 5px #8bc7e5 inset; +} + .wato div.globalvars td.simple div.toggle_switch_container { width: 56px; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b95dc91..0c1235e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6859,7 +6859,7 @@ def mode_globalvars(phase): return group_names = global_config_variable_groups() - render_global_configuration_variables(group_names, default_values, current_settings, search=search) + render_global_configuration_variables(group_names, default_values, {}, current_settings, search=search) def global_config_variable_groups(show_all=False): @@ -6881,7 +6881,7 @@ def global_config_variable_groups(show_all=False): return group_names -def render_global_configuration_variables(group_names, default_values, current_settings, +def render_global_configuration_variables(group_names, default_values, global_settings, current_settings, search=None, edit_mode="edit_configvar"): group_names.sort(cmp=lambda a,b: cmp(configvar_order().get(a, 999), @@ -6932,6 +6932,8 @@ def render_global_configuration_variables(group_names, default_values, current_s if varname in current_settings: to_text = valuespec.value_to_text(current_settings[varname]) + elif varname in global_settings: + to_text = valuespec.value_to_text(global_settings[varname]) else: to_text = valuespec.value_to_text(default_value) @@ -6944,9 +6946,15 @@ def render_global_configuration_variables(group_names, default_values, current_s if varname in current_settings: value = current_settings[varname] modified_cls = "modified" + title = _("This option has been modified.") + elif varname in global_settings: + value = global_settings[varname] + modified_cls = "modified globally" + title = _("This option has been modified in global settings.") else: value = default_value modified_cls = None + title = None if is_a_checkbox(valuespec): html.open_div(class_=["toggle_switch_container", modified_cls]) @@ -6954,12 +6962,17 @@ def render_global_configuration_variables(group_names, default_values, current_s enabled=value, help=_("Immediately toggle this setting"), href=html.makeactionuri([("_action", "toggle"), ("_varname", varname)]), - class_=modified_cls + class_=modified_cls, + title=title, ) html.close_div() else: - html.a(HTML(to_text), href=edit_url, class_=modified_cls) + html.a(HTML(to_text), + href=edit_url, + class_=modified_cls, + title=title + ) if header_is_painted: forms.end() @@ -7002,10 +7015,13 @@ def mode_edit_configvar(phase, what = 'globalvars'): if siteid: current_settings = site.setdefault("globals", {}) + global_settings = load_configuration_settings() else: current_settings = load_configuration_settings() + global_settings = {} - is_on_default = varname not in current_settings + is_configured = varname in current_settings + is_configured_globally = varname in global_settings if phase == "action": if html.var("_reset"): @@ -7086,19 +7102,31 @@ def mode_edit_configvar(phase, what = 'globalvars'): valuespec.set_focus("ve") html.help(valuespec.help()) - forms.section(_("Default setting")) - if is_on_default: + if siteid and is_configured_globally: + forms.section(_("Global setting")) + html.write_html(valuespec.value_to_text(global_settings[varname])) + + forms.section(_("Factory setting")) + html.write_html(valuespec.value_to_text(defvalue)) + + forms.section(_("Current state")) + if is_configured_globally: + html.write_text(_("This variable is configured in <a href=\"%s\">global settings</a>.") % + ("wato.py?mode=edit_configvar&varname=%s" % varname)) + elif not is_configured: html.write_text(_("This variable is at factory settings.")) else: curvalue = current_settings[varname] - if curvalue == defvalue: + if is_configured_globally and curvalue == global_settings[varname]: + html.write_text(_("Site setting and global setting are identical.")) + elif curvalue == defvalue: html.write_text(_("Your setting and factory settings are identical.")) else: html.write(valuespec.value_to_text(defvalue)) forms.end() html.button("save", _("Save")) - if allow_reset and not is_on_default: + if allow_reset and is_configured: curvalue = current_settings[varname] html.button("_reset", _("Remove explicit setting") if curvalue == defvalue else _("Reset to default")) html.hidden_fields() @@ -9681,10 +9709,15 @@ class ModeEditSiteGlobals(ModeSites): except KeyError: raise MKUserError("site", _("This site does not exist.")) - # The site's default values are the current global settings + # 1. Check_MK program defaults + # Get default settings of all configuration variables of interest in the domain + # "check_mk". (this also reflects the settings done in main.mk) self._default_values = check_mk_local_automation("get-configuration", [], get_check_mk_config_var_names()) - self._default_values.update(load_configuration_settings()) + # 2. Values of global settings + self._global_settings = load_configuration_settings() + + # 3. Site specific global settings if is_wato_slave_site(): self._current_settings = load_configuration_settings(site_specific=True) else: @@ -9713,7 +9746,7 @@ class ModeEditSiteGlobals(ModeSites): return domain, valuespec, need_restart, allow_reset, in_global_settings = configvars()[varname] - def_value = self._default_values.get(varname, valuespec.default_value()) + def_value = self._global_setting(varname, self._default_values.get(varname, valuespec.default_value())) if action == "reset" and not is_a_checkbox(valuespec): c = wato_confirm( @@ -9774,6 +9807,7 @@ class ModeEditSiteGlobals(ModeSites): group_names = global_config_variable_groups(show_all=True) render_global_configuration_variables(group_names, self._default_values, + self._global_settings, self._current_settings, search=search)

6 years, 11 months

5068 Add error message to report in case some sites are not reachable

by Mathias Kettner

Module: check_mk Branch: master Commit: a1c795a865aaa5115bfb49bbdb936c7f719d8f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1c795a865aaa5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 25 11:00:52 2017 +0200 5068 Add error message to report in case some sites are not reachable When you create a report in a distributed environment with multiple sites and not all of the sites are reachable when the report is being created then there was simply missing data without any further notice. No at the end of the report there is added an error message if there was a problem with at least one site. That way the reader knows that the data might be incomplete. Change-Id: I78704f1f935f7d3e46a1066a19c81518289f70fc --- .werks/5068 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/5068 b/.werks/5068 new file mode 100644 index 0000000..4330145 --- /dev/null +++ b/.werks/5068 @@ -0,0 +1,17 @@ +Title: Add error message to report in case some sites are not reachable +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1500973145 +Class: feature + +When you create a report in a distributed environment with multiple sites +and not all of the sites are reachable when the report is being created +then there was simply missing data without any further notice. + +No at the end of the report there is added an error message if there +was a problem with at least one site. That way the reader knows that +the data might be incomplete. +

6 years, 11 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: dea165f6b0562978674be456f6392d13e861554c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea165f6b05629… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 25 10:58:33 2017 +0200 Reserved 10 Werk IDS Change-Id: Ic6824ddc438289a518ccba390e16f783aef56fba --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9cc71ed..a89599c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5068 +5078

6 years, 11 months

Updated werk 4983

by Simon Betz

Module: check_mk Branch: master Commit: 9f27f16cc8171f93095970b6640c75a4e98b5b3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f27f16cc8171f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 24 17:39:48 2017 +0200 Updated werk 4983 Change-Id: I028b27e46364ce8ce9ed6f49f0d1463376667079 --- .werks/4983 | 12 ++++++++++++ checks/brocade_fcport | 38 +++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.werks/4983 b/.werks/4983 index 27caeb4..dbb709f 100644 --- a/.werks/4983 +++ b/.werks/4983 @@ -8,4 +8,16 @@ State: unknown Version: 1.5.0i1 Date: 1500909872 +Brocade specific SNMP table +.1.3.6.1.4.1.1588.2.1.1.1.6.2.1 +does not provide speed information for the interfaces. +Thus this check plugins had to fetch another SNMP table +.1.3.6.1.2.1.31.1.1.1.15 +from IF-MIB. +Unfortunately these tables are not directly connected by index +and the assumed speed information could be wrong for some +devices. +http://community.brocade.com/t5/Fibre-Channel-SAN/SNMP-FC-port-speed/td-p/64980 +says that "1073741824" from if-table correlates with index 1 from +brocade-if-table. diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 54fe2b0..bb7e604 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -233,22 +233,22 @@ def check_brocade_fcport(item, params, parsed): if found_entry is None: return 3, "No SNMP data found" - index = if_entry["index"] - txwords = if_entry["txwords"] - rxwords = if_entry["rxwords"] - txframes = if_entry["txframes"] - rxframes = if_entry["rxframes"] - notxcredits = if_entry["notxcredits"] - rxcrcs = if_entry["rxcrcs"] - rxencinframes = if_entry["rxencinframes"] - rxencoutframes = if_entry["rxencoutframes"] - c3discards = if_entry["c3discards"] - brocade_speed = if_entry["brocade_speed"] - porttype = if_entry["porttype"] - is_isl = if_entry["is_isl"] - isl_speed = if_entry["islspeed"] - bbcredits = if_entry["bbcredits"] - speed = if_entry["ifspeed"] + index = found_entry["index"] + txwords = found_entry["txwords"] + rxwords = found_entry["rxwords"] + txframes = found_entry["txframes"] + rxframes = found_entry["rxframes"] + notxcredits = found_entry["notxcredits"] + rxcrcs = found_entry["rxcrcs"] + rxencinframes = found_entry["rxencinframes"] + rxencoutframes = found_entry["rxencoutframes"] + c3discards = found_entry["c3discards"] + brocade_speed = found_entry["brocade_speed"] + porttype = found_entry["porttype"] + is_isl = found_entry["is_isl"] + isl_speed = found_entry["islspeed"] + bbcredits = found_entry["bbcredits"] + speed = found_entry["ifspeed"] this_time = time.time() average = params.get("average") # range in minutes @@ -375,9 +375,9 @@ def check_brocade_fcport(item, params, parsed): # P O R T S T A T E for dev_state, state_key, state_info, warn_states, state_map in [ - (if_entry["phystate"], "phystate", "Physical", [1, 6], brocade_fcport_phystates), - (if_entry["opstate"], "opstate", "Operational", [1, 3], brocade_fcport_opstates), - (if_entry["admstate"], "admstate", "Administrative", [0, 1, 3], brocade_fcport_admstates), + (found_entry["phystate"], "phystate", "Physical", [1, 6], brocade_fcport_phystates), + (found_entry["opstate"], "opstate", "Operational", [1, 3], brocade_fcport_opstates), + (found_entry["admstate"], "admstate", "Administrative", [0, 1, 3], brocade_fcport_admstates), ]: state = 0 errorflag = ""

6 years, 11 months

4983 FIX brocade_fcport: Fixed wrong speed information

by Simon Betz

Module: check_mk Branch: master Commit: aed8de701e460cff5ac467be33887b94504a4a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aed8de701e460c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 24 17:29:16 2017 +0200 4983 FIX brocade_fcport: Fixed wrong speed information Change-Id: Ie2b83d508b79a5186a53b71320a1f25f02a4815d --- .werks/4983 | 11 ++ checks/brocade_fcport | 349 ++++++++++++++++++++++++++------------------------ 2 files changed, 193 insertions(+), 167 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aed8de701e…

6 years, 11 months

Reserved 10 Werk IDS

by Jukka Aro

Module: check_mk Branch: master Commit: f14ed85b455afaccd96720c59598921048710f8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f14ed85b455afa… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jul 24 16:54:52 2017 +0200 Reserved 10 Werk IDS Change-Id: I02076f5dcc28b1d5a3a4c42b841b8d35d0691561 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0abcd55..9cc71ed 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5058 +5068

6 years, 11 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: a49f4e804ba474a93f708cef4f43b83bdbc830bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a49f4e804ba474… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 16:51:42 2017 +0200 Reserved 20 Werk IDS Change-Id: I8a3598f200793f0134939cce7b042f5942eeff03 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 24a45e5..0abcd55 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5038 +5058

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017