Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: improved formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: c9346c14c1ed50292468c77186bc12f2becf2d4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9346c14c1ed50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 12:26:25 2014 +0200 improved formatting --- .werks/1085 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.werks/1085 b/.werks/1085 index 4cec3c9..c519807 100644 --- a/.werks/1085 +++ b/.werks/1085 @@ -5,15 +5,13 @@ Version: 1.2.5i5 Date: 1405937822 Class: feature -When a quicksearch pattern matched multiple hosts the view hosts was shown. -This view also displayed all services for these hosts, which could lead -to plenty of (unwanted) output in the view. - +When a quicksearch pattern matched multiple hosts the view <tt>hosts</tt> was shown. +This view displayed all services for these hosts, which could lead to plenty of (unwanted) output in the view. The quicksearch feature has been changed in the following way <ul> -<li>If there are multiple host matches the searchhost view is displayed</li> -<li>If there is a single match the hosts view is displayed (this view also contains the services)</li> +<li>If there are multiple host matches the <tt>searchhost</tt> view is displayed</li> +<li>If there is a single match the <tt>hosts</tt> view is displayed (this view also contains the services)</li> </ul> Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt>

10 years, 2 months

Check_MK Git: check_mk: quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view

by Andreas Boesl

Module: check_mk Branch: master Commit: e18451854725a52859817147c9216a67dd182d6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e18451854725a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 12:24:29 2014 +0200 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view When a quicksearch pattern matched multiple hosts the view hosts was shown. This view also displayed all services for these hosts, which could lead to plenty of (unwanted) output in the view. The quicksearch feature has been changed in the following way <ul> <li>If there are multiple host matches the searchhost view is displayed</li> <li>If there is a single match the hosts view is displayed (this view also contains the services)</li> </ul> Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt> --- .werks/1085 | 19 +++++++++++++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/1085 b/.werks/1085 new file mode 100644 index 0000000..4cec3c9 --- /dev/null +++ b/.werks/1085 @@ -0,0 +1,19 @@ +Title: quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view +Level: 1 +Component: multisite +Version: 1.2.5i5 +Date: 1405937822 +Class: feature + +When a quicksearch pattern matched multiple hosts the view hosts was shown. +This view also displayed all services for these hosts, which could lead +to plenty of (unwanted) output in the view. + +The quicksearch feature has been changed in the following way + +<ul> +<li>If there are multiple host matches the searchhost view is displayed</li> +<li>If there is a single match the hosts view is displayed (this view also contains the services)</li> +</ul> + +Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt> diff --git a/ChangeLog b/ChangeLog index a09e7ae..97e98c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 1033 New Mutisite filter for the number of services a host has... * 0949 quicksearch: now able to search for multiple hosts at once... * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... + * 1085 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output * 1074 FIX: Fix Virtual Host Tree snapin... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 13786b4..91ba1c1 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -769,7 +769,7 @@ def search_url_tmpl(used_filters, row, exact = True): # Default search templates ty = plugin.get("dftl_url_tmpl", plugin.get("id")) if ty == 'hosts': - return 'view.py?view_name=hosts&host=%(name)s' + return 'view.py?view_name=searchhost&host=%(name)s&filled_in=filter' elif ty == 'hostgroups': return 'view.py?view_name=hostgroups&hostgroup_name=%(name)s&site=%(site)s' elif ty == 'servicegroups':

10 years, 2 months

Check_MK Git: check_mk: FIX ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions

by Andreas Boesl

