Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef683f1e9a268474124ce8eaa81d1f97ab38d7fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef683f1e9a2684… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 25 17:08:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: mkeventd: new option --profile-event

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c700894a280a544fb432b4598429b9b3abadeb09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c700894a280a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 25 17:04:08 2012 +0200 mkeventd: new option --profile-event --- mkeventd/bin/mkeventd | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 9a63bfb..074b9d9 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -567,15 +567,41 @@ class EventServer: os.chmod(g_pipe_path, 0666) def run(self): + if opt_profile.get("event"): + import cProfile + profilefile = omd_root + "/var/mkeventd/event.profile" + log("Writing profile of event thread to %s." % profilefile) + try: + cProfile.run("g_event_server.run_loop()", profilefile) + except: + raise + finally: + file(profilefile + ".py", "w").write("#!/usr/bin/python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) + os.chmod(profilefile + ".py", 0755) + log("Created profile conversion script %s.py." % profilefile) + + else: + self.run_loop() + + + + def run_loop(self): + c = 0 while True: + c += 1 try: self.serve() + except Exception, e: log("EXCEPTION in event server:\n%s" % format_exception()) if opt_debug: raise time.sleep(1) + if opt_profile.get("event") and c > 100: + return + + def serve(self): for line in file(g_pipe_path, "r", 0): line = line.rstrip() @@ -592,6 +618,9 @@ class EventServer: elapsed = time.time() - before self.count_processing_time(elapsed) + if opt_profile.get("event"): + return + def do_housekeeping(self): with lock_eventstatus: with lock_configuration: @@ -1974,7 +2003,7 @@ else: short_options = "hvVgS:P:p:C:" long_options = [ "help", "version", "verbose", "debug", "foreground", "socket=", "pipe=", - "pidfile=", "statedir=", "configdir", "profile-status", "debug-locking" ] + "pidfile=", "statedir=", "configdir", "profile-status", "profile-event", "debug-locking" ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options)

11 years, 10 months

Check_MK Git: check_mk: mkeventd: optimize execution of rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c60520450e4495e306d0a6836e62f716657d85c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c60520450e449… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 25 17:08:06 2012 +0200 mkeventd: optimize execution of rules --- mkeventd/bin/mkeventd | 64 ++++++++++++++++++++++++++++++++- mkeventd/web/plugins/wato/mkeventd.py | 8 ++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 074b9d9..4afaa84 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -22,6 +22,12 @@ VERSION="1.2.1i2" # Basic settings, can be changed with configuration file (at # least I hope so) +syslog_priorities = [ "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug" ] +syslog_facilities = [ "kern", "user", "mail", "daemon", "auth", "syslog", "lpr", "news", + "uucp", "cron", "authpriv", "ftp", + "(unused 12)", "(unused 13)", "(unused 13)", "(unused 14)", + "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", ] + event_columns = [ ( "event_id", 1 ), ( "event_count", 1 ), @@ -831,8 +837,10 @@ class EventServer: def compile_rules(self, rules): self._rules = [] self._rule_by_id = {} + self._rule_hash = {} # Speedup-Hash for rule execution count_disabled = 0 count_rules = 0 + count_unspecific = 0 for rule in rules: if rule.get("disabled"): @@ -858,14 +866,67 @@ class EventServer: log("Ignoring rule %s because of an invalid regex (%s)." % (rule["id"], e)) + if g_config["rule_optimizer"]: + self.hash_rule(rule) + if "match_facility" not in rule and "match_priority" not in rule and "cancel_priority" not in rule: + count_unspecific += 1 + + log("Loaded %d active rules (ignoring %d disabled rules)" % (count_rules, count_disabled)) + if g_config["rule_optimizer"]: + log("Rule hash: %d rules - %d hashed, %d unspecific" % + (len(self._rules), len(self._rules) - count_unspecific, count_unspecific)) + for facility in range(24): + stats = [] + for prio, entries in self._rule_hash[facility].items(): + stats.append("%s(%d)" % (syslog_priorities[prio], len(entries))) + log(" %-12s: %s" % (syslog_facilities[facility], " ".join(stats))) + + + def hash_rule(self, rule): + # Construct rule hash for faster execution. + facility = rule.get("match_facility") + if facility: + self.hash_rule_facility(rule, facility) + else: + for facility in range(24): # all syslog facilities + self.hash_rule_facility(rule, facility) + + + def hash_rule_facility(self, rule, facility): + needed_prios = [False] * 8 + for key in [ "match_priority", "cancel_priority" ]: + if key in rule: + prio_from, prio_to = rule[key] + for p in range(prio_from, prio_to+1): + needed_prios[p] = True + elif key == "match_priority": # all priorities match + needed_prios = [True] * 8 # needed to check this rule for all event priorities + elif "match_ok" in rule: # a cancelling rule where all priorities cancel + needed_prios = [True] * 8 # needed to check this rule for all event priorities + + prio_hash = self._rule_hash.setdefault(facility, {}) + for prio, need in enumerate(needed_prios): + if need: + prio_hash.setdefault(prio, []).append(rule) def process_event(self, line): if g_config["debug_rules"]: log(u"Processing message '%s'" % line) event = self.parse_event(line) - for rule in self._rules: + + # Rule optimizer + if g_config["rule_optimizer"]: + rule_candidates = self._rule_hash.get(event["facility"], {}).get(event["priority"], []) + if opt_debug: + log("Optimizer: %s.%s - need to check only %d out of %d rules" % ( + event["facility"], event["priority"], + len(rule_candidates), len(self._rules))) + else: + rule_candidates = self._rules + + for rule in rule_candidates: result = self.event_rule_matches(rule, event) if result: self.count("rule_hits") @@ -1893,6 +1954,7 @@ def load_configuration(): "rules" : [], "actions" : [], "debug_rules" : False, + "rule_optimizer" : True, "log_rulehits" : False, "retention_interval" : 60, "housekeeping_interval" : 60, diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index d9529f0..e76c96f 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1205,6 +1205,14 @@ if mkeventd_enabled: domain = "mkeventd") register_configvar(group, + "rule_optimizer", + Checkbox(title = _("Optimize rule execution"), + label = _("enable optimized rule execution"), + help = _("This option turns on a faster algorithm for matching events to rules. "), + default_value = True), + domain = "mkeventd") + + register_configvar(group, "log_rulehits", Checkbox(title = _("Log rule hits"), label = _("Log hits for rules in log of mkeventd"),

11 years, 10 months

Check_MK Git: check_mk: Renamed new check manpage

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1df77c8feef26921543e06dbb279e8b276ff47f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1df77c8feef269… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 08:30:13 2012 +0200 Renamed new check manpage --- checkman/{logwatch_ec => logwatch.ec} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/logwatch_ec b/checkman/logwatch.ec similarity index 100% rename from checkman/logwatch_ec rename to checkman/logwatch.ec

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3cef9909028eb71659c5d1df58db48996a23147 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3cef9909028eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 08:44:11 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: BI: Fixed invalid cache cleanup in non on demand bi mode; Fixed "reused cache" icon in views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd00538335e8c7eb36c03a4554ace07810722c6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd00538335e8c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 08:40:00 2012 +0200 BI: Fixed invalid cache cleanup in non on demand bi mode; Fixed "reused cache" icon in views --- web/htdocs/bi.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 539918f..69455f7 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -212,11 +212,14 @@ def log(s): # printable (and storable in Python syntax to a file). def compile_forest(user, only_hosts = None, only_groups = None): global g_cache, g_user_cache, g_compiled_everything + global used_cache, did_compilation new_config_information = cache_needs_update() - if new_config_information or (not only_groups and not only_hosts): - # config changed or monitoring daemon restarted, clear cache - # or: total compilation requested (even if some hosts have already be compiled) + if new_config_information \ + or (config.bi_precompile_on_demand and not only_groups and not only_hosts): + # config changed or monitoring daemon restarted, clear cache. + # or: in case of on demand precompile and a total compilation + # requested (even if some hosts have already be compiled). g_cache = {} global g_config_information g_config_information = new_config_information @@ -224,6 +227,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): if g_compiled_everything: log('PID: %d - Already compiled everything\n' % os.getpid()) + used_cache = True return # In this case simply skip further compilations # OPTIMIZE: All users that have the permissing bi.see_all @@ -264,16 +268,17 @@ def compile_forest(user, only_hosts = None, only_groups = None): only_hosts = to_compile(only_hosts, 'hosts') if not only_hosts: log('PID: %d - All requested hosts have already been compiled\n' % os.getpid()) + used_cache = True return # Nothing to do - everything is cached if only_groups and cache['compiled_groups']: only_groups = to_compile(only_groups, 'groups') if not only_groups: log('PID: %d - All requested groups have already been compiled\n' % os.getpid()) + used_cache = True return # Nothing to do - everything is cached # Set a flag that anything has been compiled in this call - global did_compilation did_compilation = True # Load all (needed) services

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 413434204c4cf033c1fc9db040bb28e155da363e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413434204c4cf0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 24 23:19:49 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: new checks for Siemens HiPath 3000/ 5000 supporting Octopus-E MIB

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 210c1315b1904a4e0a8245211d86f84abcaa3972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=210c1315b1904a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 24 23:19:41 2012 +0200 new checks for Siemens HiPath 3000/5000 supporting Octopus-E MIB --- checks/sni_octopuse_cpu | 58 ++++++++++++++++++++++++++++++++ checks/sni_octopuse_status | 66 ++++++++++++++++++++++++++++++++++++ checks/sni_octopuse_trunks | 80 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 0 deletions(-) diff --git a/checks/sni_octopuse_cpu b/checks/sni_octopuse_cpu new file mode 100644 index 0000000..0e06d1f --- /dev/null +++ b/checks/sni_octopuse_cpu @@ -0,0 +1,58 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +#1.3.6.1.4.1.231.7.2.9.1.7 +#CPU util +#( 0..100 ) + +def inventory_octopus_cpu(info): + # are there only 1-cpu models? + if len(info[0][0]) == 1: + # no level so far, it should work ok even under load + return [(None, None)] + + +def check_octopus_cpu(_no_item, _no_params_info, info): + try: + # need to un-triple pack here. + cpu_perc = int(info[0][0][0]) + perfdata = [ ("util", "%.3f" % cpu_perc) ] + return (0, "OK - CPU utilization is %d%%. (OK from 0-100)" % cpu_perc, perfdata) + except: + return (3, "UKNW - invalid data received") + + +check_info['sni_octopuse_cpu'] = { + 'check_function' : check_octopus_cpu, + 'inventory_function' : inventory_octopus_cpu, + 'service_description': "CPU utilization", + 'has_perfdata' : True, + 'snmp_scan_function' : lambda oid: "agent for hipath" in \ + oid(".1.3.6.1.2.1.1.1.0").lower(), + 'snmp_info' : [ (".1.3.6.1.4.1.231.7.2.9.1", [7]), + ] +} diff --git a/checks/sni_octopuse_status b/checks/sni_octopuse_status new file mode 100644 index 0000000..e940b0c --- /dev/null +++ b/checks/sni_octopuse_status @@ -0,0 +1,66 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +# iso.3.6.1.4.1.231.7.2.9.1.1.0 = INTEGER: 1 +#The actual error state of the Octopus E PABX. Contains the highest severity level of the recent error events. This object is updated automatically, but it can also be modified manually. + +#{ normal(1), warning(2), minor(3), major(4), critical(5) } + + +def inventory_octopus_status(info): + if len(info[0][0]) == 1: + return [(None, None)] + + +def check_octopus_status(_no_item, _no_params_info, info): + octopus_states_map = { 1 : (0, "normal" ), + 2 : (1, "warning" ), + 3 : (1, "minor" ), + 4 : (2, "major" ), + 5 : (2, "critical")} + + + octopus_state = int(info[0][0][0]) + state = octopus_states_map[octopus_state][0] + desc = octopus_states_map[octopus_state][1] + + msg = " - PBX system state is %s" % desc + if octopus_state >= 3: + msg = msg + " error" + return (state, nagios_state_names[state] + msg) + + +check_info['sni_octopuse_status'] = { + 'check_function' : check_octopus_status, + 'inventory_function' : inventory_octopus_status, + 'service_description': "Global status", + 'has_perfdata' : True, + 'snmp_scan_function' : lambda oid: "agent for hipath" in \ + oid(".1.3.6.1.2.1.1.1.0").lower(), + 'snmp_info' : [ (".1.3.6.1.4.1.231.7.2.9", ["1.1.0"]), + ] +} diff --git a/checks/sni_octopuse_trunks b/checks/sni_octopuse_trunks new file mode 100644 index 0000000..d0bcf75 --- /dev/null +++ b/checks/sni_octopuse_trunks @@ -0,0 +1,80 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.1 "OpenStage 30" +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.2 "OpenStage 30" +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.7 "P. O. T." +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.9 "S0 extension" +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.11 "S0 trunk: extern" +#.1.3.6.1.4.1.231.7.2.9.3.8.1.3.13 "<not configured>: extern" +#[...] +#.1.3.6.1.4.1.231.7.2.9.3.8.1.4.11 2 +#.1.3.6.1.4.1.231.7.2.9.3.8.1.4.13 1 + + + +def inventory_octopus_trunks(info): + trunkports = [ "S0 trunk: extern" ] + inventory = [] + for line in info[0]: + if len(line) == 4: + portindex, cardindex, porttype, portstate = line + portdesc = "%s/%s" % (cardindex, portindex) + if porttype in trunkports and portstate == "2": + inventory.append((portdesc, None)) + return inventory + + +def check_octopus_trunks(item, _no_params, info): + for line in info[0]: + portindex, cardindex, porttype, portstate = line + portdesc = "%s/%s" % (cardindex, portindex) + if item == portdesc: + # There are two relevant card states, we use the one from + # octoPortTable + if portstate == "1": + return (2, "CRIT - Port [%s] is inactive" % porttype) + else: + return (0, "OK - Port [%s] is active" % porttype) + + return (3, "UNKW - unknown data received from agent") + +check_info['sni_octopuse_trunks'] = { + 'check_function' : check_octopus_trunks, + 'inventory_function' : inventory_octopus_trunks, + 'service_description': "Trunk Port %s", + 'has_perfdata' : False, + 'snmp_scan_function' : lambda oid: "agent for hipath" in \ + oid(".1.3.6.1.2.1.1.1.0").lower(), + 'snmp_info' : [ (".1.3.6.1.4.1.231.7.2.9.3.8.1", [ + "1", # portIndex + "2", # port card index (slot) + "3", # PortType + "4", # Port State + ]), + ] +} +

11 years, 10 months

Check_MK Git: check_mk: Addded patches for jolokia_metrics.

by git＠mathias-kettner.de

Thanks to Oleg Roitburd User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: aa72c4a04b98013929822e50394f79e5a2b0c273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa72c4a04b9801… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 24 14:18:25 2012 +0200 Addded patches for jolokia_metrics. Thanks to Oleg Roitburd --- agents/plugins/mk_jolokia | 2 ++ checks/jolokia_metrics | 37 +++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index f7be1f5..2a8f585 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -158,7 +158,9 @@ 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", [] ), diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 9b718fb..00d7896 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -164,19 +164,36 @@ def check_jolokia_metrics_mem(item, params, info): d = parsed[item] mb = 1024 * 1024.0 heap = saveint(d["HeapMemoryUsage"]) / mb + heapmax = saveint(d["HeapMemoryMax"]) / mb non_heap = saveint(d["NonHeapMemoryUsage"]) / mb + non_heapmax = saveint(d["NonHeapMemoryMax"]) / mb total = heap + non_heap - perfdata = [ ("heap", heap, warn, crit), - ("nonheap", non_heap, warn, crit) ] - infotext = "%.0f MB total (%.0f MB heap, %.0f MB non-heap), levels at %.0f/%.0f" % (total, heap, non_heap, warn, crit) - if total >= crit: - return (2, "CRIT - " + infotext, perfdata) - elif total >= warn: - return (1, "WARN - " + infotext, perfdata) + if type(warn) == int: + perfdata = [ ("heap", heap, warn, crit), + ("nonheap", non_heap, warn, crit) ] + infotext = "%.0f MB total (%.0f MB heap, %.0f MB non-heap), levels at %.0f/%.0f" % (total, heap, non_heap, warn, crit) + if total >= crit: + return (2, "CRIT - " + infotext, perfdata) + elif total >= warn: + return (1, "WARN - " + infotext, perfdata) + else: + return (0, "OK - " + infotext, perfdata) else: - return (0, "OK - " + infotext, perfdata) - - + perfdata = [ ("heap", heap, heapmax*warn/100.0, heapmax*crit/100.0), + ("nonheap", non_heap, non_heapmax*warn/100.0, non_heapmax*crit/100.0) ] + infotext = "%.0f MB heap levels at %.0f/%.0f, %.0f MB non-heap, levels at %.0f/%.0f" % (heap, heapmax*warn/100., heapmax*crit/100., non_heap, non_heapmax*warn/100., non_heapmax*crit/100.) + if heap >= heapmax*crit/100.0: + return (2, "CRIT - " + infotext, perfdata) + elif heap >= heapmax*warn/100.0: + return (1, "WARN - " + infotext, perfdata) + elif non_heap >= non_heapmax*crit/100.0: + return (2, "CRIT - " + infotext, perfdata) + elif non_heap >= non_heapmax*warn/100.0: + return (1, "WARN - " + infotext, perfdata) + else: + return (0, "OK - " + infotext, perfdata) + + def check_jolokia_metrics_threads(item, params, info): warn, crit = params parsed = jolokia_metrics_parse(info)

11 years, 10 months

Check_MK Git: check_mk: merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b40fea983e5ceebbbfb631bd0707a460d305b7e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b40fea983e5cee… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 24 14:24:14 2012 +0200 merge conflict ---

11 years, 10 months

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012