Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Some internal code change needed for reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: 8079cb0e50a37d8272eb8954b1883c6b5a43a031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8079cb0e50a37d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 17 18:47:20 2015 +0100 Some internal code change needed for reporting --- web/plugins/views/availability.py | 65 +++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 8c99a98..0bdf1ac 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -850,7 +850,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode, fetch= if timeline: if not fetch: # Timeline does not support fetch render_timeline(timeline_rows, from_time, until_time, total_duration, - timeline, range_title, render_number, what, timewarpcode, avoptions, style="standalone") + timeline, range_title, render_number, what, timewarpcode, avoptions, False, style="standalone") else: fetch_data["table"] = render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number, fetch) @@ -890,10 +890,14 @@ def render_number_function(avoptions): # style is either inline (just the timeline bar) or "standalone" (the complete page) def render_timeline(timeline_rows, from_time, until_time, considered_duration, - timeline, range_title, render_number, what, timewarpcode, avoptions, style): + timeline, range_title, render_number, what, timewarpcode, avoptions, fetch, style): + if not timeline_rows: - html.write('<div class=info>%s</div>' % _("No information available")) - return + if fetch: + return [] + else: + html.write('<div class=info>%s</div>' % _("No information available")) + return # Timeformat: show date only if the displayed time range spans over # more than one day. @@ -919,25 +923,30 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, # Make sure that each cell is visible, if possible min_percentage = min(100.0 / len(timeline_rows), style == "inline" and 0.0 or 0.5) rest_percentage = 100 - len(timeline_rows) * min_percentage - html.write('<div class="timelinerange %s">' % style) + if not fetch: + html.write('<div class="timelinerange %s">' % style) if style == "standalone": html.write('<div class=from>%s</div><div class=until>%s</div></div>' % ( render_date(from_time), render_date(until_time))) - html.write('<table class="timeline %s">' % style) - html.write('<tr class=timeline>') + if not fetch: + html.write('<table class="timeline %s">' % style) + html.write('<tr class=timeline>') chaos_begin = None chaos_end = None chaos_count = 0 chaos_width = 0 def output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width): - title = _("%d chaotic state changes from %s until %s (%s)") % ( - chaos_count, - render_date(chaos_begin), render_date(chaos_end), - render_number(chaos_end - chaos_begin, considered_duration)) - html.write('<td style="width: %.3f%%" title="%s" class="chaos"></td>' % ( - max(0.2, chaos_width), html.attrencode(title))) + if fetch: + html.write("|chaos:%s" % chaos_width) + else: + title = _("%d chaotic state changes from %s until %s (%s)") % ( + chaos_count, + render_date(chaos_begin), render_date(chaos_end), + render_number(chaos_end - chaos_begin, considered_duration)) + html.write('<td style="width: %.3f%%" title="%s" class="chaos"></td>' % ( + max(0.2, chaos_width), html.attrencode(title))) for row_nr, (row, state_id) in enumerate(timeline_rows): for sid, css, sname, help in availability_columns: @@ -946,7 +955,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, render_date(row["from"]), render_date(row["until"]), render_number(row["duration"], considered_duration), help and help or sname) - if row["log_output"]: + if "log_output" in row and row["log_output"]: title += " - " + row["log_output"] width = rest_percentage * row["duration"] / considered_duration @@ -971,15 +980,21 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, chaos_width = 0 width += min_percentage - html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" ' - 'style="width: %.3f%%" title="%s" class="%s"></td>' % ( - row_nr, row_nr, width, html.attrencode(title), css)) + if fetch: + html.write("|%s:%s" % (css, width)) + else: + html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" ' + 'style="width: %.3f%%" title="%s" class="%s"></td>' % ( + row_nr, row_nr, width, html.attrencode(title), css)) + if chaos_count > 1: output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width) - html.write('</tr></table>') + if not fetch: + html.write('</tr></table>') if style == "inline": - render_timeline_choords(from_time, until_time, width=500) + if not fetch: + render_timeline_choords(from_time, until_time, width=500) return # Render timewarped BI aggregate (might be empty) @@ -1381,11 +1396,13 @@ def render_availability_group(group_title, range_title, group_id, availability, else: availability_columns = host_availability_columns - if show_timeline and not no_html: + if show_timeline: table.cell(_("Timeline"), css="timeline") - html.write('<a href="%s">' % timeline_url) - render_timeline(timeline_rows, from_time, until_time, total_duration, (site, host, service), range_title, render_number, what, "", avoptions, style="inline") - html.write('</a>') + if not no_html: + html.write('<a href="%s">' % timeline_url) + render_timeline(timeline_rows, from_time, until_time, total_duration, (site, host, service), range_title, render_number, what, "", avoptions, fetch, style="inline") + if not no_html: + html.write('</a>') for sid, css, sname, help in availability_columns: if not cell_active(sid): @@ -1441,7 +1458,7 @@ def render_availability_group(group_title, range_title, group_id, availability, if what == "service": table.cell("", "") - if show_timeline and not no_html: + if show_timeline and not do_csv: table.cell("") for sid, css, sname, help in availability_columns:

