Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Revert "local: Be strict about perfdata."

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3191517cd3f15a22109501e4a6afea7b4b919150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3191517cd3f15a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 23 10:39:14 2018 +0200 Revert "local: Be strict about perfdata." This reverts commit f476b2c5fdb1f53999669f098f87a7e61cf14fcd. Change-Id: I535e8f858243b73c5c874af0b2aebe8bcc5e0e56 --- checks/local | 102 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/checks/local b/checks/local index 964ce1b..c985fe0 100644 --- a/checks/local +++ b/checks/local @@ -40,27 +40,54 @@ def local_compute_state(perfdata): texts = [] - def outof_levels_text(value, lower, upper): - if upper is not None and value >= upper: - return " %s >= %s" % (value, upper) - elif lower is not None and value <= lower: - return " %s <= %s" % (value, lower) + # 16MB -> 16.0 + def float_ignore_uom(value): + while value: + if value[-1] not in "0123456789.-": + value = value[:-1] + else: + return float(value) + return 0.0 + + + def outof_levels(value, levels): + if levels == None: + return + + if ':' in levels: + lower, upper = map(float, levels.split(':')) else: - return "" + lower = None + upper = float(levels) + if value > upper: + return " %s > %s" % (value, upper) + elif lower != None and value < lower: + return " %s < %s" % (value, lower) worst = 0 - for varname, value, lwarn, uwarn, lcrit, ucrit in perfdata: + for entry in perfdata: + if len(entry) < 3: + continue # No levels attached + varname = entry[0] + value = float_ignore_uom(entry[1]) + warn = entry[2] + if len(entry) >= 4: + crit = entry[3] + else: + crit = None - text_crit = outof_levels_text(value, lcrit, ucrit) - if text_crit: + text = outof_levels(value, crit) + if text: worst = 2 - texts.append("%s%s(!!)" % (varname, text_crit)) + text = "%s%s(!!)" % (varname, text) + texts.append(text) else: - text_warn = outof_levels_text(value, lwarn, uwarn) - if text_warn: + text = outof_levels(value, warn) + if text: worst = max(worst, 1) - texts.append("%s%s(!)" % (varname, text_warn)) + text = "%s%s(!)" % (varname, text) + texts.append(text) else: texts.append("%s is %s(.)" % (varname, value)) @@ -82,37 +109,6 @@ def inventory_local(info): # Some helper functions -def float_ignore_uom(value): - # 16MB -> 16.0 - while value: - if value[-1] not in "0123456789.-": - value = value[:-1] - else: - break - # allow ValueError to be raised for '' - return float(value) - - -def _parse_perf_entry(entry): - """Parse to a list - - return [name, value, lower warn, upper warn, - lower crit, upper crit, min, max] - Do all needed type conversion here, to benefit from the try block - """ - varname, valuetxt = entry.split('=') - valuetxt = valuetxt.split(';') - p_entry = [varname, float_ignore_uom(valuetxt[0])] - for param in valuetxt[1:]: - if ':' in param: - p_entry += map(float, param.split(':')) - else: - p_entry += [None, float(param)] - p_entry += [None] * (8 - len(p_entry)) - - return p_entry - - def _parse_local_line(line): if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): return 3, "Incomplete line in local check output: %s" % " ".join(line), [] @@ -129,15 +125,17 @@ def _parse_local_line(line): if perftxt != "-": for entry in perftxt.split('|'): try: - p_entry = _parse_perf_entry(entry) - except ValueError: - return 3, "Invalid performance data entry %s in local check output %s" % \ - (entry, " ".join(line)), [] - compute_data.append(p_entry[:6]) - # perfdata must not contain lower levels - perfdata.append((p_entry[0], p_entry[1], p_entry[3], - p_entry[5], p_entry[6], p_entry[7])) + varname, valuetxt = entry.split('=') + values = valuetxt.split(';') + compute_data.append( tuple([varname] + values) ) + # perfdata must not contain values with colons. So we split + # these values and use the upper levels only. + upper_values = [v.split(':')[-1] for v in values] + perfdata.append( tuple([varname] + upper_values) ) + except ValueError: + return 3, "Invalid performance data %s in local check output %s" % \ + (perftxt, " ".join(line)), [] if statechar == 'P': state, texts = local_compute_state(compute_data)

6 years, 1 month

Remove BasicItemState test from MockItemState

by Moritz Kiemer

