Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1891 apc_symmetra: Now supports setting levels on remaining battery time

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6176f9c072b8e339e12ea483ae30db73131fcc67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6176f9c072b8e3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 26 12:04:37 2015 +0100 #1891 apc_symmetra: Now supports setting levels on remaining battery time The WATO rule and check have been extended to allow setting levels on remaining battery time. Doing so is optional. --- .werks/1891 | 10 ++++++++++ ChangeLog | 1 + checkman/apc_symmetra | 2 +- checks/apc_symmetra | 4 ++-- web/plugins/wato/check_parameters.py | 8 ++++---- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.werks/1891 b/.werks/1891 new file mode 100644 index 0000000..407de02 --- /dev/null +++ b/.werks/1891 @@ -0,0 +1,10 @@ +Title: apc_symmetra: Now supports setting levels on remaining battery time +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424948572 +Class: feature + +The WATO rule and check have been extended to allow setting levels on remaining +battery time. Doing so is optional. diff --git a/ChangeLog b/ChangeLog index 6f9d88e..3bc4700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 2036 docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter) * 1947 agent_ucs_bladecenter: Monitors UCS Bladecenter via Web-API... * 2039 mk_logwatch: new per-logfile-options maxfilesize and maxlinesize... + * 1891 apc_symmetra: Now supports setting levels on remaining battery time... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index 89d8a44..d8ea32f 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -80,7 +80,7 @@ parameters(dict): parameters is a dictionary with the following keys: critical level for the battery capacity in the post-calibration phase in precent. {"additional_time_span"} is a time span the post-calibration phase is extended past the day of the calibration in minutes. - {"battime"}: A tuple (warn(int), crit(int)) of levels for the remaining battery time in minutes. + {"battime"}: A tuple (warn(int), crit(int)) of levels for the remaining battery time in seconds. This key is optional. parameters(tuple): The old format of a tuple of 4 values is also still supported, containing what diff --git a/checks/apc_symmetra b/checks/apc_symmetra index b0d9021..78d3986 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -202,10 +202,10 @@ def check_apc(item, params, info): label = "" if params.get('battime'): battime_warn, battime_crit = params['battime'] - if int(RunTimeRemaining) / 60 <= battime_crit: + if int(RunTimeRemaining) <= battime_crit: battime_state = 2 label = "(!!)" - elif int(RunTimeRemaining) / 60 <= battime_warn: + elif int(RunTimeRemaining) <= battime_warn: battime_state = 1 label = "(!)" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 066b889..f3e5f49 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6159,17 +6159,17 @@ register_check_parameters( Tuple( title = _("Time left on battery"), elements = [ - Integer( + Age( title = _("Warning at"), help = _("Time left on Battery at and below which a warning state is triggered"), - unit = _("min"), default_value = 0, + display = [ "hours", "minutes" ] ), - Integer( + Age( title = _("Critical at"), help = _("Time Left on Battery at and below which a critical state is triggered"), - unit = _("min"), default_value = 0, + display = [ "hours", "minutes" ] ), ], ),

9 years, 7 months

Check_MK Git: check_mk: apc_symmetra: Now supports setting levels on remaining battery time

by Konstantin Büttner