9 years, 7 months

Check_MK Git: check_mk: htmllib: fix configurable feedback address

by Mathias Kettner

Module: check_mk Branch: master Commit: 741e08392974aeb6a11fa1fe66e8d6df686795ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=741e08392974ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 17 18:47:00 2015 +0100 htmllib: fix configurable feedback address config module is not (and will never be) available in htmllib.py --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 12f9bc8..689519d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -966,7 +966,7 @@ class html: self.begin_context_buttons() mailto_url = self.makeuri_contextless([ ("subject", "Check_MK GUI Crash Report - " + defaults.check_mk_version), - ("body", mail_body)], filename="mailto:" + config.crash_report_target) + ("body", mail_body)], filename="mailto:feedback@check-mk.org") self.context_button(_("Submit Report"), mailto_url, "email") self.end_context_buttons()

9 years, 7 months

Check_MK Git: check_mk: cmciii.temp: Moved function parse_temp out of global scope.

by Konstantin Büttner

Module: check_mk Branch: master Commit: a771ca6611f33512bf04e56aadb5e018953839ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a771ca6611f335… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 17 16:40:53 2015 +0100 cmciii.temp: Moved function parse_temp out of global scope. --- checks/cmciii | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/checks/cmciii b/checks/cmciii index 6e2bcaf..39a5050 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -156,8 +156,9 @@ # 'Status': 'Off', # 'Value': '0'}, +# TODO: re.blub-Methoden ersetzen. Siehe Guidelines. -def parse_cmciii_inputs(info): +def parse_cmciii_inputs(info): # Caveat: info ist hier nicht SNMP-info, sondern SNMP-info[0] parsed = {} for endoid, varname, value in info: unit, eid = endoid.split(".") # "1.8" -> "1" @@ -166,7 +167,8 @@ def parse_cmciii_inputs(info): parsed.setdefault(item, {})[key] = value return parsed -def parse_units(info): +# TODO: Umbenennen something cmciii +def parse_units(info): # Caveat: info ist hier nicht SNMP-info, sondern SNMP-info[1] units = [] num = 0 for unit_type, descname, state in info: @@ -179,6 +181,7 @@ def parse_units(info): units.append((unit_type, descname, state)) return units +# TODO: Umbenennen something cmciii def get_unit_number(units,unit_name): namelist = map(list, zip(*units))[1] if unit_name in namelist: @@ -458,16 +461,6 @@ def inventory_cmciii_temp(info): inventory.append( ("%s %s" % (unit_name, item_name), None) ) return inventory -def parse_temp(val): - if re.search(" B0 ", val): - # is encoded string - val = re.sub(" ","", val).decode("hex") - val, t_unit = val.split(" ", 1) - # omit special characters in unit, because they - # cause problems in rrdtools - t_unit = re.sub("[^\w]","", t_unit) - return val, t_unit - def check_cmciii_temp(item, params, info): unit_name, item_name = item.split(" ", 1) parsed = parse_cmciii_inputs(info[0]) @@ -480,6 +473,16 @@ def check_cmciii_temp(item, params, info): status = entry.get('Status') offset = entry.get('Offset') + def parse_temp(val): + if re.search(" B0 ", val): + # is encoded string + val = re.sub(" ","", val).decode("hex") + val, t_unit = val.split(" ", 1) + # omit special characters in unit, because they + # cause problems in rrdtools + t_unit = re.sub("[^\w]","", t_unit) + return val, t_unit + value, t_unit = parse_temp(entry.get('Value')) highalarm = parse_temp(entry.get('SetPtHighAlarm'))[0] highwarning = parse_temp(entry.get('SetPtHighWarning'))[0]

