Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: innovaphone_temp: Fixed parenthesis mismatch

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0c78d243cf2047fc44b05eff940c58e77f92423a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c78d243cf2047… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 15:22:32 2014 +0200 innovaphone_temp: Fixed parenthesis mismatch --- checks/innovaphone_temp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/innovaphone_temp b/checks/innovaphone_temp index 57ef671..463a6f3 100644 --- a/checks/innovaphone_temp +++ b/checks/innovaphone_temp @@ -24,13 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_temp_default_levels = ( 45, 50 ) +innovaphone_temp_default_levels = (45, 50) def inventory_innovaphone_temp(info): return [ (None, "innovaphone_temp_default_levels") ] def check_innovaphone_temp(_no_item, params, info): - return check_temperature(int(info[0][1])), params) + return check_temperature(int(info[0][1]), params) check_info["innovaphone_temp"] = { "check_function" : check_innovaphone_temp,

10 years

Check_MK Git: check_mk: #1410 Output log text of scheduled downtime log entries

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ab523198c453d824c02f53d7038b757f9fced58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab523198c453d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 14:47:34 2014 +0200 #1410 Output log text of scheduled downtime log entries Multisite now shows the text that is attached to a scheduled downtime start/stop in the monitoring logfile when showing the history of a host or service. Alas, Nagios does not log anything useful in those entries. The Check_MK Micro Core logs the downtime comment, which is by that way now visible in the historic views of Multisite. --- .werks/1410 | 12 ++++++++++++ ChangeLog | 1 + livestatus/src/LogEntry.cc | 10 +++++----- web/plugins/views/painters.py | 5 ++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/1410 b/.werks/1410 new file mode 100644 index 0000000..2577941 --- /dev/null +++ b/.werks/1410 @@ -0,0 +1,12 @@ +Title: Output log text of scheduled downtime log entries +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1412081129 +Class: feature + +Multisite now shows the text that is attached to a scheduled downtime start/stop in the +monitoring logfile when showing the history of a host or service. Alas, Nagios does not +log anything useful in those entries. The Check_MK Micro Core logs the downtime comment, +which is by that way now visible in the historic views of Multisite. diff --git a/ChangeLog b/ChangeLog index 27bb664..4b077df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1392 WATO Folder filter: show only the paths a user is allowed to see * 1398 Allow to spread times of next check when rescheduling... * 1405 Checkbox for settings downtimes on the hosts of the selected services... + * 1410 Output log text of scheduled downtime log entries... * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 0c0b7cc..f996309 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -153,7 +153,7 @@ inline bool LogEntry::handleStatusEntry() _host_name = next_token(&scan, ';'); _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; + _comment = next_token(&scan, ';'); return true; } else if (!strncmp(_text, "HOST FLAPPING ALERT: ", 21)) @@ -166,7 +166,7 @@ inline bool LogEntry::handleStatusEntry() _host_name = next_token(&scan, ';'); _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; + _comment = next_token(&scan, ';'); return true; } @@ -175,7 +175,7 @@ inline bool LogEntry::handleStatusEntry() || !strncmp(_text, "CURRENT SERVICE STATE: ", 23) || !strncmp(_text, "SERVICE ALERT: ", 15)) { - if (_text[0] == 'S'){ + if (_text[0] == 'S') { _logclass = LOGCLASS_ALERT; _type = ALERT_SERVICE; } @@ -210,7 +210,7 @@ inline bool LogEntry::handleStatusEntry() _host_name = next_token(&scan, ';'); _svc_desc = next_token(&scan, ';'); _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; + _comment = next_token(&scan, ';'); return true; } else if (!strncmp(_text, "SERVICE FLAPPING ALERT: ", 24)) @@ -224,7 +224,7 @@ inline bool LogEntry::handleStatusEntry() _host_name = next_token(&scan, ';'); _svc_desc = next_token(&scan, ';'); _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; + _comment = next_token(&scan, ';'); return true; } diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1cd0f17..dd0daa5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1705,8 +1705,11 @@ multisite_painters["log_message"] = { def paint_log_plugin_output(row): output = row["log_plugin_output"] + comment = row["log_comment"] if output: return "", format_plugin_output(output, row) + elif comment: + return "", comment else: log_type = row["log_type"] lst = row["log_state_type"] @@ -1729,7 +1732,7 @@ def paint_log_plugin_output(row): multisite_painters["log_plugin_output"] = { "title" : _("Log: output of check plugin"), "short" : _("Check output"), - "columns" : ["log_plugin_output", "log_type", "log_state_type" ], + "columns" : ["log_plugin_output", "log_type", "log_state_type", "log_comment" ], "paint" : paint_log_plugin_output, }

10 years

Check_MK Git: check_mk: Fix UNKNOWN - invalid output from check in automation

by Mathias Kettner

Module: check_mk Branch: master Commit: eafb080031dcbda1021f56422ce250661ad2855b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eafb080031dcbd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 14:17:57 2014 +0200 Fix UNKNOWN - invalid output from check in automation --- modules/automation.py | 4 +++- modules/check_mk_base.py | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index d2822d6..6dffd46 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -388,10 +388,12 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=F params = compute_check_parameters(hostname, ct, item, params) try: - result = convert_check_result(check_function(item, params, info)) + result = convert_check_result(check_function(item, params, info), check_uses_snmp(ct)) except MKCounterWrapped, e: result = (None, "WAITING - Counter based check, cannot be done offline") except Exception, e: + if opt_debug: + raise result = (3, "UNKNOWN - invalid output from agent or error in check implementation") if len(result) == 2: result = (result[0], result[1], []) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8ebd08e..da5a01f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1247,11 +1247,9 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: dont_submit = False - is_snmp = check_info[checkname].get("snmp_info") or \ - ( infotype in check_info and check_info[infotype].get("snmp_info")) # Call the actual check function - result = convert_check_result(check_function(item, params, info), is_snmp) + result = convert_check_result(check_function(item, params, info), check_uses_snmp(checkname)) # handle check implementations that do not yet support the

10 years

Check_MK Git: check_mk: innovaphone.include: Minor code cleanup; ibm_svc_enclosurestats, innovaphone_temp: Reworked to use include function

by Konstantin Büttner

Module: check_mk Branch: master Commit: d978847ba62acdb6bb19523a2c7952f812b19780 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d978847ba62acd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 12:27:21 2014 +0200 innovaphone.include: Minor code cleanup; ibm_svc_enclosurestats, innovaphone_temp: Reworked to use include function --- checks/ibm_svc_enclosurestats | 20 ++++---------------- checks/innovaphone.include | 14 +++++++------- checks/innovaphone_temp | 4 ++-- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/checks/ibm_svc_enclosurestats b/checks/ibm_svc_enclosurestats index 169065d..ffd29c0 100644 --- a/checks/ibm_svc_enclosurestats +++ b/checks/ibm_svc_enclosurestats @@ -52,35 +52,23 @@ ibm_svc_enclosurestats_temperature_default_levels = (35, 40) def inventory_ibm_svc_enclosurestats_temp(info): - inventory = [] for enclosure_id, stat_name, stat_current, stat_peak, stat_peak_time in info: if stat_name == "temp_c": - inventory.append( (enclosure_id, "ibm_svc_enclosurestats_temperature_default_levels") ) - return inventory + yield enclosure_id, "ibm_svc_enclosurestats_temperature_default_levels" def check_ibm_svc_enclosurestats_temp(item, params, info): - warn, crit = params - perfdata = [] - status = 0 - for enclosure_id, stat_name, stat_current, stat_peak, stat_peak_time in info: if enclosure_id == item and stat_name == "temp_c": - stat_current = int(stat_current) - if stat_current > crit: - status = 2 - elif stat_current > warn: - status = 1 - perfdata = [ ('temp', str(stat_current)+"C", warn, crit) ] - return status, "Enclosure %s temperature is %s°C" % (enclosure_id, stat_current), perfdata + return check_temperature(int(stat_current), params) - return 3, "Temperature for enclosure %s not found in agent output" % item check_info["ibm_svc_enclosurestats.temp"] = { "check_function" : check_ibm_svc_enclosurestats_temp, "inventory_function" : inventory_ibm_svc_enclosurestats_temp, "service_description" : "Temperature Enclosure %s", "has_perfdata" : True, - "group" : "hw_temperature", + "group" : "room_temperature", + "includes" : [ "temperature.include" ], } #. diff --git a/checks/innovaphone.include b/checks/innovaphone.include index 56cdf32..03beb2b 100644 --- a/checks/innovaphone.include +++ b/checks/innovaphone.include @@ -24,15 +24,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_innovaphone( params, info, unit="%", msg=False ): +def check_innovaphone(params, info, unit="%", msg=False): warn, crit = params - current = saveint(info[0][1]) - message = "Current: %d%s" % ( current, unit ) + current = int(info[0][1]) + message = "Current: %d%s" % (current, unit) if msg: - message += " "+msg - perf = [ ("usage", current, warn, crit, 0, 100 ) ] - if current > crit: + message += " " + msg + perf = [ ("usage", current, warn, crit, 0, 100) ] + if current >= crit: return 2, message, perf - if current > warn: + if current >= warn: return 1, message, perf return 0, message, perf diff --git a/checks/innovaphone_temp b/checks/innovaphone_temp index d9cd868..57ef671 100644 --- a/checks/innovaphone_temp +++ b/checks/innovaphone_temp @@ -30,7 +30,7 @@ def inventory_innovaphone_temp(info): return [ (None, "innovaphone_temp_default_levels") ] def check_innovaphone_temp(_no_item, params, info): - return check_innovaphone(params, info, "°C") + return check_temperature(int(info[0][1])), params) check_info["innovaphone_temp"] = { "check_function" : check_innovaphone_temp, @@ -38,6 +38,6 @@ check_info["innovaphone_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "group" : "hw_single_temperature", - "include" : ["innovaphone.include"] + "include" : [ "temperature.include" ], }

10 years

Check_MK Git: check_mk: innovaphone_channels: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 309d59513c980431339cdc891ce43e2a53f60ba8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=309d59513c9804… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 12:01:43 2014 +0200 innovaphone_channels: Minor code cleanup --- checks/innovaphone_channels | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/innovaphone_channels b/checks/innovaphone_channels index 532829f..c123b2b 100644 --- a/checks/innovaphone_channels +++ b/checks/innovaphone_channels @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_channels_default_levels = ( 75.0, 80.0 ) +innovaphone_channels_default_levels = (75.0, 80.0) def inventory_innovaphone_channels(info): return [ (x[0], 'innovaphone_channels_default_levels') for x in info \ @@ -35,11 +35,11 @@ def check_innovaphone_channels(item, params, info): if line[0] == item: link, physical = line[1:3] if link != 'Up' or physical != 'Up': - return 2, "Link: %s, Physical: %s" % ( link, physical ) + return 2, "Link: %s, Physical: %s" % (link, physical) idle, total = map(float, line[3:]) - perc_used = (idle/total) * 100 + perc_used = (idle / total) * 100 perc_free = 100 - perc_used - message = "(Used: %.0f, Free: %.0f, Total: %.0f)" % ( total - idle, idle, total ) + message = "(used: %.0f, free: %.0f, total: %.0f)" % (total - idle, idle, total) return check_innovaphone(params, [[None,perc_free]], '%', message ) return 3, "No Channel information found"

10 years

Check_MK Git: check_mk: #1121 FIX Rule based notifications formular: No longer raises Request-Uri-Too-Large errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 1f0723f5bb2573cf481ebc30eb7a3fe4867db16d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f0723f5bb2573… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 30 11:53:09 2014 +0200 #1121 FIX Rule based notifications formular: No longer raises Request-Uri-Too-Large errors If you wanted to create/edit a rule based notifcation and the formular itself had too much configurable host tags, contact groups, etc. there was a problem on sending this formular to the server. The data was sent with a GET request, which only allowed a limited url length. This formular is now sent with a POST request. --- .werks/1121 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1121 b/.werks/1121 new file mode 100644 index 0000000..0a7d70a --- /dev/null +++ b/.werks/1121 @@ -0,0 +1,12 @@ +Title: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1412070448 +Class: fix + +If you wanted to create/edit a rule based notifcation and the formular itself had too much +configurable host tags, contact groups, etc. there was a problem on sending this formular to the server. +The data was sent with a GET request, which only allowed a limited url length. +This formular is now sent with a POST request. diff --git a/ChangeLog b/ChangeLog index 60164b4..f837830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 1396 FIX: Fix default setting of Enable sounds in views... * 1109 FIX: WATO active checks: passwords no longer shown as plain text.... * 1119 FIX: WATO create rule: No longer raises an incorrect permission warning when creating a new rule... + * 1121 FIX: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors... Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 12088e8..ad72b8d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9105,7 +9105,7 @@ def mode_notification_rule(phase, profilemode): return "notifications" - html.begin_form("rule") + html.begin_form("rule", method = "POST") vs.render_input("rule", rule) vs.set_focus("rule") forms.end()

10 years

Check_MK Git: check_mk: fsc_temp: Reworked to use new include function

by Konstantin Büttner

Module: check_mk Branch: master Commit: fb24fe0f0607641fa3c502624d328341bfbee07f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb24fe0f060764… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 11:34:57 2014 +0200 fsc_temp: Reworked to use new include function --- checks/fsc_temp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/checks/fsc_temp b/checks/fsc_temp index ce4e788..274acc5 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -32,29 +32,21 @@ # 8: critical level def inventory_fsc_temp(info): - # Ignore non-connected sensors - return [ (line[0], None) for line in info if int(line[1]) < 500 ] + for line in info: + # Ignore non-connected sensors + if int(line[1]) < 500: + yield (line[0], None) -def check_fsc_temp(item, _no_params, info): - for name, current, warn, crit in info: - if name != item: continue - current = int(current) - warn = int(warn) - crit = int(crit) - - infotext = "%d C (levels at %d C / %d C)" % (current, warn, crit) - perfdata = [ ("temp", current, warn, crit, 0 ) ] - if current == -1 or current == 4294967295: - return(3, "Problem with sensor") - elif current >= crit and crit > 0: - return (2, "%s" % infotext, perfdata) - elif current >= warn and warn > 0: - return (1, "%s" % infotext, perfdata) - else: - return (0, "%s" % infotext, perfdata) +def check_fsc_temp(item, _no_params, info): + for name, rawtemp, warn, crit in info: + if name == item: + temp = int(rawtemp) + if temp == -1 or temp == 4294967295: + return 3, "Sensor or component missing" + else: + return check_temperature(temp, (int(warn), int(crit))) - return (3, "Sensor %s not found in SNMP data" % item) check_info['fsc_temp'] = { "inventory_function" : inventory_fsc_temp, @@ -64,4 +56,5 @@ check_info['fsc_temp'] = { "snmp_info" : ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.231.2.10.2.1.1.0"), "group" : "temperature_auto", + "includes" : [ "temperature.include" ], }

10 years

Check_MK Git: check_mk: Removed debugging output

by Konstantin Büttner

Module: check_mk Branch: master Commit: 64cc681e3316e2a72ad377c628bc7c09ca282aea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cc681e3316e2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 11:11:42 2014 +0200 Removed debugging output --- checks/temperature.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index 83857c2..3db199e 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -37,7 +37,7 @@ def check_temperature(temp, params): warn, crit = params perfdata = [ ("temp", temp, warn, crit) ] - infotext = "Temperature is %s °C HAGARBL" % tostring(temp) + infotext = "Temperature is %s °C" % tostring(temp) levelstext = " (warn/crit at %s/%s °C)" % (tostring(warn), tostring(crit)) if temp >= crit:

10 years

Check_MK Git: check_mk: oracle_dataguard_stats: Removed print statement

by Mathias Kettner

Module: check_mk Branch: master Commit: f4af627e4db16a5a89d1d4b6691817ea5c65249b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4af627e4db16a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 10:03:50 2014 +0200 oracle_dataguard_stats: Removed print statement --- checks/oracle_dataguard_stats | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index e040330..61cd167 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -93,16 +93,13 @@ def check_oracle_dataguard_stats(item, params, info): if crit == warn and crit == -1: - state = max(0, state) + pass elif seconds >= crit: - print "%s %d %d %d" % (parameter, warn, crit, seconds) infotext += '(!!) ' state = 2 elif seconds >= warn: infotext += '(!) ' state = max(1, state) - else: - state = max(0, state) perfdata.append([parameter.replace(' ', '_'), seconds, warn, crit])

10 years

Check_MK Git: check_mk: #1409 Extended Check_MK-API: check function may return None

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cf6c82df14cfe477b663a4b99a3334b26c25081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf6c82df14cfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 08:26:00 2014 +0200 #1409 Extended Check_MK-API: check function may return None A check function may now return <tt>None</tt> (or simply end without returning anything). This will no longer create an exception but return state <tt>UNKNOWN</tt> and - depending on the type of the check - one of the following outputs: <tt>Item not found in SNMP data</tt> <tt>Item not found in agent output</tt> This means that for the typical check that loops through the agent output looking for its item now does not need to manually do a C+: return 3, "Something not found in agent output" C-: anymore. This is now the default case. This has several advantages: <ul> <li>You save some code in the check implementation.</li> <li>The output of the various checks is unified.</li> <li>A future Check_MK version can easily have a rule for changing the state in such cases from UNKNOWN to WARN or CRIT.</li> </ul> --- .werks/1409 | 32 ++++++++++++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 21 +++++++++++++++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/.werks/1409 b/.werks/1409 new file mode 100644 index 0000000..d6ed902 --- /dev/null +++ b/.werks/1409 @@ -0,0 +1,32 @@ +Title: Extended Check_MK-API: check function may return None +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1412058117 +Class: feature + +A check function may now return <tt>None</tt> (or simply end without +returning anything). This will no longer create an exception but return +state <tt>UNKNOWN</tt> and - depending on the type of the check - +one of the following outputs: + +<tt>Item not found in SNMP data</tt> + +<tt>Item not found in agent output</tt> + +This means that for the typical check that loops through the agent +output looking for its item now does not need to manually do a + +C+: + return 3, "Something not found in agent output" +C-: + +anymore. This is now the default case. This has several advantages: + +<ul> +<li>You save some code in the check implementation.</li> +<li>The output of the various checks is unified.</li> +<li>A future Check_MK version can easily have a rule for changing the state +in such cases from UNKNOWN to WARN or CRIT.</li> +</ul> diff --git a/ChangeLog b/ChangeLog index 60164b4..243060e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ NOTE: Please refer to the migration notes! * 1117 agent_vsphere: now able to query license information from esx system... * 1118 bluecat_dns, bluecat_dhcp: no able to run as clustered checks... + * 1409 Extended Check_MK-API: check function may return None... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dfa1d03..8ebd08e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1131,15 +1131,23 @@ def convert_check_info(): snmp_scan_functions[basename] = info["snmp_scan_function"] -def convert_check_result(result): +def convert_check_result(result, is_snmp): if type(result) == tuple: return result + elif result == None: + return item_not_found(is_snmp) + # The check function may either return a tuple (pair or triple) or an iterator # (using yield). The latter one is new since version 1.2.5i5. else: # We assume an iterator, convert to tuple subresults = list(result) + # Empty list? Check returned nothing + if not subresults: + return item_not_found(is_snmp) + + # Simple check with no separate subchecks (yield wouldn't have been neccessary here!) if len(subresults) == 1: return subresults[0] @@ -1166,6 +1174,13 @@ def convert_check_result(result): return status, ", ".join(infotexts), perfdata +def item_not_found(is_snmp): + if is_snmp: + return 3, "Item not found in SNMP data" + else: + return 3, "Item not found in agent output" + + # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): @@ -1232,9 +1247,11 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: dont_submit = False + is_snmp = check_info[checkname].get("snmp_info") or \ + ( infotype in check_info and check_info[infotype].get("snmp_info")) # Call the actual check function - result = convert_check_result(check_function(item, params, info)) + result = convert_check_result(check_function(item, params, info), is_snmp) # handle check implementations that do not yet support the

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits