Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

cleanup in humidity.include, made levels handling more flexible

by Simon Betz

Module: check_mk Branch: master Commit: eacda39d46a58b02e2995e2f1d1eb0959dc6c71d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eacda39d46a58b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 13:56:17 2016 +0200 cleanup in humidity.include, made levels handling more flexible --- checks/humidity.include | 46 +++++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/checks/humidity.include b/checks/humidity.include index 9d3baaa..b3e7834 100644 --- a/checks/humidity.include +++ b/checks/humidity.include @@ -24,37 +24,51 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_humidity(humidity, params): - if params: - crit_lower, warn_lower, warn_upper, crit_upper = params +# old params = (crit_low , warn_low, warn, crit) +def check_humidity(humidity, params): + if params and type(params) in [ list, tuple ]: + params = { + "levels_lower" : (params[0], params[1]), + "levels" : (params[2], params[3]), + } else: - crit_lower, warn_lower, warn_upper, crit_upper = -1, -1, 101, 101 + params = { + "levels_lower" : (-1, -1), + "levels" : (101, 101), + } + crit_lower, warn_lower = params["levels_lower"] + warn_upper, crit_upper = params["levels"] perfdata = [ ("humidity", humidity, warn_upper, crit_upper, 0, 100) ] infotext = get_percent_human_readable(humidity) - levelstext = "" - levelstext_lower = " (warn/crit at or below %s/%s)" % ( + + levelstext_lower = " (warn/crit below %s/%s)" % ( get_percent_human_readable(warn_lower), get_percent_human_readable(crit_lower)) - levelstext_upper = " (warn/crit at or above %s/%s)" % ( + levelstext_upper = " (warn/crit at %s/%s)" % ( get_percent_human_readable(warn_upper), get_percent_human_readable(crit_upper)) - if humidity <= crit_lower: + status = 0 + levelstext = "" + if humidity < crit_lower: status = 2 - levelstext += levelstext_lower + levelstext = levelstext_lower + elif humidity >= crit_upper: status = 2 - levelstext += levelstext_upper - elif humidity <= warn_lower: + levelstext = levelstext_upper + + elif humidity < warn_lower: status = 1 - levelstext += levelstext_lower + levelstext = levelstext_lower + elif humidity >= warn_upper: status = 1 - levelstext += levelstext_upper - else: - status = 0 + levelstext = levelstext_upper + + if status: + infotext += levelstext - infotext += levelstext return status, infotext, perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e2c7056..47b2844 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7188,18 +7188,40 @@ register_check_parameters( "dict", ) +def transform_humidity(p): + if type(p) in [ list, tuple ]: + p = { + "levels_lower" : (float(p[1]), float(p[0])), + "levels" : (float(p[2]), float(p[3])), + } + return p + register_check_parameters( subgroup_environment, "humidity", _("Humidity Levels"), - Tuple( - help = _("This Ruleset sets the threshold limits for humidity sensors"), - elements = [ - Integer(title = _("Critical at or below"), unit="%" ), - Integer(title = _("Warning at or below"), unit="%" ), - Integer(title = _("Warning at or above"), unit="%" ), - Integer(title = _("Critical at or above"), unit="%" ), - ]), + Transform( + Dictionary( + help = _("This Ruleset sets the threshold limits for humidity sensors"), + elements = [ + ("levels", Tuple( + title = _("Upper levels"), + elements = [ + Percentage(title=_("Warning at")), + Percentage(title=_("Critical at")), + ] + )), + ("levels_lower", Tuple( + title = _("Lower levels"), + elements = [ + Percentage(title=_("Warning below")), + Percentage(title=_("Critical below")), + ] + )), + ] + ), + forth = transform_humidity, + ), TextAscii( title = _("Sensor name"), help = _("The identifier of the sensor."),

7 years, 11 months

enabled perfdata

by Simon Betz