9 years, 7 months

Check_MK Git: check_mk: Fixed TypeError in check ibm_svc_host

by Sven Rueß

Module: check_mk Branch: master Commit: d50366c001545b03444a709254ff798f8a359806 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d50366c001545b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Feb 17 14:49:14 2015 +0100 Fixed TypeError in check ibm_svc_host --- checks/ibm_svc_host | 8 +++++++- web/plugins/wato/check_parameters.py | 17 +++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/checks/ibm_svc_host b/checks/ibm_svc_host index 4f3cb5b..01121f4 100644 --- a/checks/ibm_svc_host +++ b/checks/ibm_svc_host @@ -32,7 +32,7 @@ # 3:host106:2:2:online def inventory_ibm_svc_host(info): - return [(None, None)] + return [(None, {})] def check_ibm_svc_host(item, params, info): degraded = 0 @@ -41,6 +41,11 @@ def check_ibm_svc_host(item, params, info): inactive = 0 other = 0 + if params == None: + # Old inventory rule until version 1.2.7 + # params were None instead of empty dictionary + params = { 'always_ok': False } + for line in info: if line[4] == 'degraded': degraded += 1 @@ -102,3 +107,4 @@ check_info["ibm_svc_host"] = { "has_perfdata" : True, "group" : "ibm_svc_host", } + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 44a8e60..8149482 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4651,6 +4651,11 @@ register_check_parameters( ) def transform_ibm_svc_host(params): + if params == None: + # Old inventory rule until version 1.2.7 + # params were None instead of emtpy dictionary + params = { 'always_ok': False } + if 'always_ok' in params: if params['always_ok'] == False: params = { 'degraded_hosts': (1,1), 'offline_hosts': (1,1), 'other_hosts': (1,1) } @@ -4661,13 +4666,13 @@ def transform_ibm_svc_host(params): register_check_parameters( subgroup_storage, "ibm_svc_host", - _("IBM SVC: Options for SVC Hosts Check "), + _("IBM SVC: Options for SVC Hosts Check"), Transform( Dictionary( elements = [ ( "active_hosts", Tuple( - title = _("Absolute amount of active hosts"), + title = _("Count of active hosts"), elements = [ Integer(title = _("Warning at or below"), minvalue = 0, unit = _("active hosts")), Integer(title = _("Critical at or below"), minvalue = 0, unit = _("active hosts")), @@ -4676,7 +4681,7 @@ register_check_parameters( ), ( "inactive_hosts", Tuple( - title = _("Absolute amount of inactive hosts"), + title = _("Count of inactive hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("inactive hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("inactive hosts")), @@ -4685,7 +4690,7 @@ register_check_parameters( ), ( "degraded_hosts", Tuple( - title = _("Absolute amount of degraded hosts"), + title = _("Count of degraded hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("degraded hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("degraded hosts")), @@ -4694,7 +4699,7 @@ register_check_parameters( ), ( "offline_hosts", Tuple( - title = _("Absolute amount of offline hosts"), + title = _("Count of offline hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("offline hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("offline hosts")), @@ -4703,7 +4708,7 @@ register_check_parameters( ), ( "other_hosts", Tuple( - title = _("Absolute amount of other hosts"), + title = _("Count of other hosts"), elements = [ Integer(title = _("Warning at or above"), minvalue = 0, unit = _("other hosts")), Integer(title = _("Critical at or above"), minvalue = 0, unit = _("other hosts")),

9 years, 7 months

Check_MK Git: check_mk: mk_oracle: Fixed folding comments

by Mathias Kettner