Module: check_mk Branch: master Commit: 548e4992486dce6d3f6aa70c81e8745a779fcbac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=548e4992486dce… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 26 11:46:42 2015 +0100 apc_symmetra: Now supports setting levels on remaining battery time --- checkman/apc_symmetra | 5 ++++- checks/apc_symmetra | 13 ++++++++++++- web/plugins/wato/check_parameters.py | 22 ++++++++++++++++++++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index a05c1d6..89d8a44 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -71,7 +71,7 @@ inventory: and if the name of this OID is known to the test. If this is true the system is inventorized. [parameters] -parameters(dict): parameters is a dictionary with two keys +parameters(dict): parameters is a dictionary with the following keys: {"levels"}: a tuple of critical levels for battery capacity, temperature, current and output voltage. The numbers are integers. @@ -80,6 +80,9 @@ parameters(dict): parameters is a dictionary with two keys critical level for the battery capacity in the post-calibration phase in precent. {"additional_time_span"} is a time span the post-calibration phase is extended past the day of the calibration in minutes. + {"battime"}: A tuple (warn(int), crit(int)) of levels for the remaining battery time in minutes. + This key is optional. + parameters(tuple): The old format of a tuple of 4 values is also still supported, containing what is found in the key {"levels"} in the dictionary. diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 4efbd42..b0d9021 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -196,9 +196,20 @@ def check_apc(item, params, info): # 9. run time remaining # RunTimeRemaining formatiert == "26:00.00" + battime_state = 0 hrs = int(RunTimeRemaining) / 3600 mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) - single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), + label = "" + if params.get('battime'): + battime_warn, battime_crit = params['battime'] + if int(RunTimeRemaining) / 60 <= battime_crit: + battime_state = 2 + label = "(!!)" + elif int(RunTimeRemaining) / 60 <= battime_warn: + battime_state = 1 + label = "(!)" + + single_states.append( (battime_state, "run time remaining: %02d:%02d:%02d%s" % (hrs, mins, secs, label), ("runtime", RunTimeRemaining/60)) ) # 10. Adv Output load (load in percent) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8dfa121..1e895f2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6155,8 +6155,26 @@ register_check_parameters( ], optional_keys = False, )), - ], - optional_keys = ['post_calibration_levels', 'output_load'], + ("battime", + Tuple( + title = _("Time left on battery"), + elements = [ + Integer( + title = _("Warning at"), + help = _("Time left on Battery at and below which a warning state is triggered"), + unit = _("min"), + default_value = 0, + ), + Integer( + title = _("Critical at"), + help = _("Time Left on Battery at and below which a critical state is triggered"), + unit = _("min"), + default_value = 0, + ), + ], + ), + )], + optional_keys = ['post_calibration_levels', 'output_load', 'battime'], ), forth = apc_convert_from_tuple ),

9 years, 7 months

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: b5fc4c5f71652d67b3bff58b925b7dac8b6d42c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5fc4c5f71652d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 26 11:39:56 2015 +0100 Conflicts: ChangeLog checks/if64 --- .werks/2021 | 10 ++++++++++ ChangeLog | 1 + checks/if64 | 2 ++ checks/if_lancom | 4 +++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2021 b/.werks/2021 new file mode 100644 index 0000000..6266c0e --- /dev/null +++ b/.werks/2021 @@ -0,0 +1,10 @@ +Title: if_lancom: Also used for checking ELSA/T-Systems branded devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424947137 + + diff --git a/ChangeLog b/ChangeLog index 7eee12c..6f9d88e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,6 +199,7 @@ * 2019 FIX: heartbeat_crm: Be compatible to yet unknown crm_mon output format * 2048 FIX: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves NOTE: Please refer to the migration notes! + * 2021 FIX: if_lancom: Also used for checking ELSA/T-Systems branded devices Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/if64 b/checks/if64 index e8a43cb..fb1a431 100644 --- a/checks/if64 +++ b/checks/if64 @@ -44,6 +44,8 @@ def check_if64(item, params, info): def if64_scan_function(oid): ignored_strings = [ "LANCOM", + "ELSA", + "T-Systems", "Brocade VDX Switch", ] for string in ignored_strings: diff --git a/checks/if_lancom b/checks/if_lancom index f29b27b..97dc890 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -94,7 +94,9 @@ check_info["if_lancom"] = { ], # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 'snmp_scan_function': \ - lambda oid: "LANCOM" in oid(".1.3.6.1.2.1.1.1.0") and \ + lambda oid: ("LANCOM" in oid(".1.3.6.1.2.1.1.1.0") or \ + "ELSA" in oid(".1.3.6.1.2.1.1.1.0") or \ + "T-Systems" in oid(".1.3.6.1.2.1.1.1.0")) and \ (not if64_disabled(g_hostname)) and \ oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, 'group': 'if',

9 years, 7 months

