Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 8274da536f2668bd5528777c6177457c694e4b61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8274da536f2668… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 16 21:46:43 2019 +0200 Add type annotation to help mypy Change-Id: Iebc6856dcb9a93f37c80693b1cbcc351ef3d9289 --- cmk_base/automations/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/automations/__init__.py b/cmk_base/automations/__init__.py index cc6e486..0ac6c3c 100644 --- a/cmk_base/automations/__init__.py +++ b/cmk_base/automations/__init__.py @@ -27,6 +27,7 @@ import signal import sys import pprint +from typing import Optional # pylint: disable=unused-import import cmk.utils.debug from cmk.utils.exceptions import MKTimeout @@ -115,7 +116,7 @@ class Automations(object): class Automation(object): - cmd = None + cmd = None # type: Optional[str] needs_checks = False needs_config = False

5 years, 5 months

Fixed "custom snapin" icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 33fc9643cbcd405e0ed8ad6acc1b1f4ce6a96c9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33fc9643cbcd40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 08:55:01 2019 +0200 Fixed "custom snapin" icons Change-Id: I4af8b666e512314777a87df73161583cc1c4f023 --- .../themes/facelift/images/icon_custom_snapin.png | Bin 1848 -> 461 bytes .../themes/facelift/images/icon_new_custom_snapin.png | Bin 1848 -> 461 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/themes/facelift/images/icon_custom_snapin.png b/web/htdocs/themes/facelift/images/icon_custom_snapin.png index 022bdce..56062ae 100644 Binary files a/web/htdocs/themes/facelift/images/icon_custom_snapin.png and b/web/htdocs/themes/facelift/images/icon_custom_snapin.png differ diff --git a/web/htdocs/themes/facelift/images/icon_new_custom_snapin.png b/web/htdocs/themes/facelift/images/icon_new_custom_snapin.png index 022bdce..56062ae 100644 Binary files a/web/htdocs/themes/facelift/images/icon_new_custom_snapin.png and b/web/htdocs/themes/facelift/images/icon_new_custom_snapin.png differ

5 years, 5 months

7340 Add option to show long output in availability timeline

by Lars Michelsen