Module: check_mk Branch: master Commit: bc791f016dd14689a6cc71782be19db3322ea689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc791f016dd146… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 11:54:15 2014 +0200 FIX ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions When a monitored process group got to many volatile processes (process spawn/despawn) the ps check had troubles to run through because there were multiple MKCounterWrapped Exceptions for each new process. This has been fixed. A newly detected process starts with usertime and kerneltime delta-values of 0. --- .werks/1084 | 12 ++++++++++++ ChangeLog | 3 ++- checks/ps | 34 ++++++++++++++++++++++++++++------ modules/check_mk_base.py | 15 +++++++++++++++ 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/.werks/1084 b/.werks/1084 new file mode 100644 index 0000000..7353c87 --- /dev/null +++ b/.werks/1084 @@ -0,0 +1,12 @@ +Title: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405935795 +Class: fix + +When a monitored process group got to many volatile processes (processes spawn/despawn) +the ps check had troubles to run through because there were multiple MKCounterWrapped Exceptions +for each new process. + +This has been fixed. A newly detected process starts with usertime and kerneltime delta-values of 0. diff --git a/ChangeLog b/ChangeLog index 6842fd8..a09e7ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,8 +57,9 @@ * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... - * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... * 1083 FIX: ad_replication.bat: does not return data if the server is no DC + * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... + * 1084 FIX: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/ps b/checks/ps index 1c6f2be..596998b 100644 --- a/checks/ps +++ b/checks/ps @@ -323,7 +323,7 @@ def process_matches(ps, procname, l_user): # "okmax" : 1, # "warnmax" : 1, # } -def check_procs(item, params, info, with_perfdata): +def check_ps(item, params, info, with_perfdata): now = time.time() cpu_cores, info = ps_parse_info(info) # parse windows wmic information @@ -351,6 +351,11 @@ def check_procs(item, params, info, with_perfdata): percent_cpu = 0.0 extended_perfdata = False + # The counter names for the ps check are quite volatile, because there is + # dynamic part (the pid) in the name. Therefore we clear any counters + # older than one day. Affected are ps_wmic.user, ps_wmic.kernel, ps_stat.pcpu + clear_counters("ps_", 86400) + running_on = set([]) # collect information about nodes the processes run on for line in info: node_name = line[0] @@ -366,8 +371,21 @@ def check_procs(item, params, info, with_perfdata): resident_size += int(addinfo[2]) # kB if len(addinfo) >= 10: # even more data: processId, pagefile_usage, usermodetime, kernelmodetime, threadCount, openHandles pid, pagefile_usage, user_c, kernel_c, handle_c = map(int, addinfo[4:9]) - timedif, user_per_sec = get_counter("ps_wmic.user.%d" % pid, now, user_c) - timedif, kernel_per_sec = get_counter("ps_wmic.kernel.%d" % pid, now, kernel_c) + counter_wrapped = False + try: + timedif, user_per_sec = get_counter("ps_wmic.user.%d" % pid, now, user_c) + except MKCounterWrapped, e: + counter_wrapped = True + + try: + timedif, kernel_per_sec = get_counter("ps_wmic.kernel.%d" % pid, now, kernel_c) + except MKCounterWrapped, e: + counter_wrapped = True + + if counter_wrapped: + user_per_sec = 0 + kernel_per_sec = 0 + user_perc = user_per_sec / 100000.0 / cpu_cores kernel_perc = kernel_per_sec / 100000.0 / cpu_cores percent_cpu += user_perc + kernel_perc @@ -383,7 +401,11 @@ def check_procs(item, params, info, with_perfdata): pid = addinfo[4] hours, minutes, seconds = map(int, addinfo[3].split(":")) total_seconds = 86400 * days + 3600 * hours + 60 * minutes + seconds - timedif, cputime = get_counter("ps_stat.pcpu.%s" % pid, now, total_seconds) + try: + timedif, cputime = get_counter("ps_stat.pcpu.%s" % pid, now, total_seconds) + except MKCounterWrapped, e: + cputime = 0 + pcpu = cputime * 100 else: pcpu = savefloat(addinfo[3]) @@ -471,7 +493,7 @@ def check_procs(item, params, info, with_perfdata): return state, infotext, perfdata check_info['ps'] = { - "check_function" : lambda i,p,n: check_procs(i,p,n,False), + "check_function" : lambda i,p,n: check_ps(i,p,n,False), "inventory_function" : inventory_ps, "service_description" : "proc_%s", "has_perfdata" : False, @@ -480,7 +502,7 @@ check_info['ps'] = { } check_info['ps.perf'] = { - "check_function" : lambda i,p,n: check_procs(i,p,n,True), + "check_function" : lambda i,p,n: check_ps(i,p,n,True), "inventory_function" : inventory_ps_perf, "service_description" : "proc_%s", "has_perfdata" : True, diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bfea8f7..9237853 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -836,6 +836,21 @@ def load_counters(hostname): except: g_counters = {} + +# Deletes counters from g_counters matching the given pattern and are older_than x seconds +def clear_counters(pattern, older_than): + global g_counters + counters_to_delete = [] + now = time.time() + + for name, (timestamp, value) in g_counters.items(): + if name.startswith(pattern): + if now > timestamp + older_than: + counters_to_delete.append(name) + + for name in counters_to_delete: + del g_counters[name] + def get_counter(countername, this_time, this_val, allow_negative=False): global g_counters

