Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4522 emka_modules: New checks for EMKA devices which support the ELM2-MIB

by Simon Betz

Module: check_mk Branch: master Commit: ba61a0c87d5b8c4dffda9329c5d282a86a945b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba61a0c87d5b8c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 14 08:59:02 2017 +0100 4522 emka_modules: New checks for EMKA devices which support the ELM2-MIB The following check plugins are included: emka_modules emka_modules.alarm emka_modules.handle emka_modules.relay emka_modules.sensor_humid emka_modules.sensor_temp emka_modules.sensor_volt See check man pages for more information Change-Id: I2ac561c50a311240c260bf6195cc2d84a620f139 --- .werks/4522 | 18 ++ checkman/emka_modules | 20 ++ checkman/emka_modules.alarm | 17 ++ checkman/emka_modules.handle | 17 ++ checkman/emka_modules.relay | 16 ++ checkman/emka_modules.sensor_humid | 17 ++ checkman/emka_modules.sensor_temp | 17 ++ checkman/emka_modules.sensor_volt | 17 ++ checks/emka_modules | 436 +++++++++++++++++++++++++++++++++++++ lib/man_pages.py | 1 + 10 files changed, 576 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ba61a0c87d…

7 years, 6 months

4187 FIX check_mk_agent.linux: better performance for tcp connections query

by Marcel Arentz

Module: check_mk Branch: master Commit: abcf3ea751e29e94f0a22d8cbe670ca139104764 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abcf3ea751e29e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jan 17 15:00:57 2017 +0100 4187 FIX check_mk_agent.linux: better performance for tcp connections query The previously method to get information about tcp connections will slow down if the host is under heavy load. The new option to get these information will be more stable in this point. The legacy method (cat /proc/net/tcp) will still be used for older linux distributions, where ss may not be available. Change-Id: If3b8405b956ee33f0481ba4167e41d36d5d968d9 --- .werks/4187 | 12 ++++++++++++ agents/check_mk_agent.linux | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/4187 b/.werks/4187 new file mode 100644 index 0000000..0d3344e --- /dev/null +++ b/.werks/4187 @@ -0,0 +1,12 @@ +Title: check_mk_agent.linux: better performance for tcp connections query +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1484661608 +Class: fix + +The previously method to get information about tcp connections will slow +down if the host is under heavy load. The new option to get these information +will be more stable in this point. The legacy method (cat /proc/net/tcp) will +still be used for older linux distributions, where ss may not be available. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cecb049..4e1ec35 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -386,7 +386,14 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' +if type waitmax >/dev/null ; then + THIS=$(waitmax -s 1 10 cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }') + if [ $? == 0 ] ; then + echo "$THIS" + else + ss -ant |grep -v ^State | awk ' /:/ { c[$1]++; } END { for (x in c) { print x, c[x]; } }' |sed -e 's/^ESTAB/01/g;s/^SYN-SENT/02/g;s/^SYN-RECV/03/g;s/^FIN-WAIT-1/04/g;s/^FIN-WAIT-2/05/g;s/^TIME-WAIT/06/g;s/^CLOSED/07/g;s/^CLOSE-WAIT/08/g;s/^LAST-ACK/09/g;s/^LISTEN/0A/g;s/^CLOSING/0B/g;' + fi +fi # Linux Multipathing if type multipath >/dev/null ; then

7 years, 6 months

4538 FIX blade_bx_powermod: Fixed outdated calculation of state

by Marcel Arentz