Check_MK Git: check_mk: #2020 FIX Fixed non working FOREACH_CHILD mechanism for BI rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 7cef5ea1f49486da951caf61217fc3cff301d61d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cef5ea1f49486… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 26 11:38:24 2015 +0100 #2020 FIX Fixed non working FOREACH_CHILD mechanism for BI rules --- .werks/2020 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2020 b/.werks/2020 new file mode 100644 index 0000000..57b6a0f --- /dev/null +++ b/.werks/2020 @@ -0,0 +1,10 @@ +Title: Fixed non working FOREACH_CHILD mechanism for BI rules +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424946934 + + diff --git a/ChangeLog b/ChangeLog index 95f40b2..7eee12c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -293,6 +293,7 @@ BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used + * 2020 FIX: Fixed non working FOREACH_CHILD mechanism for BI rules Reporting & Availability: * 1990 FIX: Fix two exceptions in PDF exports of host group views diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 95d74ce..a0f4fc8 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -575,14 +575,14 @@ def find_matching_services(aggr_type, what, calllist): if host_matches != None: if what == config.FOREACH_CHILD: list_of_matches = [ host_matches + (child,) for child in childs ] - if what == config.FOREACH_PARENT: + elif what == config.FOREACH_PARENT: list_of_matches = [ host_matches + (parent,) for parent in parents ] else: list_of_matches = [ host_matches ] - for host_matches in list_of_matches: + for matched_host in list_of_matches: if service_re == config.HOST_STATE: - matches.add(host_matches) + matches.add(matched_host) else: for service in services: mo = (service_re, service) @@ -591,7 +591,7 @@ def find_matching_services(aggr_type, what, calllist): m = regex(service_re).match(service) if m: svc_matches = tuple(m.groups()) - matches.add(host_matches + svc_matches) + matches.add(matched_host + svc_matches) else: service_nomatch_cache.add(mo)

9 years, 7 months