Module: check_mk Branch: master Commit: 43b657bf9bcc0317b723bd5dbae72b69377b9102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43b657bf9bcc03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 17 13:01:36 2019 +0200 7340 Add option to show long output in availability timeline In addition to the "last known plugin output" it is now possible to show the "last known long output" in the availability timeline as separate column. This column is only populated for hosts / services that have been configured to write their long output to the monitoring history. This can be done using the new rulesets "Write long output of services to monitoring history" and "Write long output of hosts to monitoring history". Be aware: Enabling this option may increase the filesystem space consumption of your monitoring history depending on the amount of data your hosts or services put in the long output. You should only enable this for the objects you need it for. This feature can only be used with the Microcore. Change-Id: I206723bd61394af3537a91a5735914b93cfe169d --- .werks/7340 | 23 +++++++++++++++++++++++ cmk/gui/availability.py | 22 +++++++++++++++++++++- cmk/gui/plugins/views/availability.py | 17 ++++++++++++++--- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/.werks/7340 b/.werks/7340 new file mode 100644 index 0000000..7cfe7fe --- /dev/null +++ b/.werks/7340 @@ -0,0 +1,23 @@ +Title: Add option to show long output in availability timeline +Level: 1 +Component: multisite +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1555497919 +Class: feature + +In addition to the "last known plugin output" it is now possible to show the +"last known long output" in the availability timeline as separate column. + +This column is only populated for hosts / services that have been configured to +write their long output to the monitoring history. This can be done using the +new rulesets "Write long output of services to monitoring history" and "Write +long output of hosts to monitoring history". + +Be aware: Enabling this option may increase the filesystem space consumption of +your monitoring history depending on the amount of data your hosts or services +put in the long output. You should only enable this for the objects you need it +for. + +This feature can only be used with the Microcore. diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py index da057d1..3360235 100644 --- a/cmk/gui/availability.py +++ b/cmk/gui/availability.py @@ -151,6 +151,23 @@ def get_av_display_options(what): ("service_groups", _("By Service group")), ] + if not cmk.is_raw_edition(): + ruleset_search_url = html.makeuri_contextless( + [ + ("filled_in", "search"), + ("search", "long_output"), + ("mode", "rulesets"), + ], + filename="wato.py", + ) + long_output_labelling = [ + ("timeline_long_output", + _("Display long output in timeline (<a href=\"%s\">Enable via WATO</a>)") % + ruleset_search_url) + ] + else: + long_output_labelling = [] + return [ # Time range selection ("rangespec", "double", False, Timerange( @@ -169,6 +186,7 @@ def get_av_display_options(what): ("use_display_name", _("Use alternative display name for services")), ("omit_buttons", _("Do not display icons for history and timeline")), ("omit_timeline_plugin_output", _("Do not display plugin output in timeline")), + ] + long_output_labelling + [ ("display_timeline_legend", _("Display legend for timeline")), ("omit_av_levels", _("Do not display legend for availability levels")), ])), @@ -605,7 +623,7 @@ def get_outage_statistic_options(avoptions): # a specific host or service has one specific state. # what is either "host" or "service" or "bi". def get_availability_rawdata(what, context, filterheaders, only_sites, av_object, include_output, - avoptions): + include_long_output, avoptions): if what == "bi": return get_bi_availability_rawdata(filterheaders, only_sites, av_object, include_output, avoptions) @@ -647,6 +665,8 @@ def get_availability_rawdata(what, context, filterheaders, only_sites, av_object ] if include_output: columns.append("log_output") + if include_long_output: + columns.append("long_log_output") if "use_display_name" in avoptions["labelling"]: columns.append("service_display_name") if "show_alias" in avoptions["labelling"]: diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 6a91620..d4d50f8 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -219,9 +219,17 @@ def render_availability_page(view, context, filterheaders): # Now compute all data, we need this also for CSV export if not html.has_user_errors(): - av_rawdata, has_reached_logrow_limit = \ - availability.get_availability_rawdata(what, context, filterheaders, view.only_sites, - av_object, av_mode == "timeline", avoptions) + include_long_output = av_mode == "timeline" \ + and "timeline_long_output" in avoptions["labelling"] + av_rawdata, has_reached_logrow_limit = availability.get_availability_rawdata( + what, + context, + filterheaders, + view.only_sites, + av_object=av_object, + include_output=av_mode == "timeline", + include_long_output=include_long_output, + avoptions=avoptions) av_data = availability.compute_availability(what, av_rawdata, avoptions) # Do CSV ouput @@ -422,6 +430,9 @@ def render_availability_timeline(what, av_entry, avoptions): if "omit_timeline_plugin_output" not in avoptions["labelling"]: table.cell(_("Last Known Plugin Output"), row.get("log_output", "")) + if "timeline_long_output" in avoptions["labelling"]: + table.cell(_("Last Known Long Output"), row.get("long_log_output", "")) + # Legend for timeline if "display_timeline_legend" in avoptions["labelling"]: render_timeline_legend(what)

5 years, 5 months

Temporariliy remove failing fireeye tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 731592cb17ba648bbbc39a0fd51a58e6c36cb966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=731592cb17ba64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 23 08:20:50 2019 +0200 Temporariliy remove failing fireeye tests Change-Id: I53ea36f3832fb1f893e447762b9f5e7f180b51d4 --- .../checks/generictests/datasets/fireeye_content.py | 17 ----------------- .../datasets/fireeye_content_assert_update_age.py | 18 ------------------ .../datasets/fireeye_content_invalid_update_time.py | 17 ----------------- .../datasets/fireeye_content_update_failed.py | 18 ------------------ 4 files changed, 70 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/fireeye_content.py b/tests/unit/checks/generictests/datasets/fireeye_content.py deleted file mode 100644 index f938b0a..0000000 --- a/tests/unit/checks/generictests/datasets/fireeye_content.py +++ /dev/null @@ -1,17 +0,0 @@ -# yapf: disable - - -checkname = 'fireeye_content' - - -info = [['456.180', '1', '2016/02/26 15:42:06']] - - -discovery = {'': [(None, {})]} - - -checks = {'': [(None, - {}, - [(0, 'Last update: 2016/02/26 15:42:06', []), - (0, 'Age: 3.1 y', []), - (0, 'Security version: 456.180', [])])]} diff --git a/tests/unit/checks/generictests/datasets/fireeye_content_assert_update_age.py b/tests/unit/checks/generictests/datasets/fireeye_content_assert_update_age.py deleted file mode 100644 index ff12374..0000000 --- a/tests/unit/checks/generictests/datasets/fireeye_content_assert_update_age.py +++ /dev/null @@ -1,18 +0,0 @@ -# yapf: disable - - -checkname = 'fireeye_content' - - -info = [['456.180', '0', '2016/02/26 15:42:06']] - - -discovery = {'': [(None, {})]} - - -checks = {'': [(None, - {'update_time_levels': (9000000, 10000000)}, - [(1, 'Update: failed', []), - (0, 'Last update: 2016/02/26 15:42:06', []), - (2, 'Age: 3.1 y (warn/crit at 104 d/116 d)', []), - (0, 'Security version: 456.180', [])])]} diff --git a/tests/unit/checks/generictests/datasets/fireeye_content_invalid_update_time.py b/tests/unit/checks/generictests/datasets/fireeye_content_invalid_update_time.py deleted file mode 100644 index bed6f93..0000000 --- a/tests/unit/checks/generictests/datasets/fireeye_content_invalid_update_time.py +++ /dev/null @@ -1,17 +0,0 @@ -# yapf: disable - - -checkname = 'fireeye_content' - - -info = [['456.180', '1', '2016//26 15:42:06']] - - -discovery = {'': [(None, {})]} - - -checks = {'': [(None, - {}, - [(0, 'Last update: 2016//26 15:42:06', []), - (0, 'update has never completed', []), - (0, 'Security version: 456.180', [])])]} diff --git a/tests/unit/checks/generictests/datasets/fireeye_content_update_failed.py b/tests/unit/checks/generictests/datasets/fireeye_content_update_failed.py deleted file mode 100644 index 2ddb407..0000000 --- a/tests/unit/checks/generictests/datasets/fireeye_content_update_failed.py +++ /dev/null @@ -1,18 +0,0 @@ -# yapf: disable - - -checkname = 'fireeye_content' - - -info = [['456.180', '0', '2016/02/26 15:42:06']] - - -discovery = {'': [(None, {})]} - - -checks = {'': [(None, - {}, - [(1, 'Update: failed', []), - (0, 'Last update: 2016/02/26 15:42:06', []), - (0, 'Age: 3.1 y', []), - (0, 'Security version: 456.180', [])])]}

5 years, 5 months

Licenses: Updated the list of licenses

by Kenneth Okoh

Module: check_mk Branch: master Commit: 32171b81998dc25d1599e485ce430648beede19c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32171b81998dc2… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Mon Apr 22 12:56:07 2019 +0200 Licenses: Updated the list of licenses Change-Id: I5c24785d2ebb616bbb031b6342310608123812b6 --- omd/Licenses.csv | 26 ++++++++++++++++++++++++-- omd/Licenses.ods | Bin 27356 -> 28118 bytes 2 files changed, 24 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=32171b8199…

5 years, 5 months

local: remove 'no data' case

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4120718928093766c1f688a016c6c521a09e6578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41207189280937… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 12:21:45 2019 +0200 local: remove 'no data' case Change-Id: I4fdf955ec8ee44bd1ee52fc93c12cb8727b1f1a7 --- checks/local | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checks/local b/checks/local index 99ebe24..c401107 100644 --- a/checks/local +++ b/checks/local @@ -190,10 +190,6 @@ def check_local(_no_item, params, data): collected_stats.setdefault(output.node, {}) collected_stats[output.node].setdefault(output.item, _parse_local_line(output.line)) - if collected_stats == {}: - yield 3, "No data found in agent output" - return - if params is not None and params.get("outcome_on_cluster", "worst") == "best": yield _calculate_local_best_state(collected_stats) return

5 years, 5 months

local: centralize validation

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1dabda071191473b22b61ca7802f8c72a545e22c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dabda07119147… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 12:07:43 2019 +0200 local: centralize validation * move the validation to one place * parse to item dict The idea here is to raise upon invalid lines during discovery, and ignore them otherwise. We move towards that. Change-Id: Ie892ed0bcabba1289376cf57a7b95ac2885db81f --- checks/local | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/checks/local b/checks/local index 34f19e9..99ebe24 100644 --- a/checks/local +++ b/checks/local @@ -35,12 +35,22 @@ # P No-Text hirn=-8;-20 +def _is_valid_line(line): + return len(line) >= 4 or (len(line) == 3 and line[0] == 'P') + + def parse_local(info): - LocalResult = collections.namedtuple("LocalResult", ("node", "line")) - parsed = [] + LocalResult = collections.namedtuple("LocalResult", ("node", "item", "line")) + + parsed = {} for line in info: node, stripped_line = line[0], line[1:] - parsed.append(LocalResult(node, stripped_line)) + if _is_valid_line(stripped_line): + item = stripped_line[1] + else: + item = None + parsed.setdefault(item, []).append(LocalResult(node, item, stripped_line)) + return parsed @@ -104,22 +114,15 @@ def local_compute_state(perfdata): def inventory_local(parsed): - inventory = [] - # Lines with P do not need to supply a text - for _node, line in parsed: - if len(line) >= 4 or len(line) == 3 and line[0] == 'P': - inventory.append((line[1], {})) - else: - raise MKGeneralException( - "Invalid line in agent section <<<local>>>: %s" % " ".join(line)) - return inventory + if None in parsed: + output = parsed[None][0] + raise MKGeneralException( + "Invalid line in agent section <<<local>>>: %s" % " ".join(output.line)) + return [(key, {}) for key in parsed] # Some helper functions 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), [] - statechar = line[0] perftxt = line[2] @@ -180,14 +183,12 @@ def _calculate_local_worst_state(collected_stats): yield state, output, perfdata -def check_local(item, params, parsed): +@get_parsed_item_data +def check_local(_no_item, params, data): collected_stats = {} - for nodename, line in parsed: - # Ignore invalid lines, tolerate bugs in local checks - # of unexperienced users - if len(line) >= 2 and line[1] == item: - collected_stats.setdefault(nodename, {}) - collected_stats[nodename].setdefault(item, _parse_local_line(line)) + for output in data: + collected_stats.setdefault(output.node, {}) + collected_stats[output.node].setdefault(output.item, _parse_local_line(output.line)) if collected_stats == {}: yield 3, "No data found in agent output"

5 years, 5 months

local: add parse funciton (tbc)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7d7b9ebb949c492cbb7dedf81ae03292b18e0361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d7b9ebb949c49… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 11:07:26 2019 +0200 local: add parse funciton (tbc) Change-Id: I5dda358acd73bc6a36a647a640f589c15cc36aef --- checks/local | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/checks/local b/checks/local index ad1317f..34f19e9 100644 --- a/checks/local +++ b/checks/local @@ -35,6 +35,15 @@ # P No-Text hirn=-8;-20 +def parse_local(info): + LocalResult = collections.namedtuple("LocalResult", ("node", "line")) + parsed = [] + for line in info: + node, stripped_line = line[0], line[1:] + parsed.append(LocalResult(node, stripped_line)) + return parsed + + # Compute state according to warn/crit levels contained in the # performance data. def local_compute_state(perfdata): @@ -94,16 +103,15 @@ def local_compute_state(perfdata): return worst, texts -def inventory_local(info): +def inventory_local(parsed): inventory = [] # Lines with P do not need to supply a text - for line in info: - stripped_line = line[1:] - if len(stripped_line) >= 4 or len(stripped_line) == 3 and stripped_line[0] == 'P': - inventory.append((stripped_line[1], {})) + for _node, line in parsed: + if len(line) >= 4 or len(line) == 3 and line[0] == 'P': + inventory.append((line[1], {})) else: raise MKGeneralException( - "Invalid line in agent section <<<local>>>: %s" % " ".join(stripped_line)) + "Invalid line in agent section <<<local>>>: %s" % " ".join(line)) return inventory @@ -172,16 +180,14 @@ def _calculate_local_worst_state(collected_stats): yield state, output, perfdata -def check_local(item, params, info): +def check_local(item, params, parsed): collected_stats = {} - for line in info: - nodename = line[0] - stripped_line = line[1:] + for nodename, line in parsed: # Ignore invalid lines, tolerate bugs in local checks # of unexperienced users - if len(stripped_line) >= 2 and stripped_line[1] == item: + if len(line) >= 2 and line[1] == item: collected_stats.setdefault(nodename, {}) - collected_stats[nodename].setdefault(item, _parse_local_line(stripped_line)) + collected_stats[nodename].setdefault(item, _parse_local_line(line)) if collected_stats == {}: yield 3, "No data found in agent output" @@ -196,8 +202,9 @@ def check_local(item, params, info): check_info["local"] = { - 'check_function': check_local, + 'parse_function': parse_local, 'inventory_function': inventory_local, + 'check_function': check_local, 'service_description': '%s', 'has_perfdata': True, 'node_info': True,

5 years, 5 months

agent_aws: Fixed two KeyError while collecting EC2 limits

by Simon Betz

Module: check_mk Branch: master Commit: 91376491eb53dca99bc808b0f9641d90d150e0ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91376491eb53dc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 13:43:22 2019 +0200 agent_aws: Fixed two KeyError while collecting EC2 limits Change-Id: I06a66184338527fc6682a7e8c03e8fa095fa0b42 --- cmk/special_agents/agent_aws.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index d9c335b..b2e8aa3 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -882,7 +882,7 @@ class EC2Limits(AWSSectionLimits): def _compute_content(self, raw_content, colleague_contents): reservations, reserved_instances, addresses, security_groups, interfaces, spot_inst_requests, spot_fleet_requests = raw_content.content instances = {inst['InstanceId']: inst for res in reservations for inst in res['Instances']} - res_instances = {inst['ReservedInstanceId']: inst for inst in reserved_instances} + res_instances = {inst['ReservedInstancesId']: inst for inst in reserved_instances} self._add_instance_limits(instances, res_instances, spot_inst_requests) self._add_addresses_limits(addresses) @@ -1039,7 +1039,7 @@ class EC2Limits(AWSSectionLimits): active_spot_fleet_requests = 0 total_target_cap = 0 for spot_fleet_req in spot_fleet_requests: - if spot_fleet_req['State'] != 'active': + if spot_fleet_req['SpotFleetRequestState'] != 'active': continue active_spot_fleet_requests += 1

5 years, 5 months

7455 FIX oracle_instance: Removed obsolete parameter ' ignore no archive log'

by Simon Betz

Module: check_mk Branch: master Commit: dc7140f1d1c23e570b13168c3152fdb83ce632b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc7140f1d1c23e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 12:59:27 2019 +0200 7455 FIX oracle_instance: Removed obsolete parameter 'ignore no archive log' The parameter 'ignore no archive log' has been removed because the parameter 'State in case of Archivelogmode is disabled: OK' has the same effect. Change-Id: I8890417809643877dddd58402e93c2d52f07972f --- .werks/7455 | 12 +++ checks/oracle_instance | 15 ++- .../wato/check_parameters/oracle_instance.py | 115 +++++++++++---------- 3 files changed, 82 insertions(+), 60 deletions(-) diff --git a/.werks/7455 b/.werks/7455 new file mode 100644 index 0000000..924a841 --- /dev/null +++ b/.werks/7455 @@ -0,0 +1,12 @@ +Title: oracle_instance: Removed obsolete parameter 'ignore no archive log' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555585076 +Class: fix + +The parameter 'ignore no archive log' has been removed because +the parameter 'State in case of Archivelogmode is disabled: OK' +has the same effect. diff --git a/checks/oracle_instance b/checks/oracle_instance index cc27bb8..c9e70cb 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -68,7 +68,17 @@ def inventory_oracle_instance(info): return inv_list +def _transform_oracle_instance_params(p): + if "ignore_noarchivelog" in p: + if p["ignore_noarchivelog"]: + p["noarchivelog"] = 0 + del p["ignore_noarchivelog"] + return p + + def check_oracle_instance(item, params, info): + params = _transform_oracle_instance_params(params) + def state_marker(state, infotext, param, column, data): value = params.get(param) if value is not None and column == data: @@ -194,9 +204,8 @@ def check_oracle_instance(item, params, info): infotext += ', Log Mode %s' % (log_mode.lower()) state, infotext = state_marker(state, infotext, 'archivelog', log_mode, 'ARCHIVELOG') - if not params.get('ignore_noarchivelog', False): - state, infotext = state_marker(state, infotext, 'noarchivelog', log_mode, - 'NOARCHIVELOG') + state, infotext = state_marker(state, infotext, 'noarchivelog', log_mode, + 'NOARCHIVELOG') # archivelog is only valid in non pdb # force logging is only usable when archivelog is enabled diff --git a/cmk/gui/plugins/wato/check_parameters/oracle_instance.py b/cmk/gui/plugins/wato/check_parameters/oracle_instance.py index 9830ea1..36b64d0 100644 --- a/cmk/gui/plugins/wato/check_parameters/oracle_instance.py +++ b/cmk/gui/plugins/wato/check_parameters/oracle_instance.py @@ -26,8 +26,8 @@ from cmk.gui.i18n import _ from cmk.gui.valuespec import ( + Transform, Age, - Checkbox, Dictionary, MonitoringState, TextAscii, @@ -61,68 +61,69 @@ class RulespecCheckgroupParametersOracleInstance(CheckParameterRulespecWithItem) @property def parameter_valuespec(self): - return Dictionary( - title=_("Consider state of Archivelogmode: "), - elements=[ - ('archivelog', - MonitoringState( - default_value=0, - title=_("State in case of Archivelogmode is enabled: "), - )), - ( - 'noarchivelog', - MonitoringState( - default_value=1, - title=_("State in case of Archivelogmode is disabled: "), + return Transform( + Dictionary( + title=_("Consider state of Archivelogmode: "), + elements=[ + ('archivelog', + MonitoringState( + default_value=0, + title=_("State in case of Archivelogmode is enabled: "), + )), + ( + 'noarchivelog', + MonitoringState( + default_value=1, + title=_("State in case of Archivelogmode is disabled: "), + ), ), - ), - ( - 'forcelogging', - MonitoringState( - default_value=0, - title=_("State in case of Force Logging is enabled: "), + ( + 'forcelogging', + MonitoringState( + default_value=0, + title=_("State in case of Force Logging is enabled: "), + ), ), - ), - ( - 'noforcelogging', - MonitoringState( - default_value=1, - title=_("State in case of Force Logging is disabled: "), + ( + 'noforcelogging', + MonitoringState( + default_value=1, + title=_("State in case of Force Logging is disabled: "), + ), ), - ), - ( - 'logins', - MonitoringState( - default_value=2, - title=_("State in case of logins are not possible: "), + ( + 'logins', + MonitoringState( + default_value=2, + title=_("State in case of logins are not possible: "), + ), ), - ), - ( - 'primarynotopen', - MonitoringState( - default_value=2, - title=_("State in case of Database is PRIMARY and not OPEN: "), + ( + 'primarynotopen', + MonitoringState( + default_value=2, + title=_("State in case of Database is PRIMARY and not OPEN: "), + ), ), - ), - ('uptime_min', - Tuple( - title=_("Minimum required uptime"), - elements=[ - Age(title=_("Warning if below")), - Age(title=_("Critical if below")), - ], - )), - ('ignore_noarchivelog', - Checkbox( - title=_("Ignore state of no-archive log"), - label=_("Enable"), - help=_("If active, only a single summary item is displayed. The summary " - "will explicitly mention sensors in warn/crit state but the " - "sensors that are ok are aggregated."), - default_value=False)), - ], - ) + ('uptime_min', + Tuple( + title=_("Minimum required uptime"), + elements=[ + Age(title=_("Warning if below")), + Age(title=_("Critical if below")), + ], + )), + ], + ), + forth=self._transform_oracle_instance_params) @property def item_spec(self): return TextAscii(title=_("Database SID"), size=12, allow_empty=False) + + def _transform_oracle_instance_params(self, p): + if "ignore_noarchivelog" in p: + if p["ignore_noarchivelog"]: + p["noarchivelog"] = 0 + del p["ignore_noarchivelog"] + return p

5 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019