Module: check_mk Branch: master Commit: 327310f741e97666b856f6029d51b74b57a0f0e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=327310f741e976… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 17 12:18:24 2015 +0100 mk_oracle: Fixed folding comments --- agents/plugins/mk_oracle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index dd57e65..cada4a2 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -631,6 +631,7 @@ sql_asm_diskgroup() fi } +#. # .--oraenv--------------------------------------------------------------. # | | # | ___ _ __ __ _ ___ _ ____ __ | @@ -708,7 +709,7 @@ function get_oraversion () { fi } -# +#. # .--Functions-----------------------------------------------------------. # | _____ _ _ | # | | ___| _ _ __ ___| |_(_) ___ _ __ ___ |

9 years, 7 months

Check_MK Git: check_mk: Fixed some English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 22c67ad479a56aadf2267df0cd6b3a5a4675caef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22c67ad479a56a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 17 10:34:51 2015 +0100 Fixed some English texts --- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 3fffbd5..6ab4429 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -974,7 +974,7 @@ register_configvar(group, "password_policy", Dictionary( title = _('htpasswd: Password Policy'), - help = _('You can define some rules to which each user password aher. By default ' + help = _('You can define some rules to which each user password ahers. By default ' 'all passwords are accepted, even ones which are made of only a single character, ' 'which is obviously a bad idea. Using this option you can enforce your users ' 'to choose more secure passwords.'), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c97454c..44a8e60 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2034,7 +2034,7 @@ register_check_parameters( ), TextAscii( title = _("Explicit Queue Names"), - help = _("Specify queue names that the rule should apply"), + help = _("Specify queue names that the rule should apply to"), ), "first" ) @@ -3841,7 +3841,7 @@ register_check_parameters( )),]), TextAscii( title = _("Scheduler Job Name"), - help = _("Here you can set explicit Scheduler-Jobs by defining them via SID, Job-Owner " + help = _("Here you can set explicit Scheduler-Jobs by defining them via SID, Job-Owner " "and Job-Name, separated by a dot, for example <b>TUX12C.SYS.PURGE_LOG</b>"), regex = '.+\..+', allow_empty = False), @@ -4847,7 +4847,7 @@ register_rule(group + '/' + subgroup_networking, )), ("include_items", ListOfStrings( title = _("Restrict interface items"), - help = _("Only interface with this item names are put into this group."), + help = _("Only interface with these item names are put into this group."), )), ("single", Checkbox( title = _("Group separately"), @@ -5940,8 +5940,8 @@ register_check_parameters( Tuple( title = _("Levels on trends in degrees Celsius per time range"), elements = [ - Integer(title = _("Warning at"), unit = _("C / range"), default_value = 5), - Integer(title = _("Critical at"), unit = _("C / range"), default_value = 10) + Integer(title = _("Warning at"), unit = _(u"°C / range"), default_value = 5), + Integer(title = _("Critical at"), unit = _(u"°C / range"), default_value = 10) ] ) ),

9 years, 7 months

Check_MK Git: check_mk: #1944 FIX hr_mem: no longer reports incorrect memory values when cached memory values are broken

by Andreas Boesl

Module: check_mk Branch: master Commit: 6685a043813140fd7b36b1c3d36edf739dc3c4eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6685a043813140… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 17 09:54:43 2015 +0100 #1944 FIX hr_mem: no longer reports incorrect memory values when cached memory values are broken Some devices reported negative used cached values. As a result the cached memory was added to to the total memory - instead of substracted. This has been fixed. If the value for the used cache seems to be broken, the check uses the total cache value instead. This new behaviour also applies to the memory buffers data. --- .werks/1944 | 13 +++++++++++++ ChangeLog | 1 + checks/hr_mem | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1944 b/.werks/1944 new file mode 100644 index 0000000..e365c49 --- /dev/null +++ b/.werks/1944 @@ -0,0 +1,13 @@ +Title: hr_mem: no longer reports incorrect memory values when cached memory values are broken +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424162791 +Class: fix + +Some devices reported negative used cached values. As a result the +cached memory was added to to the total memory - instead of substracted. +This has been fixed. If the value for the used cache seems to be broken, +the check uses the total cache value instead. +This new behaviour also applies to the memory buffers data. diff --git a/ChangeLog b/ChangeLog index d6d1576..56da789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 1941 FIX: df.include: fixed exception on emtpy filesystems... * 1942 FIX: netapp_api_volumes: fixed exception when performance data generation was enabled * 1993 FIX: solaris_multipath: Fix detection of expected number of paths + * 1944 FIX: hr_mem: no longer reports incorrect memory values when cached memory values are broken... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/hr_mem b/checks/hr_mem index 0942086..e3ba95e 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -60,7 +60,10 @@ def check_hr_mem(_no_item, params, info): cached_mb = 0 for hrtype, hrdescr, hrunits, hrsize, hrused in info: if hrdescr in [ "Cached memory", "Memory buffers" ]: - cached_mb += saveint(hrused) * saveint(hrunits) / 1048576.0 + hr_mem = saveint(hrused) + if hr_mem < 0: # some devices report negative used cache values... + hr_mem = saveint(hrsize) + cached_mb += hr_mem * saveint(hrunits) / 1048576.0 totalram_mb, ramused_mb = usage.get(".1.3.6.1.2.1.25.2.1.2", (0,0)) ramused_mb -= cached_mb

9 years, 7 months

Check_MK Git: check_mk: New config variable crash_report_target for target email of crash reports

by Mathias Kettner

Module: check_mk Branch: master Commit: 0cc98469ef90c884fe8ecb1869a821647260a8af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc98469ef90c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 16 16:42:15 2015 +0100 New config variable crash_report_target for target email of crash reports --- web/htdocs/crashed_check.py | 4 ++-- web/htdocs/htmllib.py | 2 +- web/plugins/config/builtin.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py index f3bf423..76ddcd4 100644 --- a/web/htdocs/crashed_check.py +++ b/web/htdocs/crashed_check.py @@ -26,7 +26,7 @@ import subprocess from lib import * -import table, defaults +import table, defaults, config def fetch_file_from_tar(tardata, filename): p = subprocess.Popen(['tar', 'xzf', '-', '--to-stdout', filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE) @@ -86,7 +86,7 @@ def page_crashed_check(): html.begin_context_buttons() mailto_url = html.makeuri([("subject", "Check_MK Crash Report - " + defaults.check_mk_version), - ("body", body)], filename="mailto:feedback@check-mk.org") + ("body", body)], filename="mailto:" + config.crash_report_target) html.context_button(_("Submit Report"), mailto_url, "email") html.end_context_buttons() diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 689519d..12f9bc8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -966,7 +966,7 @@ class html: self.begin_context_buttons() mailto_url = self.makeuri_contextless([ ("subject", "Check_MK GUI Crash Report - " + defaults.check_mk_version), - ("body", mail_body)], filename="mailto:feedback@check-mk.org") + ("body", mail_body)], filename="mailto:" + config.crash_report_target) self.context_button(_("Submit Report"), mailto_url, "email") self.end_context_buttons() diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 11f4b2a..01cb9f2 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -210,6 +210,10 @@ escape_plugin_output = True # Virtual host trees for the "Virtual Host Trees" snapin virtual_host_trees = [] +# Target email address for "Crashed Check" page +crash_report_target = "feedback(a)check-mk.org" + + # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) # | | | / __|/ _ \ '__| | | | _ \