Check_MK Git: check_mk: #2039 mk_logwatch: new per-logfile-options maxfilesize and maxlinesize

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c27c50386c91ecb11de9d0a74762067f0dc468d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c27c50386c91e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 26 10:51:24 2015 +0100 #2039 mk_logwatch: new per-logfile-options maxfilesize and maxlinesize These options allow you to truncated too long lines (in order to save space and processing time for excessivly long lines) and to get a warning if the size of a logfile is too large. Please refer to the online documentation for details. --- .werks/2039 | 13 +++++++++++++ ChangeLog | 1 + agents/plugins/.f12 | 2 +- agents/plugins/mk_logwatch | 41 ++++++++++++++++++++++++++++------------- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/.werks/2039 b/.werks/2039 new file mode 100644 index 0000000..8ed32bb --- /dev/null +++ b/.werks/2039 @@ -0,0 +1,13 @@ +Title: mk_logwatch: new per-logfile-options maxfilesize and maxlinesize +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424944221 + +These options allow you to truncated too long lines (in order to save space +and processing time for excessivly long lines) and to get a warning if the +size of a logfile is too large. Please refer to the online documentation +for details. diff --git a/ChangeLog b/ChangeLog index 287f6fe..95f40b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 1862 netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance * 2036 docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter) * 1947 agent_ucs_bladecenter: Monitors UCS Bladecenter via Web-API... + * 2039 mk_logwatch: new per-logfile-options maxfilesize and maxlinesize... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/plugins/.f12 b/agents/plugins/.f12 index 5d08296..184bd99 100755 --- a/agents/plugins/.f12 +++ b/agents/plugins/.f12 @@ -3,4 +3,4 @@ SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} # sudo mkdir -p /usr/lib/check_mk_agent/plugins # sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true -sudo install -m 755 * /omd/sites/$SITE/share/check_mk/agents/plugins +sudo rsync --delete -va ./ /omd/sites/$SITE/share/check_mk/agents/plugins/ diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index d4ec518..ff77b5a 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -157,7 +157,7 @@ def save_status(status): f.write("%s|%d|%d\n" % (filename, offset, inode)) pushed_back_line = None -def next_line(f): +def next_line(file_handle): global pushed_back_line if pushed_back_line != None: line = pushed_back_line @@ -165,7 +165,7 @@ def next_line(f): return line else: try: - line = f.next() + line = file_handle.next() return line except: return None @@ -179,8 +179,8 @@ def process_logfile(logfile, patterns): # before, we set the offset to -1 offset, prev_inode = status.get(logfile, (-1, -1)) try: - fl = os.open(logfile, os.O_RDONLY) - inode = os.fstat(fl)[1] # 1 = st_ino + file_desc = os.open(logfile, os.O_RDONLY) + inode = os.fstat(file_desc)[1] # 1 = st_ino except: if debug: raise @@ -190,7 +190,7 @@ def process_logfile(logfile, patterns): print "[[[%s]]]" % logfile # Seek to the current end in order to determine file size - current_end = os.lseek(fl, 0, 2) # os.SEEK_END not available in Python 2.4 + current_end = os.lseek(file_desc, 0, 2) # os.SEEK_END not available in Python 2.4 status[logfile] = current_end, inode # If we have never seen this file before, we just set the @@ -223,25 +223,29 @@ def process_logfile(logfile, patterns): offset = 0 # now seek to offset where interesting data begins - os.lseek(fl, offset, 0) # os.SEEK_SET not available in Python 2.4 - f = os.fdopen(fl) + os.lseek(file_desc, offset, 0) # os.SEEK_SET not available in Python 2.4 + file_handle = os.fdopen(file_desc) worst = -1 outputtxt = "" lines_parsed = 0 start_time = time.time() while True: - line = next_line(f) + line = next_line(file_handle) if line == None: break # End of file + # Handle option maxlinesize + if opt_maxlinesize != None and len(line) > opt_maxlinesize: + line = line[:opt_maxlinesize] + "[TRUNCATED]\n" + lines_parsed += 1 # Check if maximum number of new log messages is exceeded if opt_maxlines != None and lines_parsed > opt_maxlines: outputtxt += "%s Maximum number (%d) of new log messages exceeded.\n" % ( opt_overflow, opt_maxlines) worst = max(worst, opt_overflow_level) - os.lseek(fl, 0, 2) # Seek to end of file, skip all other messages + os.lseek(file_desc, 0, 2) # Seek to end of file, skip all other messages break # Check if maximum processing time (per file) is exceeded. Check only @@ -251,7 +255,7 @@ def process_logfile(logfile, patterns): outputtxt += "%s Maximum parsing time (%.1f sec) of this log file exceeded.\n" % ( opt_overflow, opt_maxtime) worst = max(worst, opt_overflow_level) - os.lseek(fl, 0, 2) # Seek to end of file, skip all other messages + os.lseek(file_desc, 0, 2) # Seek to end of file, skip all other messages break level = "." @@ -266,14 +270,14 @@ def process_logfile(logfile, patterns): for cont_pattern in cont_patterns: if type(cont_pattern) == int: # add that many lines for x in range(cont_pattern): - cont_line = next_line(f) + cont_line = next_line(file_handle) if cont_line == None: # end of file break line = line[:-1] + "\1" + cont_line else: # pattern is regex while True: - cont_line = next_line(f) + cont_line = next_line(file_handle) if cont_line == None: # end of file break elif cont_pattern.search(cont_line[:-1]): @@ -299,7 +303,7 @@ def process_logfile(logfile, patterns): continue outputtxt += "%s%s %s%s\n" % (color, level, line[:-1], tty_normal) - new_offset = os.lseek(fl, 0, 1) # os.SEEK_CUR not available in Python 2.4 + new_offset = os.lseek(file_desc, 0, 1) # os.SEEK_CUR not available in Python 2.4 status[logfile] = new_offset, inode # output all lines if at least one warning, error or ok has been found @@ -307,6 +311,11 @@ def process_logfile(logfile, patterns): sys.stdout.write(outputtxt) sys.stdout.flush() + # Handle option maxfilesize, regardless of warning or errors that have happened + if opt_maxfilesize != None and offset <= opt_maxfilesize and new_offset > opt_maxfilesize: + sys.stdout.write("%sW Maximum allowed logfile size (%d bytes) exceeded.%s\n" % (tty_yellow, opt_maxfilesize, tty_normal)) + + try: config = read_config() except Exception, e: @@ -329,6 +338,8 @@ for filenames, patterns in config: # Initialize options with default values opt_maxlines = None opt_maxtime = None + opt_maxlinesize = None + opt_maxfilesize = None opt_regex = None opt_overflow = 'C' opt_overflow_level = 2 @@ -340,6 +351,10 @@ for filenames, patterns in config: opt_maxlines = int(value) elif key == 'maxtime': opt_maxtime = float(value) + elif key == 'maxlinesize': + opt_maxlinesize = int(value) + elif key == 'maxfilesize': + opt_maxfilesize = int(value) elif key == 'overflow': if value not in [ 'C', 'I', 'W', 'O' ]: raise Exception("Invalid value %s for overflow. Allowed are C, I, O and W" % value)