10 years, 2 months

Check_MK Git: check_mk: FIX windows_updates: agent plugin now always sends section header, even if no update information provided

by Goetz Golla

Module: check_mk Branch: master Commit: 807006b0cac641abdaf6970b10d0dccea050430a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=807006b0cac641… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 21 10:46:48 2014 +0200 FIX windows_updates: agent plugin now always sends section header, even if no update information provided This helps to get more meaningful error information when auto update is deactivated for a host previously inventorized with the windows updates check. --- .werks/638 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/windows_updates.vbs | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/638 b/.werks/638 new file mode 100644 index 0000000..3c7e86e --- /dev/null +++ b/.werks/638 @@ -0,0 +1,9 @@ +Title: windows_updates: agent plugin now always sends section header, even if no update information provided +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1405932135 +Class: fix + +This helps to get more meaningful error information when auto update is deactivated for a host previously +inventorized with the windows updates check. diff --git a/ChangeLog b/ChangeLog index dda3d7b..55de699 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... + * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 596fce4..ce04507 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -48,8 +48,8 @@ Set WSHShell = CreateObject("WScript.Shell") Dim RebootTime Dim RegPath +WScript.Echo "<<<windows_updates>>>" If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then - WScript.Echo "<<<windows_updates>>>" WScript.Quit() End If

10 years, 2 months

Check_MK Git: check_mk: FIX ad_replication.bat: does not return data if the server is no DC

by Andreas Boesl

Module: check_mk Branch: master Commit: bbf614673d5267ca88791a6690e64cbdc856b8c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbf614673d5267… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 10:31:38 2014 +0200 FIX ad_replication.bat: does not return data if the server is no DC --- .werks/1083 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/ad_replication.bat | 8 +++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/1083 b/.werks/1083 new file mode 100644 index 0000000..3fd5727 --- /dev/null +++ b/.werks/1083 @@ -0,0 +1,8 @@ +Title: ad_replication.bat: does not return data if the server is no DC +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405931445 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index dda3d7b..f49c69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... + * 1083 FIX: ad_replication.bat: does not return data if the server is no DC Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/agents/windows/plugins/ad_replication.bat b/agents/windows/plugins/ad_replication.bat index c4ce3c4..af04d5f 100644 --- a/agents/windows/plugins/ad_replication.bat +++ b/agents/windows/plugins/ad_replication.bat @@ -9,11 +9,13 @@ REM * credentials which are not enough for this check. REM * REM * To solve this problem you can do e.g. the following: REM * -REM * - Change the account the service is being started with to a +REM * - Change the account the service is being started with to a REM * domain user account with enough permissions on the DC. -REM * +REM * REM *** echo ^<^<^<ad_replication^>^>^> dsquery server | find /I "CN=%COMPUTERNAME%," > nul -if ERRORLEVEL 0 repadmin /showrepl /csv +if ERRORLEVEL 1 goto SERVER_NOT_IN_DC_LIST +repadmin /showrepl /csv +:SERVER_NOT_IN_DC_LIST

10 years, 2 months

Check_MK Git: check_mk: logwatch: another minor fix

by Bastian Kuhn