9 years, 7 months

Check_MK Git: check_mk: #1993 FIX solaris_multipath: Fix detection of expected number of paths

by Mathias Kettner

Module: check_mk Branch: master Commit: 6eae8c038a8e472f4e51651b9982472a3bc599a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eae8c038a8e47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 16 13:27:56 2015 +0100 #1993 FIX solaris_multipath: Fix detection of expected number of paths --- .werks/1993 | 10 ++++++++++ ChangeLog | 1 + checks/solaris_multipath | 32 ++++++++++++++++++++------------ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.werks/1993 b/.werks/1993 new file mode 100644 index 0000000..61af534 --- /dev/null +++ b/.werks/1993 @@ -0,0 +1,10 @@ +Title: solaris_multipath: Fix detection of expected number of paths +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424089642 + + diff --git a/ChangeLog b/ChangeLog index de03927..d6d1576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -158,6 +158,7 @@ * 1940 FIX: ps: Fixed a rare crash on malformed agent output... * 1941 FIX: df.include: fixed exception on emtpy filesystems... * 1942 FIX: netapp_api_volumes: fixed exception when performance data generation was enabled + * 1993 FIX: solaris_multipath: Fix detection of expected number of paths Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/solaris_multipath b/checks/solaris_multipath index ddca400..55d8afb 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -28,33 +28,41 @@ # <<<solaris_multipath>>> # /dev/rdsk/c4t600601608CB02A00DCFD2EEB19A0E111d0s2 4 4 +# Note: the number of total paths is not correct. After maintainance +# they is too high. Also in case of broken paths the number of total +# paths sometimes changes. So we just use that for informational +# output. The discovery remembers the number of operational paths +# and we check agains that later. + def inventory_solaris_multipath(info): - for device, total, ok in info: + for device, total, operational in info: item = device.split('/')[-1] - yield item, total + yield item, int(operational) def check_solaris_multipath(item, params, info): - for device, total, ok in info: + for device, total, operational in info: if item == device.split('/')[-1]: - ok = int(ok) - total = int(total) + operational = int(operational) + total = int(total) + + infotext = "%d paths operational, %d paths total" % (operational, total) if not params: state = 1 - infotext = "%d paths up, but total paths unknown, redo service discovery" % ok + infotext += ", expected paths unknown, please redo service discovery" else: - itotal = int(params) - infotext = "%d of %d paths up" % (ok, itotal) - if total > itotal: + expected = int(params) # should be int, just for legacy reasons + if operational > expected: state = 1 - infotext = "%d paths up, but total paths increased to %d, redo service discovery" % (ok, total) - elif itotal == ok: + elif expected == operational: state = 0 - elif itotal >= ok * 2: # less than half of paths ok + elif expected >= operational * 2: # less than half of paths operational state = 2 else: state = 1 + if state: + infotext += ", %d paths expected to be operational" % expected return state, infotext