9 years, 7 months

Check_MK Git: check_mk: Fixed WATO rule hint for SAP R/3 values rule set

by Mathias Kettner

Module: check_mk Branch: master Commit: 958676949ea055f7e9f64f32d5922131794f72e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=958676949ea055… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 26 10:44:47 2015 +0100 Fixed WATO rule hint for SAP R/3 values rule set --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8dfa121..9c3d344 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -676,7 +676,7 @@ register_rule(group + '/' + subgroup_inventory, ], optional_keys = ['limit_item_levels'], ), - match = 'list', + match = 'all', ) register_rule(group + '/' + subgroup_inventory,

9 years, 7 months

Check_MK Git: check_mk: check_mk_agent: broken plugins can no longer corrupt preceding sections

by Andreas Boesl

Module: check_mk Branch: master Commit: e638f95274c469e1cba64f9afcf1537ad814f050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e638f95274c469… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 17:36:49 2015 +0100 check_mk_agent: broken plugins can no longer corrupt preceding sections --- agents/windows/check_mk_agent.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 975d867..2ac7a08 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3229,6 +3229,7 @@ void section_local(SOCKET &out) void section_plugins(SOCKET &out) { + output(out, "<<<>>>\n"); output_external_programs(out, PLUGIN); }

9 years, 7 months

Check_MK Git: check_mk: #2048 FIX netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves

by Andreas Boesl

Module: check_mk Branch: master Commit: e34bfa6ba53735926e0777fff1fa2bb4d5585c60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e34bfa6ba53735… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 17:03:23 2015 +0100 #2048 FIX netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves --- .werks/2048 | 10 ++++++++++ ChangeLog | 2 ++ checks/netapp_api_fan | 5 +++-- checks/netapp_api_psu | 4 ++-- checks/netapp_api_temp | 7 +++++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/2048 b/.werks/2048 new file mode 100644 index 0000000..be7c562 --- /dev/null +++ b/.werks/2048 @@ -0,0 +1,10 @@ +Title: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1424880096 + + diff --git a/ChangeLog b/ChangeLog index f3bee00..287f6fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,8 @@ NOTE: Please refer to the migration notes! * 2018 FIX: ibm_imm_health: Fixed exception when host does provides empty SNMP data * 2019 FIX: heartbeat_crm: Be compatible to yet unknown crm_mon output format + * 2048 FIX: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/netapp_api_fan b/checks/netapp_api_fan index 3a47325..0c65667 100644 --- a/checks/netapp_api_fan +++ b/checks/netapp_api_fan @@ -48,7 +48,8 @@ def check_netapp_api_fan(_no_item, _no_params, parsed): if fans["cooling-element-is-error"][idx] == "true": fan_errors.append((2, "Error in Shelf %s Fan %s" % (shelf, fans["cooling-element-number"][idx]))) - yield 0, "%s Fans installed" % fan_count + + yield 0, "%s fans assigned to this filer" % fan_count max_fans = 5 for state, text in fan_errors[:max_fans]: @@ -62,7 +63,7 @@ check_info["netapp_api_fan"] = { 'check_function' : check_netapp_api_fan, 'parse_function' : netapp_api_parse_info_environ, 'inventory_function' : inventory_netapp_api_fan, - 'service_description' : 'Fan Status Shelfes', + 'service_description' : 'Fan Status Shelves', 'includes' : ["netapp_api.include"] } diff --git a/checks/netapp_api_psu b/checks/netapp_api_psu index 22e6372..79a36c3 100644 --- a/checks/netapp_api_psu +++ b/checks/netapp_api_psu @@ -49,7 +49,7 @@ def check_netapp_api_psu(_no_item, _no_params, parsed): if psus["power-supply-is-error"][idx] == "true": psu_errors.append((2, "Error in Shelf %s PSU %s" % (shelf, psus["power-supply-element-number"][idx]))) - yield 0, "%s Power supplies installed" % psu_count + yield 0, "%s power supplies assigned to this filer" % psu_count for state, text in psu_errors: yield state, text @@ -59,6 +59,6 @@ check_info["netapp_api_psu"] = { 'check_function' : check_netapp_api_psu, 'inventory_function' : inventory_netapp_api_psu, 'parse_function' : netapp_api_parse_info_environ, - 'service_description' : 'Power Supplies Shelfes', + 'service_description' : 'Power Supplies Shelves', 'includes' : ["netapp_api.include"] } diff --git a/checks/netapp_api_temp b/checks/netapp_api_temp index 80ee94d..7767efe 100644 --- a/checks/netapp_api_temp +++ b/checks/netapp_api_temp @@ -64,7 +64,10 @@ def check_netapp_api_temp(item, params, parsed): sensorlist.append( (shelf + "/" + sensor_no, current_temp, kwargs) ) - return check_temperature_list(sensorlist, params) + if not sensorlist: + return 0, "No temperature sensors assigned to this filer" + else: + return check_temperature_list(sensorlist, params) check_info["netapp_api_temp"] = { @@ -73,7 +76,7 @@ check_info["netapp_api_temp"] = { 'parse_function' : netapp_api_parse_info_environ, 'has_perfdata' : True, 'group' : "temperature", - 'service_description' : 'Temperature %s Shelfes', + 'service_description' : 'Temperature %s Shelves', 'includes' : ["netapp_api.include", "temperature.include"] }

9 years, 7 months

Check_MK Git: check_mk: Reserved 30 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 9e008bd3d1de448a433fd44f1624127e02361266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e008bd3d1de44… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 16:59:07 2015 +0100 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c873496..a9c7a68 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2048 +2078

9 years, 7 months

Check_MK Git: check_mk: akcp_sensor_drycontact: now really use new implementation

by Mathias Kettner

Module: check_mk Branch: master Commit: b6657ddc31c27bf2f61906cdb689e86adb4277a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6657ddc31c27b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 16:27:41 2015 +0100 akcp_sensor_drycontact: now really use new implementation --- checks/akcp_exp_drycontact | 2 +- checks/akcp_sensor_drycontact | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/checks/akcp_exp_drycontact b/checks/akcp_exp_drycontact index bf3a944..5aca840 100644 --- a/checks/akcp_exp_drycontact +++ b/checks/akcp_exp_drycontact @@ -31,7 +31,7 @@ check_info["akcp_exp_drycontact"] = { "check_function" : check_akcp_sensor_drycontact, - "inventory_function" : lambda info: inventory_akcp_sensor(info), + "inventory_function" : inventory_akcp_sensor, "service_description" : "Dry Contact %s", "snmp_scan_function" : snmp_scan_akcp_exp, "snmp_info" : ( ".1.3.6.1.4.1.3854.2.3.4.1", [ diff --git a/checks/akcp_sensor_drycontact b/checks/akcp_sensor_drycontact index 174ed56..fb9a94a 100644 --- a/checks/akcp_sensor_drycontact +++ b/checks/akcp_sensor_drycontact @@ -29,25 +29,15 @@ def inventory_akcp_sensor_drycontact(info): return [ ( x[0], None ) for x in info if x[2] == "1" ] -def check_akcp_sensor_drycontact(item, _no_params, info): - for line in info: - if item == line[0]: - state = saveint(line[1]) - if state == 2: - return 0, "Drycontact OK" - return 2, "Drycontact on Error" - return 3, "Drycontact not found anymore" - - check_info["akcp_sensor_drycontact"] = { "check_function" : check_akcp_sensor_drycontact, "inventory_function" : inventory_akcp_sensor_drycontact, "service_description" : "Dry Contact %s", "snmp_scan_function" : snmp_scan_akcp_sensor, "snmp_info" : ( ".1.3.6.1.4.1.3854.1.2.2.1.18.1" , [ - 1, #Sensor Name - 3, #Sensor Status (2 = OK, 4 = Not ok) - 5, #Sensor Online + 1, # Sensor Name + 3, # Sensor Status (2 = OK, 4 = Not ok) + 5, # Sensor Online ] ), "includes" : [ "akcp_sensor.include" ], }

9 years, 7 months

← Newer
1
2
3
4
5
6
7
...
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