Module: check_mk Branch: master Commit: 2e75af54a4384ea29d60c29646f41028a12fa6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e75af54a4384e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 13:38:38 2016 +0200 enabled perfdata --- checks/gude_humidity | 1 + checks/gude_relayport | 1 + checks/gude_temp | 1 + 3 files changed, 3 insertions(+) diff --git a/checks/gude_humidity b/checks/gude_humidity index 66a1e26..18bb690 100644 --- a/checks/gude_humidity +++ b/checks/gude_humidity @@ -46,6 +46,7 @@ check_info['gude_humidity'] = { 'inventory_function' : inventory_gude_humidity, 'check_function' : check_gude_humidity, 'service_description' : 'Humidity %s', + 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ "1.6.1.1.3.1", # GUDEADS-EPC****-MIB::epc****HygroSensor ]), diff --git a/checks/gude_relayport b/checks/gude_relayport index ba5eef1..5327ac3 100644 --- a/checks/gude_relayport +++ b/checks/gude_relayport @@ -76,6 +76,7 @@ check_info['gude_relayport'] = { 'inventory_function' : inventory_elphase, 'check_function' : check_elphase, 'service_description' : 'Relay port %s', + 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ "1.3.1.2.1.2", # GUDEADS-EPC****-MIB::epc****PortName "1.3.1.2.1.3", # GUDEADS-EPC****-MIB::epc****PortState diff --git a/checks/gude_temp b/checks/gude_temp index aec2522..951538a 100644 --- a/checks/gude_temp +++ b/checks/gude_temp @@ -48,6 +48,7 @@ check_info['gude_temp'] = { 'inventory_function' : inventory_gude_temp, 'check_function' : check_gude_temp, 'service_description' : 'Temperature %s', + 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.28507', [ "19", "38" ], [ "1.6.1.1.2.1", # GUDEADS-EPC****-MIB::epc****TempSensor ]),

7 years, 11 months

added missing manpages

by Simon Betz

Module: check_mk Branch: master Commit: a48743f72004545c7ec9188850de602ed7a01717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a48743f7200454… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 13:27:56 2016 +0200 added missing manpages --- checkman/gude_humidity | 18 ++++++++++++++++++ checkman/gude_relayport | 10 +++++++--- checkman/gude_temp | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/checkman/gude_humidity b/checkman/gude_humidity new file mode 100644 index 0000000..1c3b3d0 --- /dev/null +++ b/checkman/gude_humidity @@ -0,0 +1,18 @@ +title: GUDE Power Control: Humidity +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors humidity of a GUDE Power + Control device which supports GUDEADS-EPC1100-MIB or + -822X-MIB. + + Upper default levels are set to 60, 70 percentage. These + levels are configurable + +item: + The sensor name. + +inventory: + One service is created. diff --git a/checkman/gude_relayport b/checkman/gude_relayport index ea41f61..83feea0 100644 --- a/checkman/gude_relayport +++ b/checkman/gude_relayport @@ -1,11 +1,15 @@ -title: GUDE Power Control: Relay port status +title: GUDE Power Control: Relay port status and electricity agents: snmp catalog: hw/other license: GPL distribution: check_mk description: - This check monitors the ON/OFF state of a GUDE Power - Control device which supports the GUDEADS-EPC1100-MIB. + This check monitors the ON/OFF state and electricity of a GUDE Power + Control device which supports the GUDEADS-EPC1100-MIB or + -822X-MIB. + + Default levels are set to 220, 210 V, 15, 16 A and 3500, 3600 Wh. + These and other levels are configurable item: The relay port name. diff --git a/checkman/gude_temp b/checkman/gude_temp new file mode 100644 index 0000000..accf41b --- /dev/null +++ b/checkman/gude_temp @@ -0,0 +1,18 @@ +title: GUDE Power Control: Temperature +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the temperature of a GUDE Power + Control device which supports the GUDEADS-EPC1100-MIB or + -822X-MIB. + + Default levels are set to 35, 40 degree celsius. These + levels are configurable. + +item: + The sensor name. + +inventory: + One service is created.

7 years, 11 months

3913 gude_relayport, gude_temp, gude_humidity: new checks and relayport check now monitors electricity

by Simon Betz

Module: check_mk Branch: master Commit: d771733bcaea9e85f6d4772e8bab5638fc1e5542 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d771733bcaea9e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 13:21:20 2016 +0200 3913 gude_relayport, gude_temp, gude_humidity: new checks and relayport check now monitors electricity --- .werks/3913 | 9 ++++++ ChangeLog | 1 + checks/gude_humidity | 56 +++++++++++++++++++++++++++++++++++ checks/gude_relayport | 81 ++++++++++++++++++++++++++++++++++++--------------- checks/gude_temp | 59 +++++++++++++++++++++++++++++++++++++ 5 files changed, 182 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d771733bca…

7 years, 11 months

3912 elphase.include: now device states can be mapped to monitoring states

by Simon Betz

Module: check_mk Branch: master Commit: 19e1d4ad0d35af0dc63893ea5c795dccb3ac5bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e1d4ad0d35af… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 13:19:14 2016 +0200 3912 elphase.include: now device states can be mapped to monitoring states --- .werks/3912 | 9 +++++++++ ChangeLog | 1 + checks/elphase.include | 15 +++++++++++++++ web/plugins/wato/check_parameters.py | 17 ++++++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.werks/3912 b/.werks/3912 new file mode 100644 index 0000000..c8857ad --- /dev/null +++ b/.werks/3912 @@ -0,0 +1,9 @@ +Title: elphase.include: now device states can be mapped to monitoring states +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1475839045 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cbf207c..4ecdd6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 3841 cups_queues: thresholds are now configurable in WATO... * 3910 oracle_instance: noarchivelog can now be ignored * 3911 if.include: each operational state can now be mapped to a check state + * 3912 elphase.include: now device states can be mapped to monitoring states * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checks/elphase.include b/checks/elphase.include index fe450ab..fa0e32d 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -32,6 +32,7 @@ def inventory_elphase(parsed): # Parsed has the following form: # parsed = { # "Phase 1" : { +# "device_state" : (1, "warning"), # overall device state: state, state readable # "voltage" : (220.17, (1, "Voltage is too low")), # with device state # "current" : 12.0, # without device state # } @@ -52,6 +53,20 @@ def check_elphase(item, params, parsed): if params is None: params = {} + if "device_state" in parsed[item]: + device_state, device_state_readable = parsed[item]["device_state"] + if params.get("map_device_states", []): + device_state_params = dict(params["map_device_states"]) + if device_state in device_state_params: + state = device_state_params[device_state] + elif device_state_readable in device_state_params: + state = device_state_params[device_state_readable] + else: + state = 0 + else: + state = device_state + yield state, "Device status: %s(%s)" % (device_state_readable, device_state) + for what, title, unit, bound, factor in [ ( "voltage", "Voltage", " V", Bounds.Lower, 1), ( "current", "Current", " A", Bounds.Upper, 1), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1ca9b8b..e2c7056 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10368,6 +10368,13 @@ register_check_parameters( Integer(title = _("critical at"), unit = u"%", default_value = 90), ] )), + ("map_device_states", + ListOf(Tuple( + elements = [ TextAscii(size=10), MonitoringState() ]), + title = _("Map device state"), + help = _("Here you can enter either device state number (eg. from SNMP devices) " + "or exact device state name and the related monitoring state."), + )), ]), TextAscii( title = _("Output Name"), @@ -10383,7 +10390,15 @@ register_check_parameters( help = _("This rule allows you to specify levels for the voltage, current, power " "and apparent power of your device. The levels will only be applied if the device " "actually supplies values for these parameters."), - elements = phase_elements, + elements = phase_elements + [ + ("map_device_states", + ListOf(Tuple( + elements = [ TextAscii(size=10), MonitoringState() ]), + title = _("Map device state"), + help = _("Here you can enter either device state number (eg. from SNMP devices) " + "or exact device state name and the related monitoring state."), + )), + ], ), TextAscii( title = _("Input Name"),

7 years, 11 months

updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: f20ce1d7d4d25f6f2aa1e64c572e20c51c81153e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f20ce1d7d4d25f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 10:32:08 2016 +0200 updated werk text --- .werks/3911 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3911 b/.werks/3911 index 4638c5e..5149a28 100644 --- a/.werks/3911 +++ b/.werks/3911 @@ -1,4 +1,4 @@ -Title: if: each operational state can now be mapped to a check state +Title: if.include: each operational state can now be mapped to a check state Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 3a201eb..cbf207c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Checks & Agents: * 3841 cups_queues: thresholds are now configurable in WATO... * 3910 oracle_instance: noarchivelog can now be ignored - * 3911 if: each operational state can now be mapped to a check state + * 3911 if.include: each operational state can now be mapped to a check state * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe...

7 years, 11 months

3911 if: each operational state can now be mapped to a check state

by Simon Betz

Module: check_mk Branch: master Commit: a6f6ac86655a50630f81860f02cc2c14f6ae8736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6f6ac86655a50… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 09:50:08 2016 +0200 3911 if: each operational state can now be mapped to a check state --- .werks/3911 | 9 +++++++++ ChangeLog | 1 + checks/if.include | 24 +++++++++++++++++------- web/plugins/wato/check_parameters.py | 11 +++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.werks/3911 b/.werks/3911 new file mode 100644 index 0000000..4638c5e --- /dev/null +++ b/.werks/3911 @@ -0,0 +1,9 @@ +Title: if: each operational state can now be mapped to a check state +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1475826564 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f657cb1..3a201eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Checks & Agents: * 3841 cups_queues: thresholds are now configurable in WATO... * 3910 oracle_instance: noarchivelog can now be ignored + * 3911 if: each operational state can now be mapped to a check state * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checks/if.include b/checks/if.include index a2e42e7..5751c22 100644 --- a/checks/if.include +++ b/checks/if.include @@ -576,7 +576,8 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, targetspeed = params.get("speed") assumed_speed_in = params.get("assumed_speed_in") assumed_speed_out = params.get("assumed_speed_out") - targetstate = params.get("state") + targetstates = params.get("state") + map_operstates = dict(params.get("map_operstates", [])) average = params.get("average") unit = params.get("unit") in ["Bit", "bit"] and "Bit" or "B" unit_multiplier = unit == "Bit" and 8.0 or 1.0 @@ -668,14 +669,23 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, infotext = "%son %s: " % ( infotext, node ) state = 0 - - if targetstate and \ - (ifOperStatus != targetstate - and not (type(targetstate) in [ list, tuple ] and ifOperStatus in targetstate)): + infotext += "(%s)" % ifOperStatusName + if targetstates and \ + (ifOperStatus != targetstates + and not (type(targetstates) in [ list, tuple ] and ifOperStatus in targetstates)): state = 2 - infotext += "(%s)(!!) " % ifOperStatusName + + if map_operstates and ifOperStatus in map_operstates: + state = map_operstates[ifOperStatus] + + if state == 1: + infotext += "(!) " + elif state == 2: + infotext += "(!!) " + elif state == 3: + infotext += "(?) " else: - infotext += "(%s) " % ifOperStatusName + infotext += " " if group_members: infotext = infotext[:-1] # remove last space diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a45a1f5..1ca9b8b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5912,6 +5912,17 @@ register_check_parameters( none_label = _("ignore"), negate = True) ), + ( "map_operstates", + ListOf( + Tuple( + orientation = "horizontal", + elements = [ + DropdownChoice(choices = dict_choices(defines.interface_oper_states())), + MonitoringState() + ]), + title = _('Map operational states'), + ) + ), ( "assumed_speed_in", OptionalDropdownChoice( title = _("Assumed input speed"),

7 years, 11 months

veritas_vcs: Fix PATH issue (Werk 3748) also for OpenWRT agent

by Konstantin Büttner

Module: check_mk Branch: master Commit: cb73f73cbdfd1771ccbeed6303666c1f9503f1d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb73f73cbdfd17… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 6 15:40:20 2016 +0200 veritas_vcs: Fix PATH issue (Werk 3748) also for OpenWRT agent --- agents/check_mk_agent.openwrt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index dfbb1f9..e28e65d 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -660,10 +660,10 @@ if [ -x /opt/VRTSvcs/bin/haclus ] then echo "<<<veritas_vcs>>>" vcshost=$(hostname | cut -d. -f1) - haclus -display -localclus | grep -e ClusterName -e ClusState - hasys -display -attribute SysState - hagrp -display -sys $vcshost -attribute State -localclus - hares -display -sys $vcshost -attribute State -localclus + /opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState + /opt/VRTSvcs/bin/hasys -display -attribute SysState + /opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus + /opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus fi # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg

7 years, 11 months

3820 FIX Network scan: no longer fails completely if hostname already exists in configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: a004d276d3427568be5333bf1c9205ed6c4b1a4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a004d276d34275… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 6 15:35:33 2016 +0200 3820 FIX Network scan: no longer fails completely if hostname already exists in configuration Already known hostnames are now skipped instead. --- .werks/3820 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 ++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3820 b/.werks/3820 new file mode 100644 index 0000000..1564baf --- /dev/null +++ b/.werks/3820 @@ -0,0 +1,11 @@ +Title: Network scan: no longer fails completely if hostname already exists in configuration +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1475760893 + +Already known hostnames are now skipped instead. + diff --git a/ChangeLog b/ChangeLog index 4a66614..f657cb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ WATO: * 3915 User access times: New icon when never logged in; New column "last seen" * 3914 FIX: Roles: Aliases are now unique during cloning + * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... Livestatus: * 3740 Moved livedump utility from treasures directly into bin directory... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c14c68c..14dc9f2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15914,8 +15914,6 @@ def do_network_scan_automation(): automation_commands["network-scan"] = do_network_scan_automation - -# FIXME/TODO: What happens in case of duplicate host names? def add_scanned_hosts_to_folder(folder, found): translation = folder.attribute("network_scan").get("translate_names", {}) @@ -15927,7 +15925,8 @@ def add_scanned_hosts_to_folder(folder, found): "ipaddress" : ipaddress, "tag_criticality" : "offline", } - entries.append((host_name, attrs, None)) + if not Host.host_exists(host_name): + entries.append((host_name, attrs, None)) lock_exclusive() folder.create_hosts(entries)

7 years, 11 months

3910 oracle_instance: noarchivelog can now be ignored

by Simon Betz

Module: check_mk Branch: master Commit: 20be233907bab18a9c28733483658311960280bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20be233907bab1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 6 15:13:02 2016 +0200 3910 oracle_instance: noarchivelog can now be ignored --- .werks/3910 | 9 +++++++++ ChangeLog | 1 + checks/oracle_instance | 7 ++++--- web/plugins/wato/check_parameters.py | 11 ++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/3910 b/.werks/3910 new file mode 100644 index 0000000..e411b6f --- /dev/null +++ b/.werks/3910 @@ -0,0 +1,9 @@ +Title: oracle_instance: noarchivelog can now be ignored +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1475759543 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b420317..4a66614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Checks & Agents: * 3841 cups_queues: thresholds are now configurable in WATO... + * 3910 oracle_instance: noarchivelog can now be ignored * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checks/oracle_instance b/checks/oracle_instance index 6912488..5871164 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -50,8 +50,8 @@ def inventory_oracle_instance(info): def check_oracle_instance(item, params, info): def state_marker(state, infotext, param, column, data): - value = params.get(param) - if value != None and column == data: + value = params.get(param) + if value != None and column == data: state = max(state, value) if value == 1: infotext += '(!)' @@ -125,7 +125,8 @@ def check_oracle_instance(item, params, info): if name != '_MGMTDB' and sid != '-MGMTDB': infotext += ', Log Mode %s' % (log_mode.lower()) state, infotext = state_marker(state, infotext, 'archivelog', log_mode, 'ARCHIVELOG') - state, infotext = state_marker(state, infotext, 'noarchivelog',log_mode, 'NOARCHIVELOG') + if not params.get('ignore_noarchivelog', False): + state, infotext = state_marker(state, infotext, 'noarchivelog',log_mode, 'NOARCHIVELOG') # force logging is only usable when archivelog is enabled if log_mode == 'ARCHIVELOG': diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dfcdb3c..a45a1f5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7631,7 +7631,16 @@ register_check_parameters( 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) + ), ], ), TextAscii(

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016