9 years, 7 months

Check_MK Git: check_mk: checkpoint_connections, checkpoint_packets: Added Support for a few more devices Types

by Bastian Kuhn

Module: check_mk Branch: master Commit: 87b339d0aeaf1c69ab7cddce4f7da3694039cca5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b339d0aeaf1c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 16 11:58:43 2015 +0100 checkpoint_connections,checkpoint_packets: Added Support for a few more devices Types --- checks/checkpoint_connections | 3 ++- checks/checkpoint_packets | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/checkpoint_connections b/checks/checkpoint_connections index 1292385..3aa8ae1 100644 --- a/checks/checkpoint_connections +++ b/checks/checkpoint_connections @@ -55,7 +55,8 @@ check_info["checkpoint_connections"] = { "has_perfdata" : True, "group" : "checkpoint_connections", # detect a checkpoint kernel - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") \ + "snmp_scan_function" : lambda oid: (oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or \ + "IPSO" in oid(".1.3.6.1.2.1.1.1.0")) \ and oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall'), # checkpoint.products.fw.fwPolicyStat.fwNumConn "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1.25", [ 3 ]), diff --git a/checks/checkpoint_packets b/checks/checkpoint_packets index 451d75d..1578ed6 100644 --- a/checks/checkpoint_packets +++ b/checks/checkpoint_packets @@ -72,7 +72,8 @@ check_info["checkpoint_packets"] = { "group" : "checkpoint_packets", "default_levels_variable" : "checkpoint_packets_default_levels", # detect a checkpoint kernel - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp")\ + "snmp_scan_function" : lambda oid: (oid(".1.3.6.1.2.1.1.1.0").split(" ")[2].endswith("cp") or\ + "IPSO" in oid(".1.3.6.1.2.1.1.1.0")) \ and oid(".1.3.6.1.4.1.2620.1.1.21.0").lower().startswith('firewall'), # checkpoint.products.fw.fwPolicyStat.fwNumConn "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1",

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015