Module: check_mk Branch: master Commit: 3b75702ed81baf9dd4f7767f7c320a2d17fe23a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b75702ed81baf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 17:20:50 2017 +0100 4538 FIX blade_bx_powermod: Fixed outdated calculation of state In the old version of this checkplugin the state "fanmodule" has not been considered. Change-Id: I4d2dda3c51b8cfc86c24030af1e9228cd1799ec9 --- .werks/4538 | 10 ++++++++++ checks/blade_bx_powermod | 48 ++++++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.werks/4538 b/.werks/4538 new file mode 100644 index 0000000..2aeda59 --- /dev/null +++ b/.werks/4538 @@ -0,0 +1,10 @@ +Title: blade_bx_powermod: Fixed outdated calculation of state +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489421952 +Class: fix + +In the old version of this checkplugin the state "fanmodule" has not been considered. diff --git a/checks/blade_bx_powermod b/checks/blade_bx_powermod index 31aa186..a4f4a74 100644 --- a/checks/blade_bx_powermod +++ b/checks/blade_bx_powermod @@ -24,34 +24,38 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def inventory_blade_bx_powermod(info): + for line in info: + yield (line[0], None) + def check_blade_bx_powermod(item, _no_param, info): power_status = { - 1 : "unknown", - 2 : "ok", - 3 : "not-present", - 4 : "error", - 5 : "critical", - 6 : "off", - 7 : "dummy", + "1" : ("unknown", 3), + "2" : ("ok", 0), + "3" : ("not-present", 2), + "4" : ("error", 2), + "5" : ("critical", 2), + "6" : ("off", 2), + "7" : ("dummy", 2), + "8" : ("fanmodule", 0), } + for line in info: + index, status, product_name = line + if not index == item: + continue + state_readable, state = power_status[status] + return state, "%s Status is %s" % (product_name, state_readable) - for index, status, product_name in info: - status = saveint(status) - if index != item: continue - state = 0 - if status != 2: - state = 2 - - return (state, "%s Status is %s" % (product_name, power_status[status]) ) check_info['blade_bx_powermod'] = { - "check_function" : check_blade_bx_powermod, - "inventory_function" : lambda info: [ (line[0], None) for line in info ], - "service_description" : "Power Module %s", - "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.2.4.1", [ - 1, # index - 2, # status - 4, # product name + "inventory_function" : inventory_blade_bx_powermod, + "check_function" : check_blade_bx_powermod, + "service_description" : "Power Module %s", + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.2.4.1", [ + 1, # s31SysPowerSupplyUnitId + 2, # s31SysPowerSupplyUnitStatus + 4, # s31SysPowerSupplyUnitProductName ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1",

7 years, 6 months

4354 FIX netstat_an.bat: Fix syntax error

by Konstantin Büttner

Module: check_mk Branch: master Commit: d3cb9476d694da4e0e320334827db985fc213252 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3cb9476d694da… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 13 17:03:50 2017 +0100 4354 FIX netstat_an.bat: Fix syntax error Thanks to Davide Del Grande for the patch! Change-Id: I88e7d3be0cf8860bcab5f89e16b871595290eb60 --- .werks/4354 | 11 +++++++++++ agents/windows/plugins/netstat_an.bat | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4354 b/.werks/4354 new file mode 100644 index 0000000..565a3d6 --- /dev/null +++ b/.werks/4354 @@ -0,0 +1,11 @@ +Title: netstat_an.bat: Fix syntax error +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489420846 + +Thanks to Davide Del Grande for the patch! diff --git a/agents/windows/plugins/netstat_an.bat b/agents/windows/plugins/netstat_an.bat index 221a0fb..cea7a98 100644 --- a/agents/windows/plugins/netstat_an.bat +++ b/agents/windows/plugins/netstat_an.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<win_netstat^>^>^> -netstat -anp TCP & netstat –anp TCPv6 +netstat -anp TCP & netstat -anp TCPv6

7 years, 6 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: ef29ba9309c0888723ab09ff26a2e3caf89ba283 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef29ba9309c088… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 16:53:25 2017 +0100 minor cleanup Change-Id: Ibcbb610321270e142a5ae32a41c38d81ecf2382a --- checks/netstat.include | 33 ++++++++++++++++++--------------- web/plugins/wato/check_parameters.py | 16 ++++++++-------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/checks/netstat.include b/checks/netstat.include index 1822429..a57cdad 100644 --- a/checks/netstat.include +++ b/checks/netstat.include @@ -53,28 +53,31 @@ def check_netstat_generic(item, params, connections): if match: found += 1 - # Check if found connections are within limits - yield 0, "Found %d matching entries" % found - + infotext = "Found %d matching entries" % found + states = [0] if params.get("min_states"): min_warn, min_crit = params["min_states"] - if found <= min_crit: - state = 2 - elif found <= min_warn: - state = 1 + if found < min_crit: + min_state = 2 + elif found < min_warn: + min_state = 1 else: - state = 0 - if state: - yield state, "too few (warn/crit at %d/%d)" % (min_warn, min_crit) + min_state = 0 + if min_state: + states.append(min_state) + infotext += " (warn/crit below %d/%d)" % (min_warn, min_crit) if params.get("max_states"): max_warn, max_crit = params["max_states"] if found >= max_crit: - state = 2 + max_state = 2 elif found >= max_warn: - state = 1 + max_state = 1 else: - state = 0 - if state: - yield state, "too many (warn/crit at %d/%d)" % (max_warn, max_crit) + max_state = 0 + if max_state: + states.append(max_state) + infotext += " (warn/crit at %d/%d)" % (max_warn, max_crit) + + yield max(states), infotext diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dd343dd..9cedef1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6078,21 +6078,21 @@ register_check_parameters( ( "local_port", Integer(title = _("Local port number"), minvalue = 1, maxvalue = 65535, )), ( "remote_ip", IPv4Address(title = _("Remote IP address"))), ( "remote_port", Integer(title = _("Remote port number"), minvalue = 1, maxvalue = 65535, )), - ( "min_states", + ( "max_states", Tuple( - title = _("Minimum number of connections or listeners"), + title = _("Maximum number of connections or listeners"), elements = [ - Integer(title = _("Warning if below")), - Integer(title = _("Critical if below")), + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), ], ), ), - ( "max_states", + ( "min_states", Tuple( - title = _("Maximum number of connections or listeners"), + title = _("Minimum number of connections or listeners"), elements = [ - Integer(title = _("Warning at")), - Integer(title = _("Critical at")), + Integer(title = _("Warning if below")), + Integer(title = _("Critical if below")), ], ), ),

7 years, 6 months

4521 FIX mssql_versions: Fixed IndexError during inventory

by Simon Betz

Module: check_mk Branch: master Commit: a967b1eb7fb731dec35ba34f4320e6f55ecdc211 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a967b1eb7fb731… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 16:59:28 2017 +0100 4521 FIX mssql_versions: Fixed IndexError during inventory Change-Id: I1ad703b18ceddc350200f610d2f2637c2602a779 --- .werks/4521 | 11 +++++++++++ inventory/mssql_versions | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4521 b/.werks/4521 new file mode 100644 index 0000000..66b2d42 --- /dev/null +++ b/.werks/4521 @@ -0,0 +1,11 @@ +Title: mssql_versions: Fixed IndexError during inventory +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489420731 + + diff --git a/inventory/mssql_versions b/inventory/mssql_versions index 646aafa..b290aa6 100644 --- a/inventory/mssql_versions +++ b/inventory/mssql_versions @@ -67,7 +67,10 @@ def inv_mssql_versions(info): if len(line) not in [2, 4]: continue - instance_id = line[0].split("_", 1)[1] + if "_" in line[0]: + instance_id = line[0].split("_", 1)[1] + else: + instance_id = line[0] version = line[1] edition = len(line) == 4 and line[2] or "" clustered = len(line) == 4 and line[3] != ""

7 years, 6 months

4353 FIX palo_alto: Fix wrong infotext

by Konstantin Büttner

Module: check_mk Branch: master Commit: fc64ac466b1761025a8bfc88b4888b1a33d08800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc64ac466b1761… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 13 16:39:11 2017 +0100 4353 FIX palo_alto: Fix wrong infotext Thanks to Robert Sander for the fix! Change-Id: I9f8af2f470d5d8cd519e480427ccff0a2b129ccb --- .werks/4353 | 11 +++++++++++ checks/palo_alto | 13 +++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/4353 b/.werks/4353 new file mode 100644 index 0000000..b9d0dc2 --- /dev/null +++ b/.werks/4353 @@ -0,0 +1,11 @@ +Title: palo_alto: Fix wrong infotext +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489419411 + +Thanks to Robert Sander for the fix! diff --git a/checks/palo_alto b/checks/palo_alto index 22ebb76..58b57a9 100644 --- a/checks/palo_alto +++ b/checks/palo_alto @@ -30,12 +30,12 @@ def inventory_palo_alto(info): def check_palo_alto(_no_item, _no_params, info): - firmware_version, ha_mode, local_state, peer_state = info[0] + firmware_version, local_state, peer_state, ha_mode = info[0] ha_modes = {} yield 0, "Firmware Version: %s" % firmware_version yield 0, "HA mode: %s" % ha_mode yield 0, "Local HA state: %s" % local_state - yield 0, "Peer HA state: %s" % local_state + yield 0, "Peer HA state: %s" % peer_state check_info["palo_alto"] = { @@ -43,9 +43,10 @@ check_info["palo_alto"] = { "check_function" : check_palo_alto, "service_description" : "Palo Alto State", "snmp_info" : ( ".1.3.6.1.4.1.25461.2.1.2.1", [ - "1", - "11", - "12", - "13", ] ), + "1", # panSysSwVersion + "11", # panSysHAState + "12", # panSysHAPeerState + "13", # panSysHAMode + ] ), "snmp_scan_function" : lambda oid: "25461" in oid(".1.3.6.1.2.1.1.2.0"), }

7 years, 6 months

handling odd plugin output...

by Marcel Arentz

Module: check_mk Branch: master Commit: a3e5296351d38c1a1861db605e59bc69cf0828cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e5296351d38c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 16:28:22 2017 +0100 handling odd plugin output... Change-Id: I1e60dca56e90d9287a553c302cd6ec0d7ac60092 --- checks/hyperv_checkpoints | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/hyperv_checkpoints b/checks/hyperv_checkpoints index 52af648..9378e0a 100644 --- a/checks/hyperv_checkpoints +++ b/checks/hyperv_checkpoints @@ -38,9 +38,10 @@ def check_hyperv_checkpoints(item, params, info): number_of_checkpoints = 0 for line in info: - snapshot, age = line - oldest = max(int(age), oldest) - number_of_checkpoints += 1 + if len(line) == 2: + snapshot, age = line + oldest = max(int(age), oldest) + number_of_checkpoints += 1 if number_of_checkpoints > 0: state = 0

7 years, 6 months

4537 FIX hyperv_checkpoints: Fixed wrong detection of checkpoint

by Marcel Arentz

Module: check_mk Branch: master Commit: d0bda357edb22be61825aea2e922a4d574ce0e86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0bda357edb22b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 16:20:48 2017 +0100 4537 FIX hyperv_checkpoints: Fixed wrong detection of checkpoint The original plugin expected an leading line which never existed. Therfore the amount of checkpoints has been undercharged. Change-Id: Iac4adaecbd1b49afcd6b3a5588375be7487dbe72 --- .werks/4537 | 11 +++++++++++ checks/hyperv_checkpoints | 10 +++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/4537 b/.werks/4537 new file mode 100644 index 0000000..3acebd8 --- /dev/null +++ b/.werks/4537 @@ -0,0 +1,11 @@ +Title: hyperv_checkpoints: Fixed wrong detection of checkpoint +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489418293 +Class: fix + +The original plugin expected an leading line which never existed. Therfore +the amount of checkpoints has been undercharged. diff --git a/checks/hyperv_checkpoints b/checks/hyperv_checkpoints index 5ce7909..52af648 100644 --- a/checks/hyperv_checkpoints +++ b/checks/hyperv_checkpoints @@ -35,9 +35,13 @@ def inventory_hyperv_checkpoints(info): def check_hyperv_checkpoints(item, params, info): oldest = 0 - for snapshot, age in info[1:]: + number_of_checkpoints = 0 + + for line in info: + snapshot, age = line oldest = max(int(age), oldest) - number_of_checkpoints = len(info[1:]) + number_of_checkpoints += 1 + if number_of_checkpoints > 0: state = 0 if params.get('age'): @@ -50,7 +54,7 @@ def check_hyperv_checkpoints(item, params, info): else: perfdata = [("age", oldest)] return state, "%s Checkpoints, Oldest is: %s" % \ - (len(info[1:]), get_age_human_readable(oldest)), perfdata + (number_of_checkpoints, get_age_human_readable(oldest)), perfdata else: return 0, "No Checkpoints found", [("age", 0)]

7 years, 6 months

4460 BI aggregations: Now able to configure additional message for each rule result

by Andreas Boesl

Module: check_mk Branch: master Commit: b2107a8529bd0c25f5de797a090e46ae75ba616c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2107a8529bd0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 13 15:27:31 2017 +0100 4460 BI aggregations: Now able to configure additional message for each rule result When configuring a rule, you can now set an optional message, which will be displayed beside the rule result. In earlier versions, a rule result was OK, CRIT, etc. The new option allows you to provide an additional text for each state. So the result now may look like CRIT, only 70% of servers are up. This additional information is also shown in the check plugins check_bi_aggr and check_bi_locals.py. Change-Id: I898723b3b301d743700bdceb6f25fac6db297835 --- .werks/4460 | 19 +++++++++++++++++++ web/htdocs/bi.py | 37 ++++++++++++++++++++++++++++++------- web/plugins/wato/bi.py | 22 +++++++++++++++++++++- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/.werks/4460 b/.werks/4460 new file mode 100644 index 0000000..f628528 --- /dev/null +++ b/.werks/4460 @@ -0,0 +1,19 @@ +Title: BI aggregations: Now able to configure additional message for each rule result +Level: 1 +Component: bi +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489414976 + +When configuring a rule, you can now set an optional message, which will be displayed +beside the rule result. In earlier versions, a rule result was OK, CRIT, etc. +The new option allows you to provide an additional text for each state. + + +So the result now may look like CRIT, only 70% of servers are up. + + +This additional information is also shown in the check plugins check_bi_aggr and check_bi_locals.py. diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0fc5e0b..3109b62 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2016,15 +2016,17 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): # Convert new dictionary style rule into old tuple based # format + # TODO: O.o Remove this code, all of it... if type(rule) == dict: rule = ( rule.get("title", _("Untitled BI rule")), rule.get("params", []), rule.get("aggregation", "worst"), - rule.get("nodes", []) + rule.get("nodes", []), + rule.get("state_messages") ) - if len(rule) != 4: + if len(rule) != 5: raise MKConfigError(_("Invalid BI aggregation rule: " "Aggregation rules must contain four elements: description, argument list, " "aggregation function and list of nodes. Your rule has %d elements: " @@ -2036,7 +2038,7 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): "too many levels or built an infinite recursion. This happened in rule %s") % pprint.pformat(rule)) - description, arglist, funcname, nodes = rule + description, arglist, funcname, nodes, state_messages = rule # check arguments and convert into dictionary if len(arglist) != len(args): @@ -2135,6 +2137,9 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): "func" : funcname, "nodes" : elements} + if state_messages: + aggregation["state_messages"] = state_messages + # Handle REMAINING references, if we are a root node if lvl == 0: for hostspec, ref, placeholder in g_remaining_refs: @@ -2855,6 +2860,17 @@ def ajax_render_tree(): raise MKGeneralException(_("Unknown BI Aggregation %s") % aggr_title) +def compute_output_message(effective_state, rule): + output = [] + if effective_state["output"]: + output.append(effective_state["output"]) + + str_state = str(effective_state["state"]) + if str_state in rule.get("state_messages", {}): + output.append(html.attrencode(rule["state_messages"][str_state])) + + return ", ".join(output) + def render_tree_json(row): expansion_level = int(html.var("expansion_level", 999)) @@ -2895,8 +2911,7 @@ def render_tree_json(row): effective_state = tree[0] json_node["state"] = effective_state["state"] - json_node["output"] = effective_state["output"] - + json_node["output"] = compute_output_message(effective_state, tree[2]) return json_node @@ -3055,13 +3070,18 @@ def aggr_render_node(tree, title, show_host, mousecode=None, img_class=None): title = ('<img class="icon bi" src="images/icon_outof_serviceperiod.png" title="%s">' % \ _("This element is currently not in its service period.")) + title + h = '%s\n' \ % (effective_state["state"] if effective_state["state"] != None else -1, addclass, render_bi_state(effective_state["state"])) if mousecode: + state_message = "" + if str(effective_state["state"]) in tree[2].get("state_messages", {}): + state_message = "&diams;" + html.attrencode(tree[2]["state_messages"][str(effective_state["state"])]) + if img_class: h += '<img src="images/tree_black_closed.png" class="treeangle %s"%s>' % \ (img_class, mousecode) - h += '%s' % (mousecode, title) + h += '%s%s' % (mousecode, title, state_message) else: h += title @@ -3174,6 +3194,8 @@ def create_aggregation_row(tree, status_info = None): if assumed_state != None: eff_state = assumed_state + output = compute_output_message(eff_state, node) + return { "aggr_tree" : tree, "aggr_treestate" : tree_state, @@ -3181,7 +3203,7 @@ def create_aggregation_row(tree, status_info = None): "aggr_assumed_state" : assumed_state, # is None, if there are no assumptions "aggr_effective_state" : eff_state, # is assumed_state, if there are assumptions, else real state "aggr_name" : node["title"], - "aggr_output" : eff_state["output"], + "aggr_output" : output, "aggr_hosts" : node["reqhosts"], "aggr_function" : node["func"], } @@ -3486,3 +3508,4 @@ def migrate_bi_configuration(): config.host_aggregations = map(convert_aggregation, config.host_aggregations) if config.aggregations and type(config.aggregations[0]) != dict: config.aggregations = map(convert_aggregation, config.aggregations) + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index f0bc857..bfbf9c4 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1516,6 +1516,26 @@ class ModeBIEditRule(ModeBI): title = _("Nodes that are aggregated by this rule"), ), ), + ( "state_messages", + Optional( + Dictionary( + elements = map(lambda (state, name): + (state, TextAscii( + title = _("Message when rule result is %s") % name, + default_value = None, size = 80)), + [("0", "OK"), + ("1", "WARN"), + ("2", "CRIT"), + ("3", "UNKNOWN")]) + ), + title = _("Additional messages describing rule state"), + help = _("This option allows you to display an additional, freely configurable text, to the rule outcome, " + "which may describe the state more in detail. For example, instead of <tt>CRIT</tt>, the rule can now " + "display <tt>CRIT, less than 70% of servers reachable</tt>. This message is also shown within the BI aggregation " + "check plugins."), + label = _("Add messages") + ) + ) ] return Dictionary( @@ -1526,7 +1546,7 @@ class ModeBIEditRule(ModeBI): headers = [ ( _("General Properties"), [ "id", "title", "comment", "params", "disabled" ]), ( _("Child Node Generation"), [ "nodes" ] ), - ( _("Aggregation Function"), [ "aggregation" ], ), + ( _("Aggregation Function"), [ "aggregation", "state_messages" ], ), ] )

7 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017