Module: check_mk Branch: master Commit: dfac05b9ec64406edb6a4593e2d0d9589d7e5dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfac05b9ec6440… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 10:10:40 2018 +0200 Remove BasicItemState test from MockItemState Unfortunately, we can't be that strict. It would break at least logwatch. Change-Id: Ie53c866724f3a178a6e264b91bd682deb7a575cb --- tests/unit/checks/checktestlib.py | 41 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 263e3a8..cc29f23 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -319,21 +319,18 @@ class MockItemState(object): There are three different types of arguments to pass to MockItemState: - 1) Tuple or a BasicItemState: - The argument is assumed to be (time_diff, value). All calls to the - item_state API behave as if the last state had been `value`, recorded - `time_diff` seeconds ago. + 1) Callable object: + The callable object will replace `get_item_state`. It must accept two + arguments (key/default), in same way a dictionary does. - 2) Dictionary containing Tuples or BasicItemStates: + 2) Dictionary: The dictionary will replace the item states. Basically `get_item_state` gets replaced by the dictionarys GET method. - 3) Callable object: - The callable object will replace `get_item_state`. It must accept two - arguments (key/default), in same way a dictionary does. - - In all of these cases, the sanity of the returned values is checked - (i.e. they have to be BasicItemState). + 3) Anything else: + All calls to the item_state API behave as if the last state had + been `value`, recorded + `time_diff` seeconds ago. See for example 'test_statgrab_cpu_check.py'. """ @@ -347,34 +344,16 @@ class MockItemState(object): self.get_val_function = mock_state return - type_mock_state = type(mock_state) - allowed_types = (tuple, BasicItemState, dict) - assert type_mock_state in allowed_types, \ - "MockItemState: state %r must be of type %r, or callable - not %r" % \ - (mock_state, allowed_types, type_mock_state) - # in dict case check values - if type_mock_state == dict: - msg = "MockItemState: dict value %r must be in of type %r - not %r" - allowed_types = (tuple, BasicItemState) - for v in mock_state.values(): - tyv = type(v) - assert tyv in allowed_types, msg % (v, allowed_types, tyv) + if isinstance(mock_state, dict): self.get_val_function = mock_state.get else: self.get_val_function = lambda key, default: mock_state def __call__(self, user_key, default=None): - if default is not None: - # ensure the default value is sane - default = BasicItemState(default) val = self.get_val_function(user_key, default) - if val is None: - return val - if not isinstance(val, BasicItemState): - val = BasicItemState(val) - return val.time_diff, val.value + return val def __enter__(self): '''The default context: just mock get_item_state'''

6 years, 1 month

6370 FIX Fixed missing CEE/CME specific werks in release notes

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c9b63cc011cda6822389b428c53a11422f8c936 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c9b63cc011cda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 10:34:34 2018 +0200 6370 FIX Fixed missing CEE/CME specific werks in release notes The Check_MK release notes viewer (Click on version in sidebar header) was not correctly showing CEE/CME specific werks. All previous 1.5 releases are affected by this regression. Change-Id: Ib538a68fe894c0073ebf4dfb2cc3034b43272d52 --- .werks/6370 | 13 +++++++++++++ scripts/precompile-werks.py | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.werks/6370 b/.werks/6370 new file mode 100644 index 0000000..b2fe0f1 --- /dev/null +++ b/.werks/6370 @@ -0,0 +1,13 @@ +Title: Fixed missing CEE/CME specific werks in release notes +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1532593979 + +The Check_MK release notes viewer (Click on version in sidebar header) +was not correctly showing CEE/CME specific werks. All previous 1.5 +releases are affected by this regression. diff --git a/scripts/precompile-werks.py b/scripts/precompile-werks.py index 1aaccdd..21083c6 100755 --- a/scripts/precompile-werks.py +++ b/scripts/precompile-werks.py @@ -11,6 +11,8 @@ if len(sys.argv) > 3: else: edition_short = None +if not os.path.exists(werk_dir): + raise Exception("Requested werk directory does not exist: %s" % werk_dir) werks = cmk.werks.load_raw_files(werk_dir)

6 years, 1 month

6352 FIX Fixed "Sync with LDAP connections" default for new sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e07d2ee22db7c85c2054c75d6d7869135482383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e07d2ee22db7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 09:57:50 2018 +0200 6352 FIX Fixed "Sync with LDAP connections" default for new sites When a new monitoring site is create using WATO it was intended to set the option "Sync with LDAP connections" to make the site not perform an LDAP sync on it's own. We assume that new sites will be added as WATO slave site in most cases. In this scenario you normally don't want to let the slave sites synchronize on their own because the synchronization would produce pending changes on the slave site. These pending changes will prevent future synchronizations from the master site and need to be confirmed manually on the slave site to be able to sync again. In previous versions the new sites were configured to synchronize with LDAP on their own by default. It's recommended to change this option to the intended default. However, there are scenarios were it makes sense to set this option to also perform the synchronization on the slave site with either all configured LDAP connections or just some connections. Change-Id: Iaa23361eb7207c16f7070d1fbf78cb36a4f2d854 --- .werks/6352 | 28 ++++++++++++++++++++++++++++ cmk/gui/wato/pages/sites.py | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.werks/6352 b/.werks/6352 new file mode 100644 index 0000000..b83e2b2 --- /dev/null +++ b/.werks/6352 @@ -0,0 +1,28 @@ +Title: Fixed "Sync with LDAP connections" default for new sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531893317 + +When a new monitoring site is create using WATO it was intended to +set the option "Sync with LDAP connections" to make the site not +perform an LDAP sync on it's own. + +We assume that new sites will be added as WATO slave site in most +cases. In this scenario you normally don't want to let the slave +sites synchronize on their own because the synchronization would +produce pending changes on the slave site. These pending changes +will prevent future synchronizations from the master site and need +to be confirmed manually on the slave site to be able to sync again. + +In previous versions the new sites were configured to synchronize +with LDAP on their own by default. It's recommended to change this +option to the intended default. + +However, there are scenarios were it makes sense to set this option +to also perform the synchronization on the slave site with either +all configured LDAP connections or just some connections. diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 32703e9..e541e97 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -673,7 +673,7 @@ class ModeEditSite(ModeSites): forms.section(_("Sync with LDAP connections"), simple=True) self._site_mgmt.user_sync_valuespec().render_input("user_sync", - self._site.get("user_sync", userdb.user_sync_default_config(self._site_id))) + self._site.get("user_sync", None if self._new else userdb.user_sync_default_config(self._site_id))) html.br() html.help(_('By default the users are synchronized automatically in the interval configured ' 'in the connection. For example the LDAP connector synchronizes the users every '

6 years, 1 month

6353 FIX LDAP sync: Do not add a pending change when sync is executed on slave sites

by Lars Michelsen

Module: check_mk Branch: master Commit: dae7dafa82b3a4288c494e77159d0e8466db31bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dae7dafa82b3a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 10:00:31 2018 +0200 6353 FIX LDAP sync: Do not add a pending change when sync is executed on slave sites To prevent synchronization problems from WATO master to slave sites when a remote LDAP sync is performed we don't create pending change entries on the slave sites anymore when user changes are made by the automatic synchronization. Change-Id: I9e7e384f37915f2faf038ac7b98bd1634a794d21 --- .werks/6353 | 13 +++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/6353 b/.werks/6353 new file mode 100644 index 0000000..456981a --- /dev/null +++ b/.werks/6353 @@ -0,0 +1,13 @@ +Title: LDAP sync: Do not add a pending change when sync is executed on slave sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531895586 + +To prevent synchronization problems from WATO master to slave sites when a remote +LDAP sync is performed we don't create pending change entries on the slave +sites anymore when user changes are made by the automatic synchronization. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index f4a834f..c221939 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1119,8 +1119,8 @@ class LDAPUserConnector(UserConnector): duration = time.time() - start_time self._logger.info('SYNC FINISHED - Duration: %0.3f sec', duration) - if changes: - import cmk.gui.watolib as watolib # TODO: Cleanup + import cmk.gui.watolib as watolib # TODO: Cleanup + if changes and not config.is_wato_slave_site(): watolib.add_change("edit-users", "<br>\n".join(changes), add_user=False) userdb.save_users(users)

6 years, 1 month

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: ea14696c687a72bd98bab784264bb4de86aeaa04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea14696c687a72… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 26 09:19:06 2018 +0200 Fixed typo Change-Id: Icbac1fdeebc57e563bf975e8cdf9a336beda6376 --- cmk_base/data_sources/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 6da2763..d6b67c5 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -281,13 +281,13 @@ class DataSources(object): # Special agents can produce data for the same check_plugin_name on the same host, in this case # the section lines need to be extended multi_host_sections = MultiHostSections() - for this_hostname, this_ipaddress, these_sources, this_max_cachfile_age in hosts: + for this_hostname, this_ipaddress, these_sources, this_max_cachefile_age in hosts: # In case a max_cachefile_age is given with the function call, always use this one # instead of the host individual one. This is only used in discovery mode. if max_cachefile_age is not None: these_sources.set_max_cachefile_age(max_cachefile_age) else: - these_sources.set_max_cachefile_age(this_max_cachfile_age) + these_sources.set_max_cachefile_age(this_max_cachefile_age) for source in these_sources.get_data_sources(): host_sections_from_source = source.run()

6 years, 1 month

6384 FIX check_mk_agent.{linux, solaris, openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting

by Simon Betz

Module: check_mk Branch: master Commit: bd1e676262c429c68b1d853494881b648b1cf9a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd1e676262c429… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 26 08:13:48 2018 +0200 6384 FIX check_mk_agent.{linux,solaris,openwrt}: Quote command line in asynchronous MRPE call to prevent globbing and word splitting Change-Id: I1f2213f118637aa028436e87982dd9d1ef68865c --- .werks/6384 | 10 ++++++++++ agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.openwrt | 2 +- agents/check_mk_agent.solaris | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6384 b/.werks/6384 new file mode 100644 index 0000000..5d08e2a --- /dev/null +++ b/.werks/6384 @@ -0,0 +1,10 @@ +Title: check_mk_agent.linux, check_mk_agent.solaris, check_mk_agent.openwrt: Quote command line in asynchronous MRPE call to prevent globbing and word splitting +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532585614 +Class: fix + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8b7d8c4..a2ce491 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -264,7 +264,7 @@ function run_cached () { if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & else echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /bin/bash >/dev/null 2>&1 & fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 463e56a..082fab5 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -167,7 +167,7 @@ run_cached () { # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then # TODO: This won't work: run_mrpe is not exported. And do we have bash at all? - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & else echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 7afe5b5..a038367 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -123,7 +123,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then if [ $mrpe -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME \"$CMDLINE\" && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & else echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup /usr/bin/bash >/dev/null 2>&1 & fi

6 years, 1 month

Fixed and enabled consider-using-ternary warning.

by Sven Panne

6 years, 1 month

6368 FIX Custom color sets are only used by classic theme

by Lars Michelsen

Module: check_mk Branch: master Commit: 8eddf44b03451b20c616e458eccf5f9f65cf0ff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eddf44b03451b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 26 08:52:40 2018 +0200 6368 FIX Custom color sets are only used by classic theme The configurable color set which can be configured in the global settings of the CME are only used for the classic GUI theme and does not apply to the new facelift theme. Change-Id: Ib8ae736d77fc80b9ba66d405b31f1e3d8d77abc6 --- .werks/6368 | 13 +++++++++++++ cmk/gui/htmllib.py | 9 ++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/6368 b/.werks/6368 new file mode 100644 index 0000000..d7fd862 --- /dev/null +++ b/.werks/6368 @@ -0,0 +1,13 @@ +Title: Custom color sets are only used by classic theme +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cme +State: unknown +Version: 1.6.0i1 +Date: 1532585864 + +The configurable color set which can be configured in the +global settings of the CME are only used for the classic +GUI theme and does not apply to the new facelift theme. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 2b8df33..7f13844 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1786,15 +1786,14 @@ class html(HTMLGenerator): if config.custom_style_sheet: self.write('<link rel="stylesheet" type="text/css" href="%s">\n' % config.custom_style_sheet) - if cmk.is_managed_edition(): - import cmk.gui.cme.gui_colors as gui_colors - gui_colors.GUIColors().render_html() - - if self._theme and self._theme != "classic": fname = self._css_filename_for_browser("themes/%s/theme" % self._theme) self.stylesheet(fname) + elif cmk.is_managed_edition(): + import cmk.gui.cme.gui_colors as gui_colors + gui_colors.GUIColors().render_html() + def _plugin_stylesheets(self): plugin_stylesheets = set([])

6 years, 1 month

CMK-646: Increase logging of mkeventd (and fix liveproxyd logging) during integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 3421f6370bc5b17ff8e43b0e771522306651c258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3421f6370bc5b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 25 15:38:05 2018 +0200 CMK-646: Increase logging of mkeventd (and fix liveproxyd logging) during integration tests Change-Id: I102ca2264d461e50682807700b373b1f639ef97b --- tests/testlib/__init__.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9220024..5baa2be 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -531,6 +531,7 @@ class Site(object): self._enable_mod_python_debug() self._enabled_liveproxyd_debug_logging() + self._enable_mkeventd_debug_logging() self._install_test_python_modules() @@ -636,11 +637,22 @@ class Site(object): def _enabled_liveproxyd_debug_logging(self): - self.makedirs("etc/check_mk/liveproxyd.d/wato") - self.write_file("etc/check_mk/liveproxyd.d/wato/global.mk", + self.makedirs("etc/check_mk/liveproxyd.d") + self.write_file("etc/check_mk/liveproxyd.d/logging.mk", "liveproxyd_log_levels = {'cmk.liveproxyd': 10}") + def _enable_mkeventd_debug_logging(self): + self.makedirs("etc/check_mk/mkeventd.d") + self.write_file("etc/check_mk/mkeventd.d/logging.mk", + "log_level = %r\n" % { + 'cmk.mkeventd': 10, + 'cmk.mkeventd.EventServer': 10, + 'cmk.mkeventd.EventStatus': 10, + 'cmk.mkeventd.StatusServer': 10, + 'cmk.mkeventd.lock': 20 + }) + def _enable_mod_python_debug(self): path = "etc/check_mk/apache.conf" content = self.read_file(path)

6 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018