Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: updated WATO rule default levels for diskstat read_wait and write_wait

by Andreas Boesl

Module: check_mk Branch: master Commit: ccc002da15547a3401bf54ebc9711ed7d113b66f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccc002da15547a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 13:59:09 2015 +0200 updated WATO rule default levels for diskstat read_wait and write_wait --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f35bd58..494418f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5576,12 +5576,12 @@ register_check_parameters( Levels( title = _("Read wait"), unit = _("ms"), - default_levels = (100.0, 250.0))), + default_levels = (30.0, 50.0))), ( "write_wait", Levels( title = _("Write wait"), unit = _("ms"), - default_levels = (100.0, 250.0))), + default_levels = (30.0, 50.0))), ( "average", Age( title = _("Averaging"),

9 years

Check_MK Git: check_mk: removed trailing spaces

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7256de9958cbe9f0ffb6e9f53782390c9cc37eaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7256de9958cbe9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jun 25 13:27:13 2015 +0200 removed trailing spaces --- checks/jolokia_metrics | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 9d3890e..c977ef0 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -773,8 +773,8 @@ def check_jolokia_metrics_perm_gen(item, params, info): usage_bytes = int(values['PermGenUsage']) size_bytes = int(values['PermGenMax']) usage_perc = 100.0 / size_bytes * usage_bytes - warn_bytes = usage_bytes / 100.0 * warn - crit_bytes = usage_bytes / 100.0 * crit + warn_bytes = usage_bytes / 100.0 * warn + crit_bytes = usage_bytes / 100.0 * crit perfdata = [("mem_perm_used", usage_bytes, warn_bytes, crit_bytes, 0, size_bytes)] state = 0 if usage_perc >= crit:

9 years

Check_MK Git: check_mk: #1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM

by Bastian Kuhn

Module: check_mk Branch: master Commit: e9c2330cfb84ca77c5b80ecb10398afcc0ab1fd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9c2330cfb84ca… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jun 25 13:10:34 2015 +0200 #1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM --- .werks/1260 | 9 +++++++++ ChangeLog | 1 + checkman/jolokia_metrics.perm_gen | 25 +++++++++++++++++++++++++ checks/jolokia_metrics | 34 +++++++++++++++++++++++++--------- web/plugins/metrics/check_mk.py | 14 ++++++++++++++ web/plugins/wato/check_parameters.py | 9 +++++++++ 6 files changed, 83 insertions(+), 9 deletions(-) diff --git a/.werks/1260 b/.werks/1260 new file mode 100644 index 0000000..e8cd24f --- /dev/null +++ b/.werks/1260 @@ -0,0 +1,9 @@ +Title: jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1435230606 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1bfe85d..311c7aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.7i3: Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... + * 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM 1.2.7i2: diff --git a/checkman/jolokia_metrics.perm_gen b/checkman/jolokia_metrics.perm_gen new file mode 100644 index 0000000..9504bb4 --- /dev/null +++ b/checkman/jolokia_metrics.perm_gen @@ -0,0 +1,25 @@ +title: Perm Space usage of a JVM +agents: linux +catalog: app/java +license: GPL +distribution: check_mk +description: + This check allows to monitor the usage of Perm Sprace + usage on web application servers. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + It will then fetch the memory usage from the JMX status info of the remote + Java Virtual Machine. + +item: + The name of the application server instance as configured by the agent. + + } + +perfdata: + The Perm Space usage in bytes + +inventory: + One check is created for each Jolokia instance sent by the agent. + diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 1bae427..9d3890e 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -757,27 +757,43 @@ check_info["jolokia_metrics.bea_sess"] = { "has_perfdata" : True, } -jolokia_metrics_permgen_default_levels = ( 10, 20 ) +jolokia_metrics_perm_gen_default_levels = { "perm" : ( 80.0, 100.0 ) } -def inventory_jolokia_metrics_permgen(info): +def inventory_jolokia_metrics_perm_gen(info): parsed = jolokia_metrics_parse(info) for instance, values in parsed.items(): if "PermGenUsage" in values: - yield instance, "jolokia_metrics_permgen_default_levels" + yield instance, "jolokia_metrics_perm_gen_default_levels" def check_jolokia_metrics_perm_gen(item, params, info): parsed = jolokia_metrics_parse(info) values = parsed.get(item) - usage_bytes = int(values['PermGenUsage']) - max_bytes = int(values['PermGenMax']) if values: - return 0, "Usage: %s, Max: %s" % ( get_bytes_human_readable(usage_bytes), get_bytes_human_readable(max_bytes) ) + warn, crit = params['perm'] + usage_bytes = int(values['PermGenUsage']) + size_bytes = int(values['PermGenMax']) + usage_perc = 100.0 / size_bytes * usage_bytes + warn_bytes = usage_bytes / 100.0 * warn + crit_bytes = usage_bytes / 100.0 * crit + perfdata = [("mem_perm_used", usage_bytes, warn_bytes, crit_bytes, 0, size_bytes)] + state = 0 + if usage_perc >= crit: + state = 2 + elif usage_perc >= warn: + state = 1 + if state != 0: + levels = "(Warn/Crit at %2.f %%/ %.2f %%)" % ( warn, crit ) + else: + levels = "" + return state, "Usage: %.2f %% (%s of %s used) %s" % \ + ( usage_perc, get_bytes_human_readable(usage_bytes), get_bytes_human_readable(size_bytes), levels ), \ + perfdata check_info["jolokia_metrics.perm_gen"] = { - "service_description" : "JVM %s PermGen Space", + "service_description" : "JVM %s PermGen Usage", "check_function" : check_jolokia_metrics_perm_gen, - "inventory_function" : inventory_jolokia_metrics_permgen, - "group" : None, + "inventory_function" : inventory_jolokia_metrics_perm_gen, + "group" : "jvm_memory", "has_perfdata" : True, } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d88e58d..e4341d0 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -267,6 +267,12 @@ metric_info["mem_used"] = { "unit" : "bytes", } +metric_info["mem_perm_used"] = { + "color": "#80ff40", + "title" : _("Perm used"), + "unit" : "bytes", +} + metric_info["swap_total"] = { "title" : _("Swap installed"), "color": "#e0e0e0", @@ -1269,6 +1275,7 @@ check_metrics["check_mk-ucd_cpu_load"] = {} check_metrics["check_mk-statgrab_load"] = {} check_metrics["check_mk-hpux_cpu"] = {} check_metrics["check_mk-blade_bx_load"] = {} +check_metrics["check_mk-jolokia_metrics.perm_gen"] = {} check_metrics["check_mk-kernel"] = { "ctxt" : { "name": "context_switches" }, @@ -1576,6 +1583,12 @@ perfometer_info.append({ "exponent" : 4, }) +perfometer_info.append({ + "type" : "linear", + "segments" : [ "mem_perm_used"], + "total" : "mem_perm_used:max", + +}) perfometer_info.append(("logarithmic", ( "rta", 0.1, 4))) perfometer_info.append(("linear", ( ["execution_time"], 90.0, None))) @@ -1780,6 +1793,7 @@ define_generic_graph("uptime") define_generic_graph("temp") define_generic_graph("humidity") define_generic_graph("time_offset") +define_generic_graph("mem_perm_used") graph_info.append({ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a0e6a02..47aad4e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7476,6 +7476,15 @@ register_check_parameters( ] ) ])), + ( "perm", + Tuple( + title = _("Perm Memory usage"), + elements = [ + Percentage(title = _("Warning at"), label = _("% usage")), + Percentage(title = _("Critical at"), label = _("% usage")), + ] + ) + ), ]), TextAscii( title = _("Name of the virtual machine"),

9 years

Check_MK Git: check_mk: #2314 FIX Availability: fixed exception when grouping by host or service group

by Andreas Boesl

Module: check_mk Branch: master Commit: f00aba9cf7a120c33401440b7f4de48a93e0abb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f00aba9cf7a120… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 10:36:49 2015 +0200 #2314 FIX Availability: fixed exception when grouping by host or service group --- .werks/2314 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/availability.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2314 b/.werks/2314 new file mode 100644 index 0000000..1eea60c --- /dev/null +++ b/.werks/2314 @@ -0,0 +1,9 @@ +Title: Availability: fixed exception when grouping by host or service group +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1435221374 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ed32676..aa255fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... + Multisite: + * 2314 FIX: Availability: fixed exception when grouping by host or service group + Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ea0f54b..ff7b149 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -31,7 +31,7 @@ #### die Möglichkeit "All Timelines" schaffen und diese dann 1:1 im #### Reporting abbilden. -import bi, views +import bi, views, visuals # TODO: Get rid of import of views # from lib import * from valuespec import *

9 years

Check_MK Git: check_mk: #2313 FIX notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms

by Andreas Boesl

Module: check_mk Branch: master Commit: b0d4290623a3c3c7f29596b44196a4132d4b69d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d4290623a3c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 09:06:02 2015 +0200 #2313 FIX notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms --- .werks/2313 | 9 +++++++++ ChangeLog | 3 +++ modules/notify.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2313 b/.werks/2313 new file mode 100644 index 0000000..39e14ef --- /dev/null +++ b/.werks/2313 @@ -0,0 +1,9 @@ +Title: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i3 +Date: 1435215874 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1bfe85d..ed32676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... + Notifications: + * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms + 1.2.7i2: Core & Setup: diff --git a/modules/notify.py b/modules/notify.py index b937d32..4a4071f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1408,7 +1408,7 @@ def notify_bulk(dirname, uuids): # Per default the uuids are sorted chronologically from oldest to newest # Therefore the notification plugin also shows the oldest entry first # The following configuration option allows to reverse the sorting - if old_params.get("bulk_sort_order") == "newest_first": + if type(old_params) == dict and old_params.get("bulk_sort_order") == "newest_first": bulk_context.reverse() # Converts bulk context from [[1,2],[3,4]] to [1,2,3,4]

9 years

Check_MK Git: check_mk: Fixed some spellings and wordings

by Konstantin Büttner

Module: check_mk Branch: master Commit: c8383ba63c5f97d717897b6d031166f5c6916e05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8383ba63c5f97… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 24 18:24:40 2015 +0200 Fixed some spellings and wordings --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index cf10417..f53300e 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -290,7 +290,7 @@ vs_mkeventd_rule = Dictionary( title = _("Rule type"), choices = [ ( False, _("Normal operation - process message according to action settings") ), - ( True, _("Do not do any action, drop this message, stop processing") ), + ( True, _("Do not perform any action, drop this message, stop processing") ), ( "skip_pack", _("Skip this rule pack, continue rule execution with next rule pack") ), ], help = _("With this option you can implement rules that rule out certain message from the " diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e93052c..f3736fe 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17910,7 +17910,7 @@ def validate_icon(value, varprefix): if os.path.exists("%s/share/check_mk/web/htdocs/images/icon_%s" % (defaults.omd_root, file_name)) \ or os.path.exists("%s/share/check_mk/web/htdocs/images/icons/%s" % (defaults.omd_root, file_name)): - raise MKUserError(varprefix, _('Your icons conflicts with a Check_MK builtin icon. Please ' + raise MKUserError(varprefix, _('Your icon conflicts with a Check_MK builtin icon. Please ' 'choose another name for your icon.')) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a0e6a02..175ef56 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2560,8 +2560,8 @@ filesystem_elements = [ ( "show_reserved", DropdownChoice( title = _("Show space reserved for the <tt>root</tt> user"), - help = _("Check_MK accounts space that is reserved for the <tt>root</tt> user on Linux, Unix as " - "used space. Usually 5% are being reserved for root when a new filesystem is being created. " + help = _("Check_MK treats space that is reserved for the <tt>root</tt> user on Linux and Unix as " + "used space. Usually, 5% are being reserved for root when a new filesystem is being created. " "With this option you can have Check_MK display the current amount of reserved but yet unused " "space."), choices = [ @@ -2960,7 +2960,7 @@ register_check_parameters( ), title = _("Used bandwidth (minimum or maximum traffic)"), help = _("Setting levels on the used bandwidth is optional. If you do set " - "levels you might also consider using an averaging."), + "levels you might also consider using averaging."), ) ), ( "nucasts", @@ -4820,7 +4820,7 @@ register_check_parameters( ( "average", Integer( title = _("Average"), - help = _("When averaging is set, then an floating average value " + help = _("When averaging is set, a floating average value " "of the disk throughput is computed and the levels for read " "and write will be applied to the average instead of the current " "value."), @@ -5111,7 +5111,7 @@ register_check_parameters( ), TextAscii( title = _("Name of the database"), - help = _("Don't forgett the instance: instance:dbname"), + help = _("Don't forget the instance: instance:dbname"), ), "first" ) @@ -5625,7 +5625,7 @@ register_check_parameters( ( "average", Integer( title = _("Average"), - help = _("When averaging is set, then an floating average value " + help = _("When averaging is set, a floating average value " "of the disk throughput is computed and the levels for read " "and write will be applied to the average instead of the current " "value."),

9 years

Check_MK Git: check_mk: removed forgotten function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 978e1765db484c100d9052ef6b3a717faba23bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=978e1765db484c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jun 24 16:53:50 2015 +0200 removed forgotten function --- checks/jolokia_metrics | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 2bf9f5c..1bae427 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -646,10 +646,6 @@ def check_jolokia_metrics_tp(item, params, info): ctext, busy, btext, max) return (status, output, perf) -def check_jolokia_metrics_perm_gen( item, info, params ): - print info - return - # General JVM checks check_info["jolokia_metrics.mem"] = { "service_description" : "JVM %s Memory",

9 years

Check_MK Git: check_mk: mk_jolokia: not finish: Added PermGen Space. Beware: Name will may change

by Bastian Kuhn

Module: check_mk Branch: master Commit: f169c9f5b2f4c56fb779065537a0c3c5c02d21b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f169c9f5b2f4c5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jun 24 16:52:32 2015 +0200 mk_jolokia: not finish: Added PermGen Space. Beware: Name will may change --- agents/plugins/mk_jolokia | 24 +++++++++++++----------- checks/jolokia_metrics | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 05d2e47..e71af04 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -195,17 +195,19 @@ suburi = "jolokia" instance = None global_vars = [ - ( "java.lang:type=Memory/NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [] ), - ( "java.lang:type=Memory/NonHeapMemoryUsage/max", "NonHeapMemoryMax", [] ), - ( "java.lang:type=Memory/HeapMemoryUsage/used", "HeapMemoryUsage", [] ), - ( "java.lang:type=Memory/HeapMemoryUsage/max", "HeapMemoryMax", [] ), - ( "java.lang:type=Threading/ThreadCount", "ThreadCount", [] ), - ( "java.lang:type=Threading/DaemonThreadCount", "DeamonThreadCount", [] ), - ( "java.lang:type=Threading/PeakThreadCount", "PeakThreadCount", [] ), - ( "java.lang:type=Threading/TotalStartedThreadCount", "TotalStartedThreadCount", [] ), - ( "java.lang:type=Runtime/Uptime", "Uptime", [] ), - ( "java.lang:type=GarbageCollector,name=*/CollectionCount", "", [] ), - ( "java.lang:type=GarbageCollector,name=*/CollectionTime", "", [] ), + ( "java.lang:type=Memory/NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [] ), + ( "java.lang:type=Memory/NonHeapMemoryUsage/max", "NonHeapMemoryMax", [] ), + ( "java.lang:type=Memory/HeapMemoryUsage/used", "HeapMemoryUsage", [] ), + ( "java.lang:type=Memory/HeapMemoryUsage/max", "HeapMemoryMax", [] ), + ( "java.lang:type=Threading/ThreadCount", "ThreadCount", [] ), + ( "java.lang:type=Threading/DaemonThreadCount", "DeamonThreadCount", [] ), + ( "java.lang:type=Threading/PeakThreadCount", "PeakThreadCount", [] ), + ( "java.lang:type=Threading/TotalStartedThreadCount", "TotalStartedThreadCount", [] ), + ( "java.lang:type=Runtime/Uptime", "Uptime", [] ), + ( "java.lang:type=GarbageCollector,name=*/CollectionCount", "", [] ), + ( "java.lang:type=GarbageCollector,name=*/CollectionTime", "", [] ), + ( "java.lang:name=CMS%20Perm%20Gen,type=MemoryPool/Usage/used", "PermGenUsage", [] ), + ( "java.lang:name=CMS%20Perm%20Gen,type=MemoryPool/Usage/max", "PermGenMax", [] ), ] diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 0592d0c..2bf9f5c 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -50,6 +50,7 @@ jolokia_metrics_tp_default_levels = { 'currentThreadsCount': (None, None) } + def jolokia_metrics_parse(info): parsed = {} for inst, var, value in info: @@ -225,6 +226,17 @@ def inventory_jolokia_metrics_tp(info, what): inv.append(("%s ThreadPool %s" % (inst ,tp) , levels)) return inv +def inventory_jolokia_metrics_tp(info, what): + inv = [] + parsed = jolokia_metrics_parse(info) + levels = 'jolokia_metrics_tp_default_levels' + if what == 'tp': + needed_key = ["currentThreadsBusy", "currentThreadCount", "maxThreads"] + for inst, vals in parsed.iteritems(): + for tp, val in vals.get('tp', {}).iteritems(): + inv.append(("%s ThreadPool %s" % (inst ,tp) , levels)) + return inv + def check_jolokia_metrics_mem(item, params, info): parsed = jolokia_metrics_parse(info) if item not in parsed: @@ -634,6 +646,10 @@ def check_jolokia_metrics_tp(item, params, info): ctext, busy, btext, max) return (status, output, perf) +def check_jolokia_metrics_perm_gen( item, info, params ): + print info + return + # General JVM checks check_info["jolokia_metrics.mem"] = { "service_description" : "JVM %s Memory", @@ -745,3 +761,28 @@ check_info["jolokia_metrics.bea_sess"] = { "has_perfdata" : True, } +jolokia_metrics_permgen_default_levels = ( 10, 20 ) + +def inventory_jolokia_metrics_permgen(info): + parsed = jolokia_metrics_parse(info) + for instance, values in parsed.items(): + if "PermGenUsage" in values: + yield instance, "jolokia_metrics_permgen_default_levels" + +def check_jolokia_metrics_perm_gen(item, params, info): + parsed = jolokia_metrics_parse(info) + values = parsed.get(item) + usage_bytes = int(values['PermGenUsage']) + max_bytes = int(values['PermGenMax']) + if values: + return 0, "Usage: %s, Max: %s" % ( get_bytes_human_readable(usage_bytes), get_bytes_human_readable(max_bytes) ) + +check_info["jolokia_metrics.perm_gen"] = { + "service_description" : "JVM %s PermGen Space", + "check_function" : check_jolokia_metrics_perm_gen, + "inventory_function" : inventory_jolokia_metrics_permgen, + "group" : None, + "has_perfdata" : True, +} + +

9 years

Check_MK Git: check_mk: added missing diskstat.include for werk #2312

by Andreas Boesl

Module: check_mk Branch: master Commit: f71e6c72d15f6a5a7f4522cf7f2b3b25210c502c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f71e6c72d15f6a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 24 16:02:45 2015 +0200 added missing diskstat.include for werk #2312 --- checks/diskstat.include | 83 ++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 993206a..dce910b 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -290,30 +290,35 @@ def diskstat_select_disk(disks, item): if item == "SUMMARY": summarized = { "node" : None, - "read_ios" : 0.0, - "write_ios" : 0.0, - "read_throughput" : 0.0, - "write_throughput" : 0.0, - "utilization" : 0.0, - "latency" : 0.0, - "average_request_size" : 0.0, - "average_wait" : 0.0, - "average_read_wait" : 0.0, - "average_read_request_size" : 0.0, - "average_write_wait" : 0.0, - "average_write_request_size" : 0.0, - "queue_length" : 0.0, + # We do not set these settings explictly because some + # devices may not provide all of them. + # "read_ios" : 0.0, + # "write_ios" : 0.0, + # "read_throughput" : 0.0, + # "write_throughput" : 0.0, + # "utilization" : 0.0, + # "latency" : 0.0, + # "average_request_size" : 0.0, + # "average_wait" : 0.0, + # "average_read_wait" : 0.0, + # "average_read_request_size" : 0.0, + # "average_write_wait" : 0.0, + # "average_write_request_size" : 0.0, + # "queue_length" : 0.0, } if disks: num_averaged = 0 for device, disk in disks.items(): - if disk["read_throughput"] + disk["write_throughput"] > 0: # skip idle disks + # If all disks are idle the summarized dict would have no keys + # So we take care that at least all keys of this disk are set + for key in disk.keys(): + if key != "node": + summarized.setdefault(key, 0.0) + if True or disk["read_throughput"] + disk["write_throughput"] > 0: # skip idle disks num_averaged += 1 for key, value in disk.items(): - if key.startswith("ave") or key in ("utilization", "latency", "queue_length"): - summarized[key] += value - elif key != "node": + if key != "node": summarized[key] += value if num_averaged: @@ -350,7 +355,6 @@ def diskstat_select_disk(disks, item): # 'queue_length' : 0.0, # }} def check_diskstat_dict(item, params, disks): - # Take care of previously discovered services if item in ("read", "write"): yield 3, "Sorry, the new version of this check does not " \ @@ -381,32 +385,38 @@ def check_diskstat_dict(item, params, disks): # Utilization - util = disk["utilization"] - state, text, extraperf = check_levels(util, "disk_utilization", params.get("utilization"), - unit = "%", scale = 0.01, statemarkers=False) - yield state, "%sUtilization: %.1f%%%s" % (prefix, util * 100, text), extraperf + if "utilization" in disk: + util = disk["utilization"] + state, text, extraperf = check_levels(util, "disk_utilization", params.get("utilization"), + unit = "%", scale = 0.01, statemarkers=False) + yield state, "%sUtilization: %.1f%%%s" % (prefix, util * 100, text), extraperf # Throughput for what in "read", "write": - throughput = disk[what + "_throughput"] - state, text, extraperf = check_levels(throughput, "disk_" + what + "_throughput", params.get(what), - unit = "MB/s", scale = 1048576, statemarkers=False) - yield state, "%s: %s/s%s" % (what.title(), get_bytes_human_readable(throughput), text), extraperf - + if what+"_throughput" in disk: + throughput = disk[what + "_throughput"] + state, text, extraperf = check_levels(throughput, "disk_" + what + "_throughput", params.get(what), + unit = "MB/s", scale = 1048576, statemarkers=False) + yield state, "%s: %s/s%s" % (what.title(), get_bytes_human_readable(throughput), text), extraperf - # Average wait from end to end (currently without level) - avg_wait = disk["average_wait"] - yield 0, "Wait: %.2f ms" % (avg_wait * 1000.0) + # Average wait from end to end + for what in [ "wait", "read_wait", "write_wait"]: + if "average_" + what in disk: + wait = disk["average_" + what] + state, text, extraperf = check_levels(wait, what, params.get(what), + unit = "ms", scale = 0.001, statemarkers=False) + yield state, "Average %s: %.2f ms %s" % (what.title().replace("_", " "), wait * 1000, text), extraperf # Average disk latency - latency = disk["latency"] - state, text, extraperf = check_levels(latency, "disk_latency", params.get("latency"), - unit = "ms", scale = 0.001, statemarkers=False) - yield state, "Latency: %.2f ms%s" % (latency * 1000.0, text), extraperf + if "latency" in disk: + latency = disk["latency"] + state, text, extraperf = check_levels(latency, "disk_latency", params.get("latency"), + unit = "ms", scale = 0.001, statemarkers=False) + yield state, "Latency: %.2f ms%s" % (latency * 1000.0, text), extraperf - # All the other metrics are currenlty not output in the plugin output - simply because + # All the other metrics are currently not output in the plugin output - simply because # of their amount. They are present as performance data and will shown in graphs. # Send everything as performance data now. Sort keys alphabetically @@ -414,8 +424,7 @@ def check_diskstat_dict(item, params, disks): for key in sorted(disk.keys()): value = disk[key] if type(value) in (int, float): - ## warn, crit = levels.get(key, (None, None)) - ## perfdata.append(( "disk_" + key, value, warn, crit)) + # Currently the levels are not shown in the perfdata perfdata.append(("disk_" + key, value)) yield 0, None, perfdata

9 years

Check_MK Git: check_mk: mssql_backup: Modified WATO rule to use Age ValueSpec instead of specifying the number of seconds as an integer

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8afe698e5d8da088ccc26cd15f97f780273b9b98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8afe698e5d8da0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 24 15:48:43 2015 +0200 mssql_backup: Modified WATO rule to use Age ValueSpec instead of specifying the number of seconds as an integer --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8f01a24..df7471c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4499,8 +4499,8 @@ register_check_parameters( Optional( Tuple( elements = [ - Integer(title = _("Warning if older than"), unit = _("seconds")), - Integer(title = _("Critical if older than"), unit = _("seconds")) + Age(title = _("Warning if older than")), + Age(title = _("Critical if older than")) ] ), title = _("Specify time since last successful backup"),

9 years

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015