Module: check_mk Branch: master Commit: ef925b2405b21ba5e45e1391533dcd11f493953c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef925b2405b21b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 18 15:07:46 2014 +0200 logwatch: another minor fix --- checks/logwatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/logwatch b/checks/logwatch index d332231..6a51ed5 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -307,7 +307,7 @@ def check_logwatch_groups(item, params, info): else: logfile_found = False continue - return check_logwatch_generic(item, params, loglines, found) + return check_logwatch_generic(item, params, loglines, found, True) check_info['logwatch.groups'] = {

10 years, 2 months

Check_MK Git: check_mk: qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 46231b8ae6cb91437011331a5a4f1af384a10c65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46231b8ae6cb91… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 18 14:46:50 2014 +0200 qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches --- .werks/1001 | 8 +++++ ChangeLog | 1 + checkman/qlogic_sanbox.psu | 17 +++++++++ checks/qlogic_sanbox | 84 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 102 insertions(+), 8 deletions(-) diff --git a/.werks/1001 b/.werks/1001 new file mode 100644 index 0000000..070deb4 --- /dev/null +++ b/.werks/1001 @@ -0,0 +1,8 @@ +Title: qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405687585 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b7f8f89..dda3d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 0181 citrix_sessions, citrix_serverload: New checks for Citrix Load (a Score calculated by citrix) and the number of sessions * 0637 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info... * 1000 qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches + * 1001 qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/qlogic_sanbox.psu b/checkman/qlogic_sanbox.psu new file mode 100644 index 0000000..2a3096a --- /dev/null +++ b/checkman/qlogic_sanbox.psu @@ -0,0 +1,17 @@ +title: QLogic SANbox Fibre Channel Switches: Status of Power Supplies +agents: snmp +catalog: hw/storagehw/qlogic +license: GPL +distribution: check_mk +description: + Checks the status of power supplies in QLogic SANbox Fibre Channel Switches. + + The check returns {OK} if connUnitSensorStatus reports "ok", {WARN} on + "warning", {CRIT} on status "failed" and {UNKN} on every other. + +item: + The ID of the sensor taken from SNMP. It contains 3 numbers separated by + dots, e. g. 129.45.1 + +inventory: + Creates one check for every power supply found by SNMP. diff --git a/checks/qlogic_sanbox b/checks/qlogic_sanbox index d71eba3..6d2f924 100644 --- a/checks/qlogic_sanbox +++ b/checks/qlogic_sanbox @@ -24,12 +24,21 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -qlogic_sanbox_temp_status_map = [ "undefined", # 0 - "unknown", # 1 - "other", # 2 - "ok", # 3 - "warning", # 4 - "failed", ] # 5 +qlogic_sanbox_status_map = [ "undefined", # 0 + "unknown", # 1 + "other", # 2 + "ok", # 3 + "warning", # 4 + "failed", ] # 5 + +# .--temp----------------------------------------------------------------. +# | _ | +# | | |_ ___ _ __ ___ _ __ | +# | | __/ _ \ '_ ` _ \| '_ \ | +# | | || __/ | | | | | |_) | | +# | \__\___|_| |_| |_| .__/ | +# | |_| | +# '----------------------------------------------------------------------' def inventory_qlogic_sanbox_temp(info): inventory = [] @@ -47,10 +56,10 @@ def check_qlogic_sanbox_temp(item, _no_params, info): sensor_id = sensor_id.replace("16.0.0.192.221.48.", "").replace(".0.0.0.0.0.0.0.0", "") if sensor_id == item: sensor_status = int(sensor_status) - if sensor_status < 0 or sensor_status >= len(qlogic_sanbox_temp_status_map): + if sensor_status < 0 or sensor_status >= len(qlogic_sanbox_status_map): sensor_status_descr = sensor_status else: - sensor_status_descr = qlogic_sanbox_temp_status_map[int(sensor_status)] + sensor_status_descr = qlogic_sanbox_status_map[int(sensor_status)] if sensor_status == 3: status = 0 @@ -84,3 +93,62 @@ check_info["qlogic_sanbox.temp"] = { OID_END]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), } + +#. +# .--power supplies------------------------------------------------------. +# | _ _ | +# | _ __ _____ _____ _ __ ___ _ _ _ __ _ __ | (_) ___ ___ | +# || '_ \ / _ \ \ /\ / / _ \ '__| / __| | | | '_ \| '_ \| | |/ _ \/ __| | +# || |_) | (_) \ V V / __/ | \__ \ |_| | |_) | |_) | | | __/\__ \ | +# || .__/ \___/ \_/\_/ \___|_| |___/\__,_| .__/| .__/|_|_|\___||___/ | +# ||_| |_| |_| | +# | | +# '----------------------------------------------------------------------' + +def inventory_qlogic_sanbox_psu(info): + inventory = [] + for sensor_name, sensor_status, sensor_message, sensor_type, \ + sensor_characteristic, sensor_id in info: + sensor_id = sensor_id.replace("16.0.0.192.221.48.", "").replace(".0.0.0.0.0.0.0.0", "") + if sensor_type == "5": + inventory.append( (sensor_id, None) ) + return inventory + +def check_qlogic_sanbox_psu(item, _no_params, info): + for sensor_name, sensor_status, sensor_message, sensor_type, \ + sensor_characteristic, sensor_id in info: + sensor_id = sensor_id.replace("16.0.0.192.221.48.", "").replace(".0.0.0.0.0.0.0.0", "") + if sensor_id == item: + sensor_status = int(sensor_status) + if sensor_status < 0 or sensor_status >= len(qlogic_sanbox_status_map): + sensor_status_descr = sensor_status + else: + sensor_status_descr = qlogic_sanbox_status_map[int(sensor_status)] + + if sensor_status == 3: + status = 0 + elif sensor_status == 4: + status = 1 + elif sensor_status == 5: + status = 2 + else: + status = 3 + + return status, "Power Supply %s reports status %s" % (sensor_id, sensor_status_descr) + return 3, "No sensor %s found" % item + +check_info["qlogic_sanbox.psu"] = { + "check_function" : check_qlogic_sanbox_psu, + "inventory_function" : inventory_qlogic_sanbox_psu, + "service_description" : "PSU %s", + "has_perfdata" : False, + "snmp_info" : (".1.3.6.1.3.94.1.8.1", [3, # connUnitSensorName + 4, # connUnitSensorStatus + 6, # connUnitSensorMessage + 7, # connUnitSensorType + 8, # connUnitSensorCharacteristic + OID_END]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), +} + +#.

10 years, 2 months

Check_MK Git: check_mk: qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a730f5fa0620b278fe9a739db2b523036d8e920e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a730f5fa0620b2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 18 14:23:46 2014 +0200 qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches --- .werks/1000 | 8 +++ ChangeLog | 3 +- checkman/qlogic_sanbox.temp | 22 +++++++ checks/qlogic_sanbox | 86 +++++++++++++++++++++++++ modules/catalog.py | 1 + pnp-templates/check_mk-qlogic_sanbox.temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 7 files changed, 121 insertions(+), 1 deletion(-) diff --git a/.werks/1000 b/.werks/1000 new file mode 100644 index 0000000..7bdeb7b --- /dev/null +++ b/.werks/1000 @@ -0,0 +1,8 @@ +Title: qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405686184 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7789b6d..b7f8f89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,8 +29,9 @@ * 0179 check_dns: It is now possible to use the local dns server in wato configuration... * 1058 livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails... * 0180 sap: It is now possible to add multiple sap instances to the sap.cfg file... - * 0637 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info... * 0181 citrix_sessions, citrix_serverload: New checks for Citrix Load (a Score calculated by citrix) and the number of sessions + * 0637 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info... + * 1000 qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/qlogic_sanbox.temp b/checkman/qlogic_sanbox.temp new file mode 100644 index 0000000..a82d1c2 --- /dev/null +++ b/checkman/qlogic_sanbox.temp @@ -0,0 +1,22 @@ +title: QLogic SANbox Fibre Channel Switches: Temperatur Sensors +agents: snmp +catalog: hw/storagehw/qlogic +license: GPL +distribution: check_mk +description: + Checks the temperature sensors in QLogic SANbox Fibre Channel Switches. + + The current temperature in degree celsius is displayed. + + The check returns {OK} if connUnitSensorStatus reports "ok", {WARN} on + "warning", {CRIT} on status "failed" and {UNKN} on every other. + +item: + The ID of the sensor taken from SNMP. It contains 3 numbers separated by + dots, e. g. 129.45.3 + +perfdata: + Exactly one value: The temperature in degree celsius. + +inventory: + Creates one check for every temperature sensor found by SNMP. diff --git a/checks/qlogic_sanbox b/checks/qlogic_sanbox new file mode 100644 index 0000000..d71eba3 --- /dev/null +++ b/checks/qlogic_sanbox @@ -0,0 +1,86 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +qlogic_sanbox_temp_status_map = [ "undefined", # 0 + "unknown", # 1 + "other", # 2 + "ok", # 3 + "warning", # 4 + "failed", ] # 5 + +def inventory_qlogic_sanbox_temp(info): + inventory = [] + for sensor_name, sensor_status, sensor_message, sensor_type, \ + sensor_characteristic, sensor_id in info: + sensor_id = sensor_id.replace("16.0.0.192.221.48.", "").replace(".0.0.0.0.0.0.0.0", "") + if sensor_type == "8" and sensor_characteristic == "3" and \ + sensor_name != "Temperature Status": + inventory.append( (sensor_id, None) ) + return inventory + +def check_qlogic_sanbox_temp(item, _no_params, info): + for sensor_name, sensor_status, sensor_message, sensor_type, \ + sensor_characteristic, sensor_id in info: + sensor_id = sensor_id.replace("16.0.0.192.221.48.", "").replace(".0.0.0.0.0.0.0.0", "") + if sensor_id == item: + sensor_status = int(sensor_status) + if sensor_status < 0 or sensor_status >= len(qlogic_sanbox_temp_status_map): + sensor_status_descr = sensor_status + else: + sensor_status_descr = qlogic_sanbox_temp_status_map[int(sensor_status)] + + if sensor_status == 3: + status = 0 + elif sensor_status == 4: + status = 1 + elif sensor_status == 5: + status = 2 + else: + status = 3 + + if sensor_message.endswith(" degrees C"): + temp = int(sensor_message.replace(" degrees C", "")) + perfdata = [ ('temp', str(temp) + 'C') ] + else: + perfdata = [] + + return status, "Sensor %s is at %s and reports status %s" % \ + (sensor_id, sensor_message, sensor_status_descr), perfdata + return 3, "No sensor %s found" % item + +check_info["qlogic_sanbox.temp"] = { + "check_function" : check_qlogic_sanbox_temp, + "inventory_function" : inventory_qlogic_sanbox_temp, + "service_description" : "Temperature Sensor %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.3.94.1.8.1", [3, # connUnitSensorName + 4, # connUnitSensorStatus + 6, # connUnitSensorMessage + 7, # connUnitSensorType + 8, # connUnitSensorCharacteristic + OID_END]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), +} diff --git a/modules/catalog.py b/modules/catalog.py index 376547e..6c5dcfb 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -53,6 +53,7 @@ manpage_catalog_titles = { "netapp" : "NetApp", "hitachi" : "Hitachi", "emc" : "EMC", + "qlogic" : "QLogic", "phone" : "Telephony", "app" : "Applications", diff --git a/pnp-templates/check_mk-qlogic_sanbox.temp.php b/pnp-templates/check_mk-qlogic_sanbox.temp.php new file mode 120000 index 0000000..23897c1 --- /dev/null +++ b/pnp-templates/check_mk-qlogic_sanbox.temp.php @@ -0,0 +1 @@ +check_mk-hitachi_hnas_temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index ad428c7..25f76f6 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -338,6 +338,7 @@ perfometers["check_mk-wagner_titanus_topsense.temp"] = perfometer_temperature perfometers["check_mk-enterasys_temp"] = perfometer_temperature perfometers["check_mk-adva_fsp_temp"] = perfometer_temperature perfometers["check_mk-allnet_ip_sensoric.temp"] = perfometer_temperature +perfometers["check_mk-qlogic_sanbox.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

10 years, 2 months

Check_MK Git: check_mk: logwatch: minor fix in logic

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7d510fc3a2e19adb7411afbe8a6c237d4c65104e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d510fc3a2e19a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 18 10:42:44 2014 +0200 logwatch: minor fix in logic --- checks/logwatch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/logwatch b/checks/logwatch index 84b34af..d332231 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -264,6 +264,8 @@ def logwatch_groups_of_logfile(filename, params=False): groups = [] if not params: params = host_extra_conf(g_hostname, logwatch_groups) + else: + params = params[1] for line in params: for group_name, pattern in line: inclusion, exclusion = pattern @@ -299,7 +301,7 @@ def check_logwatch_groups(item, params, info): loglines.append(line) if line.startswith('[[['): logfile = line[3:-3] - if item in logwatch_groups_of_logfile(logfile, params[1]): + if item in logwatch_groups_of_logfile(logfile, params): found = True logfile_found = True else:

10 years, 2 months

Check_MK Git: check_mk: jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info

by Goetz Golla

Module: check_mk Branch: master Commit: d6df79c3c18a20ea041c2878e2d119bfcdda9292 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6df79c3c18a20… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 18 09:29:54 2014 +0200 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info many thanks to Rene Stolle for the contribution --- .werks/637 | 8 ++ ChangeLog | 1 + agents/plugins/mk_jolokia | 12 +- checkman/jolokia_metrics.gc | 45 +++++++ checkman/jolokia_metrics.tp | 38 ++++++ checks/jolokia_info | 3 + checks/jolokia_metrics | 214 +++++++++++++++++++++++++++++++++- web/plugins/wato/check_parameters.py | 94 ++++++++++++++- 8 files changed, 408 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d6df79c3c1…

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits