Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: apc_symmetra: add input voltage to informational output

by Mathias Kettner

Module: check_mk Branch: master Commit: 21918cfc7a01b218b1a40d10ed04ccc288c66f88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21918cfc7a01b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 18:10:30 2013 +0200 apc_symmetra: add input voltage to informational output --- ChangeLog | 1 + checks/apc_symmetra | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b5ee2c..f252d29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels * cpu_netapp: added Perf-O-Meter and PNP template * cisco_cpu: added Perf-O-Meter and PNP template + * apc_symmetra: add input voltage to informational output * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/checks/apc_symmetra b/checks/apc_symmetra index a77554f..2fa5e82 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -73,9 +73,9 @@ apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ - AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ + AdvBatteryTemperature, AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults \ - = [ saveint(x) for x in info[0][:9] ] + = [ saveint(x) for x in info[0][:10] ] LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 @@ -157,6 +157,9 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, ("batcurr", AdvBatteryCurrent, "", crit_batt_curr, 0) ) ) + # 6a. Simply show input voltage (no performance data) + single_states.append( (0, "input voltage %dV" % AdvInputVoltage, None) ) + # 6. Check output voltage infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: @@ -195,6 +198,17 @@ check_info['apc_symmetra'] = { "group" : "apc_symentra", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "snmp_info" : (".1.3.6.1.4.1.318.1.1.1", - [ "2.1.1.0", "4.1.1.0", "2.2.1.0", "2.2.2.0", - "2.2.9.0", "4.2.1.0", "4.2.4.0", "2.2.3.0", "7.2.6.0", "7.2.4.0" ] ) + [ + "2.1.1.0", # BasicBatteryStatus, + "4.1.1.0", # BasicOutputStatus, + "2.2.1.0", # AdvBatteryCapacity, + "2.2.2.0", # AdvBatteryTemperature, + "2.2.9.0", # AdvBatteryCurrent, + "3.2.1.0", # AdvInputVoltage, + "4.2.1.0", # AdvOutputVoltage, + "4.2.4.0", # AdvOutputCurrent, + "2.2.3.0", # AdvBatteryRunTimeRemaining, + "7.2.6.0", # AdvTestCalibrationResults + "7.2.4.0", # LastDiagnosticsDate + ] ) }

10 years, 11 months

Check_MK Git: check_mk: finally(?) fixed pnpgraphs for brocade_fcport

by Andreas Boesl

Module: check_mk Branch: master Commit: 3a187d58fcb935aa5c731756b295fe9c40b2c1d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a187d58fcb935… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 10 17:52:44 2013 +0200 finally(?) fixed pnpgraphs for brocade_fcport --- pnp-templates/check_mk-brocade_fcport.php | 32 +++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php index 4de80a4..0cb19ab 100644 --- a/pnp-templates/check_mk-brocade_fcport.php +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -46,13 +46,13 @@ $opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Traffic for $ho $def[1] = "" . "HRULE:0#c0c0c0 " . "DEF:in=$RRD[in] " - . "DEF:inavg=$RRDAVG[in] " - . "DEF:outavg=$RRDAVG[out] " . "DEF:out=$RRD[out] " . "CDEF:inmb=in,1048576,/ " + . "CDEF:outmb=out,1048576,/ " + . "DEF:inavg=$RRDAVG[in] " + . "DEF:outavg=$RRDAVG[out] " . "CDEF:inmbavg=inavg,1048576,/ " . "CDEF:outmbavg=outavg,1048576,/ " - . "CDEF:outmb=out,1048576,/ " . "AREA:inmb#60a020:\"in \" " . "GPRINT:inmb:LAST:\"%5.3lf MB/s last\" " . "GPRINT:inmbavg:AVERAGE:\"%5.3lf MB/s avg\" " @@ -70,15 +70,19 @@ $def[1] .= "" . "DEF:outavg=$RRD[out_avg] " . "CDEF:inavgmb=inavg,1048576,/ " . "CDEF:outavgmb=outavg,1048576,/ " + . "DEF:inavgavg=$RRDAVG[in_avg] " + . "DEF:outavgavg=$RRDAVG[out_avg] " + . "CDEF:inavgmbavg=inavgavg,1048576,/ " + . "CDEF:outavgmbavg=outavgavg,1048576,/ " . "CDEF:outavgmbdraw=outavg,-1048576,/ " . "LINE:inavgmb#a0d040:\"in (avg) \" " - . "GPRINT:inavgmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:inavgmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:inavgmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:inavgmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:inavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:inavgmb:MAX:\"%5.3lf MB/s max\\n\" " . "LINE:outavgmbdraw#40a0d0:\"out (avg)\" " - . "GPRINT:outavgmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:outavgmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:outavgmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:outavgmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:outavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:outavgmb:MAX:\"%5.3lf MB/s max\\n\" " ; } @@ -103,16 +107,18 @@ $ds_name[2] = 'Frames'; $opt[2] = "--vertical-label \"Frames/sec\" -b 1024 --title \"Frames per second\" "; $def[2] = "" . "HRULE:0#c0c0c0 " - . "DEF:in=$RRDAVG[rxframes] " - . "DEF:out=$RRDAVG[txframes] " + . "DEF:in=$RRD[rxframes] " + . "DEF:out=$RRD[txframes] " + . "DEF:inavg=$RRDAVG[rxframes] " + . "DEF:outavg=$RRDAVG[txframes] " . "AREA:in#a0d040:\"in \" " . "GPRINT:in:LAST:\"%5.1lf/s last\" " - . "GPRINT:in:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:inavg:AVERAGE:\"%5.1lf/s avg\" " . "GPRINT:in:MAX:\"%5.1lf/s max\\n\" " . "CDEF:out_draw=out,-1,* " . "AREA:out_draw#40a0d0:\"out \" " . "GPRINT:out:LAST:\"%5.1lf/s last\" " - . "GPRINT:out:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:outavg:AVERAGE:\"%5.1lf/s avgargs\" " . "GPRINT:out:MAX:\"%5.1lf/s max\\n\" " ;

10 years, 11 months

Check_MK Git: check_mk: FIX: all log views are now correctly sorted from new to old

by Mathias Kettner

Module: check_mk Branch: master Commit: c1b2812ce4dcb500291cadda48cddf92d4a63bb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1b2812ce4dcb5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:52:01 2013 +0200 FIX: all log views are now correctly sorted from new to old --- ChangeLog | 7 ++++--- web/plugins/views/builtin.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 371f1dd..2b5ee2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,15 +30,16 @@ * FIX: esx_vsphere_hostsystem: Fixed typo in check output Multisite: + * Filtering in views by Hostalias is possible now too + (however the filter is not displayed in any standard view - user needs + to enable it by customizing the needed views himself) * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables * FIX: fixed problem with ldap userid encoding * FIX: removed state-based colors from all Perf-O-Meters - * Filtering in views by Hostalias is possible now too - (however the filter is not displayed in any standard view - user needs - to enable it by customizing the needed views himself) * FIX: brocade_fcport pnp-template: fixed incorrect display of average values + * FIX: all log views are now correctly sorted from new to old Livestatus-Proxy: * FIX: fix exception when printing error message diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 38f0da1..e1d844b 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1690,7 +1690,7 @@ multisite_builtin_views.update({ 'log_plugin_output', 'log_state', 'log_class'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Host- and Service events'), 'topic': _('Other')}, @@ -1723,7 +1723,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host')}, 'svcevents': {'browser_reload': 0, 'column_headers': 'pergroup', @@ -1752,7 +1752,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of service')}, 'hostsvcevents': {'browser_reload': 0, 'column_headers': 'pergroup', @@ -1783,7 +1783,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime', 'log_state', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host & services')}, 'logfile': {'browser_reload': 0, 'column_headers': 'off', @@ -2748,7 +2748,7 @@ multisite_builtin_views.update({ 'log_plugin_output', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of host'), 'topic': _('Other')}, 'hostsvcnotifications': {'browser_reload': 0, @@ -2795,7 +2795,7 @@ multisite_builtin_views.update({ 'log_plugin_output', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of host & services'), 'topic': _('Other')}, 'notifications': {'browser_reload': 0, @@ -2845,7 +2845,7 @@ multisite_builtin_views.update({ 'log_plugin_output', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Host- and Service notifications'), 'topic': _('Other')}, 'svcnotifications': {'browser_reload': 0, @@ -2883,7 +2883,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['log_plugin_output', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Service Notifications'), 'topic': _('Other')}, 'contactnotifications': {'browser_reload': 0, @@ -2930,7 +2930,7 @@ multisite_builtin_views.update({ 'log_plugin_output', 'logtime', 'log_state'], - 'sorters': [('log_time', False), ('log_lineno', False)], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of contact'), 'topic': _('Other')}, })

10 years, 11 months

Check_MK Git: check_mk: cisco_cpu: added Perf-O-Meter and PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: e9009b4afcd1ee11000fdf51e019681a47ab1ee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9009b4afcd1ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:47:49 2013 +0200 cisco_cpu: added Perf-O-Meter and PNP template --- ChangeLog | 1 + pnp-templates/check_mk-cisco_cpu.php | 1 + web/plugins/perfometer/check_mk.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 55667a7..371f1dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * services: inventory now also matches against display names of services * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels * cpu_netapp: added Perf-O-Meter and PNP template + * cisco_cpu: added Perf-O-Meter and PNP template * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/pnp-templates/check_mk-cisco_cpu.php b/pnp-templates/check_mk-cisco_cpu.php new file mode 120000 index 0000000..07c1c09 --- /dev/null +++ b/pnp-templates/check_mk-cisco_cpu.php @@ -0,0 +1 @@ +check_mk-h3c_lanswitch_cpu.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 53f12b7..220b6a1 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -395,13 +395,14 @@ perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions def perfometer_cpu_utilization(row, check_command, perf_data): util = float(perf_data[0][1]) # is already percentage - color = "#cf2" + color = "#60f020" return "%.0f%%" % util, perfometer_linear(util, color) #perfometer_linear(perc, color) perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_cpu_utilization perfometers["check_mk-winperf_processor.util"] = perfometer_cpu_utilization perfometers["check_mk-netapp_cpu"] = perfometer_cpu_utilization +perfometers["check_mk-cisco_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])

10 years, 11 months

Check_MK Git: check_mk: View all services of host: link to service not to host

by Mathias Kettner

Module: check_mk Branch: master Commit: 90dfb2cc19e6bf9f76a786681c191e0939aee53a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90dfb2cc19e6bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:45:09 2013 +0200 View all services of host: link to service not to host When clicking on the host name. Otherwise there is no way to get to the details of the service --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1ec9918..38f0da1 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1193,7 +1193,7 @@ multisite_builtin_views.update({ 'owner': '', 'painters': [('service_state', None), ('service_icons', None), - ('host', 'host'), + ('host', 'service'), ('svc_plugin_output', None), ('perfometer', None)], 'public': True,

10 years, 11 months

Check_MK Git: check_mk: Added host tag filter to both search views ( host & service)

by Mathias Kettner

Module: check_mk Branch: master Commit: 322ea50325691c41e123e61cee8ed08b26fe090b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=322ea50325691c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:41:42 2013 +0200 Added host tag filter to both search views (host & service) --- web/plugins/views/builtin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index b8192f2..1ec9918 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1034,6 +1034,7 @@ multisite_builtin_views.update({ 'host_address', 'host_notif_number', 'host_staleness', + 'host_tags', ], 'sorters': [], 'title': _('Host search'), @@ -1112,6 +1113,7 @@ multisite_builtin_views.update({ 'aggr_service_used', 'svc_notif_number', 'service_staleness', + 'host_tags', ], 'sorters': [('site', False), ('site_host', False),

10 years, 11 months

Check_MK Git: check_mk: cpu_netapp: added Perf-O-Meter and PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b6ce79f876857917149c673ca1e3e5cae67ec0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b6ce79f876857… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:39:44 2013 +0200 cpu_netapp: added Perf-O-Meter and PNP template --- ChangeLog | 1 + pnp-templates/check_mk-netapp_cpu.php | 1 + web/plugins/perfometer/check_mk.py | 9 +-------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02e9234..55667a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * if/if64 and friends: add 95% percentiles to graphs * services: inventory now also matches against display names of services * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels + * cpu_netapp: added Perf-O-Meter and PNP template * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/pnp-templates/check_mk-netapp_cpu.php b/pnp-templates/check_mk-netapp_cpu.php new file mode 120000 index 0000000..07c1c09 --- /dev/null +++ b/pnp-templates/check_mk-netapp_cpu.php @@ -0,0 +1 @@ +check_mk-h3c_lanswitch_cpu.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index af3a3f7..53f12b7 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -396,19 +396,12 @@ perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions def perfometer_cpu_utilization(row, check_command, perf_data): util = float(perf_data[0][1]) # is already percentage color = "#cf2" - if perf_data[0][3]: - warn = float(perf_data[0][3]) - crit = float(perf_data[0][4]) - if util < warn: - color = "#6f2" - elif util < crit: - color = "#9f2" - return "%.0f%%" % util, perfometer_linear(util, color) #perfometer_linear(perc, color) perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_cpu_utilization perfometers["check_mk-winperf_processor.util"] = perfometer_cpu_utilization +perfometers["check_mk-netapp_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])

10 years, 11 months

Check_MK Git: check_mk: win.mem: better color for Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 71f065804e7caa32ed9cf877af2262cb13be5179 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f065804e7caa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:16:40 2013 +0200 win.mem: better color for Perf-O-Meter --- web/plugins/perfometer/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 52c5ac2..af3a3f7 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -162,7 +162,7 @@ perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file state = row["service_state"] - color = "#20d060" + color = "#5090c0" ram_total = float(perf_data[0][6]) ram_used = float(perf_data[0][1]) perc = ram_used / ram_total * 100.0

10 years, 11 months

Check_MK Git: check_mk: FIX: removed state-based colors from all Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: 655ce9e0d251feb9d2901e5a9875d2c073587d93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=655ce9e0d251fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 10 17:09:12 2013 +0200 FIX: removed state-based colors from all Perf-O-Meters --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67b71d8..257b9bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * FIX: ldap attribute plugins: fixed crash when parameters are None * FIX: avoid duplicate output of log message in log tables * FIX: fixed problem with ldap userid encoding + * FIX: removed state-based colors from all Perf-O-Meters * Filtering in views by Hostalias is possible now too (however the filter is not displayed in any standard view - user needs to enable it by customizing the needed views himself) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 706d5f4..52c5ac2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -142,11 +142,7 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): state = row["service_state"] # paint used ram and swap - ram_color, swap_color = { - 0:("#80ff40", "#008030"), - 1:("#ff2", "#dd0"), - 2:("#f44", "#d00"), - 3:("#fa2", "#d80") }[state] + ram_color, swap_color = "#80ff40", "#008030" h += perfometer_td(100 * ram_used / virt_total, ram_color) h += perfometer_td(100 * swap_used / virt_total, swap_color) @@ -165,9 +161,8 @@ perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file - base_colors = ("#20d060", "#3040d0") state = row["service_state"] - color = { 0: "#20d060", 1: "#ff2", 2: "#f44", 3: "#fa2",}[state] + color = "#20d060" ram_total = float(perf_data[0][6]) ram_used = float(perf_data[0][1]) perc = ram_used / ram_total * 100.0 @@ -228,7 +223,7 @@ perfometers["check_mk-systemtime"] = lambda r, c, p: perfometer_check_mk_ntp(r, def perfometer_ipmi_sensors(row, check_command, perf_data): state = row["service_state"] - color = { 0: "#39f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[state] + color = "#39f" value = float(perf_data[0][1]) crit = savefloat(perf_data[0][4]) if not crit: @@ -259,7 +254,7 @@ perfometers["check_mk-ipmi_sensors"] = perfometer_ipmi_sensors def perfometer_temperature(row, check_command, perf_data): state = row["service_state"] - color = { 0: "#39f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[state] + color = "#39f" value = float(perf_data[0][1]) crit = savefloat(perf_data[0][4]) return u"%d°C" % int(value), perfometer_logarithmic(value, 40, 1.2, color)

10 years, 11 months

Check_MK Git: check_mk: esx_vsphere_hostsystem.multipath:

by Andreas Boesl

Module: check_mk Branch: master Commit: 7f98680f89861fdd1e47c30171de5ec06eb78733 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f98680f89861f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 10 16:47:33 2013 +0200 esx_vsphere_hostsystem.multipath: - cleaned up inventory and manpage - now able to configure warn, crit levels for each state --- ChangeLog | 2 + checkman/esx_vsphere_hostsystem.multipath | 19 ++++--- checks/esx_vsphere_hostsystem | 83 +++++++++++++++-------------- web/plugins/wato/check_parameters.py | 40 ++++++++++++++ 4 files changed, 97 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2384586..a92d1f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * agent_vsphere: now able to handle < > & ' " in login credentials * if/if64 and friends: add 95% percentiles to graphs * services: inventory now also matches against display names of services + * esx_vsphere_hostsystem.multipath: now able to set warn/crit levels * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error @@ -49,6 +50,7 @@ inventory check. * Bulk inventory: yet another checkbox for skipping hosts where the Check_MK service is currently critical + * New rule: Multipath Count (used by esx_vsphere_hostsystem.multipath) * FIX: The rule "State and count of processes" is no longer available in "Parameters for inventorized check". This rule was solely intented for "Manual checks" configuration diff --git a/checkman/esx_vsphere_hostsystem.multipath b/checkman/esx_vsphere_hostsystem.multipath index e150622..b3aa1e2 100644 --- a/checkman/esx_vsphere_hostsystem.multipath +++ b/checkman/esx_vsphere_hostsystem.multipath @@ -5,16 +5,23 @@ license: GPL distribution: check_mk description: This check monitors the state of all Multipath devices - on an ESX host system. It returns {CRIT} if at least one - path is {dead} or in {unknown} state. - It returns {WARN} if at least one path is {disabled}. It also returns - {WARN} if at least one path is in {standby} mode and the number of paths - in {standby} mode is not equal to the number of {active} paths. + on an ESX host system. + Without further configuration it returns {CRIT} if at least one + path is {dead} or in {unknown} state. It returns {WARN} if at least + one path is {disabled}. It also returns {WARN} if at least one path + is in {standby} mode and the number of paths in {standby} mode is not + equal to the number of {active} paths. + By providing parameters you can configure the warn and crit levels for + each state type. inventory: One service per multipath device will be created. Paths to local disk are ignored. item: - The path type and the unique id of the path joined with a slash. + The unique id of the path +[parameters] +parameters (dict): Each key represents a path state. It's values + are the warn / crit levels and of type (int,int). Available key types + are {active}, {dead}, {disabled}, {standby}, {unknown} diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index ae17b3d..eaf55dd 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -226,50 +226,51 @@ def esx_vsphere_multipath_convert(info): def inventory_esx_vsphere_hostsystem_multipath(info): data = esx_vsphere_multipath_convert(info).items() - return [ (x, y ) for x, y in data] + return [ (x, None) for x, y in data] def check_esx_vsphere_hostsystem_multipath(item, params, info): - dead = 0 - disabled = 0 - standby = 0 - unknown = 0 - active = 0 - state = 0 - dead_label = "" - disabled_label = "" - standby_label = "" - unknow_label = "" - - for path, states in esx_vsphere_multipath_convert(info).items(): + state_infos = { + # alert_state, count, info + "active" : [0, 0, ""], + "dead" : [2, 0, ""], + "disabled" : [1, 0, ""], + "standby" : [0, 0, ""], + "unknown" : [2, 0, ""] + } + + state = 0 + message = "" + + for path, states in esx_vsphere_multipath_convert(info).items(): if path == item: + # Collect states for path_state, path_type in states: - if path_state == "active": - active += 1 - elif path_state == "dead": - dead += 1 - dead_label = "(!!)" - state = 2 - - elif path_state == "disabled": - disabled += 1 - disabled_label = "(!)" - state = max(1, state) - - elif path_state == "standby": - standby += 1 - - elif path_state == "unknown": - state = 2 - unknow_label = "(!!)" - unknown += 1 - - if standby > 0 and standby != active: - standby_label = "(!)" - state = max(1, state) - - message = "Type %s, %d active, %d dead%s, %d disabled%s, %d standby%s, %s unknown%s" % \ - (path_type, active, dead, dead_label, disabled, disabled_label, - standby, standby_label, unknown, unknow_label ) + state_item = state_infos.get(path_state) + if state_item: + state_item[1] += 1 + state = max(state_item[0], state) + + # Check warn, critical + if not params or type(params) == list: + if state_infos["standby"][1] > 0 and \ + state_infos["standby"][1] != state_infos["active"][1]: + standby_label = "(!)" + state = max(state_infos["standby"][1], state) + else: + for state_name, state_values in state_infos.items(): + if params.get(state_name): + warn, crit = params.get(state_name) + count = state_values[1] + if count > crit: + state = 2 + state_values[2] = "(!!)" + elif count > warn: + state = max(state, 1) + state_values[2] = "(!)" + # Output message + message = "Type %s" % path_type + for element in "active", "dead", "disabled", "standby", "unknown": + message += ", %d %s%s" % ( state_infos[element][1], element, state_infos[element][2] ) break else: return 3, "Path not found in agent output" @@ -280,6 +281,6 @@ check_info['esx_vsphere_hostsystem.multipath'] = { "inventory_function" : inventory_esx_vsphere_hostsystem_multipath, "check_function" : check_esx_vsphere_hostsystem_multipath, "service_description" : "Multipath %s", + "group" : "multipath_count" } -#. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db0ae8f..4365f11 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2795,6 +2795,46 @@ register_check_parameters( register_check_parameters( subgroup_storage, + "multipath_count", + _("Multipath Count"), + Alternative( + title = _("Match type"), + elements = [ + FixedValue( + None, + title = _("OK if standby count is zero or equals active paths."), + totext = "", + ), + Dictionary( + title = _("Custom settings"), + elements = [ (element, + Tuple( + title = description, + elements = [ + Integer(title = _("Warning if more than")), + Integer(title = _("Critical if more than")), + ] + ) + ) for (element, description) in [ + ("active", _("Active paths")), + ("dead", _("Dead paths")), + ("disabled", _("Disabled paths")), + ("standby", _("Standby paths")), + ("unknown", _("Unknown paths")) + ] + ] + ), + ] + ), + TextAscii( + title = _("Path ID")), + "first" +) + + + +register_check_parameters( + subgroup_storage, "hpux_multipath", _("Multipathing on HPUX - state of paths of a LUN"), Tuple(

10 years, 11 months

← Newer
1
...
26
27
28
29
30
31
32
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013