Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: BI: fix worst aggregation: CRIT went to UNKNOWN

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48443d98b989d2feb15981bf8ffdd3b36b4b7c0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48443d98b989d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 14:18:11 2011 +0200 BI: fix worst aggregation: CRIT went to UNKNOWN --- web/htdocs/bi.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index b7a036a..3b20d51 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -796,10 +796,10 @@ def aggr_nth_state(nodes, n, worst_state): else: return state, "" -def aggr_worst(nodes, n = 1, worst_state = 3): +def aggr_worst(nodes, n = 1, worst_state = CRIT): return aggr_nth_state(nodes, -int(n), int(worst_state)) -def aggr_best(nodes, n = 1, worst_state = 3): +def aggr_best(nodes, n = 1, worst_state = CRIT): return aggr_nth_state(nodes, int(n), int(worst_state)) config.aggregation_functions["worst"] = aggr_worst

13 years, 5 months

Check_MK Git: check_mk: Handling socket timeouts correctly

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2c789e5d24a0fe21ca2dd30caa80f65dbebfa07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2c789e5d24a0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 4 16:34:06 2011 +0200 Handling socket timeouts correctly --- .bugs/185 | 17 +++++++++++++++++ agents/plugins/j4p_performance | 11 ++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/.bugs/185 b/.bugs/185 new file mode 100644 index 0000000..bdc71df --- /dev/null +++ b/.bugs/185 @@ -0,0 +1,17 @@ +Title: ignored_checktypes können nicht durch Re-Inventory entfernt +Component: core +State: done +Class: bug +Date: 2011-04-01 13:47:28 +Benefit: 2 +Cost: 2 +Fun: 0 + +Ich habe in einem laufenden System durch einen Check viele Services dazu bekommen. Dieser Check soll nun komplett ausgeklammert werden. + +Meine Idee: Check in ignored_checktypes und cmk --checks <name> -II. Das geht allerdings nicht, da er den Check nicht mehr kennt. Mit einem cmk -II bekommt man den Dienst weg. + +Die alternative wäre die autochecks mit sed wegzuräumen. Allerding sollte das auch irgendwie einfacher gehen. + +2011-04-01 13:53:16: changed state open -> done +War mein Fehler. Ist kein Bug, funktioniert. diff --git a/agents/plugins/j4p_performance b/agents/plugins/j4p_performance index 12fa224..0da7395 100755 --- a/agents/plugins/j4p_performance +++ b/agents/plugins/j4p_performance @@ -14,7 +14,6 @@ vars = [ ( "java.lang:type=Threading/PeakThreadCount", "PeakThreadCount" ), ( "java.lang:type=Threading/TotalStartedThreadCount", "TotalStartedThreadCount" ), ( "java.lang:type=Runtime/Uptime", "Uptime" ), - ] conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/j4p.conf" @@ -25,6 +24,13 @@ if instance == None: if os.path.exists(conffile): execfile(conffile) +# We have to deal with socket timeouts. Python > 2.6 +# supports timeout parameter for the urllib2.urlopen method +# but we are on a python 2.5 system here which seem to use the +# default socket timeout. We are local here so set it to 1 second. +import socket +socket.setdefaulttimeout(1.0) + def fetch_var(server, port, path): url = "http://%s:%d/j4p/read/%s" % (server, port, path) json = urllib.urlopen(url).read() @@ -41,5 +47,8 @@ for path, title in vars: sys.stdout.write("%s %-30s %s\n" % (instance, title, value)) except IOError: sys.exit(1) + except socket.timeout: + sys.exit(1) except: + # Simply ignore exceptions. Need to be removed for debugging pass

13 years, 5 months

Check_MK Git: check_mk: FIX: heartbeat_rscstatus handles empty agent output correctly

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 101803c0996796edc7927de764940ce94b143a09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=101803c0996796… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 15:58:53 2011 +0200 FIX: heartbeat_rscstatus handles empty agent output correctly --- ChangeLog | 1 + checks/heartbeat_rscstatus | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b23ebd2..fddfd9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * if/if64: also output performance data if operstate not as expected * if/if64: scan function now also detects devices where the first port * if/if64: also show perf-o-meter if speed is unknown + * FIX: heartbeat_rscstatus handles empty agent output correctly 1.1.10: diff --git a/checks/heartbeat_rscstatus b/checks/heartbeat_rscstatus index 67fe3ee..ec336e4 100644 --- a/checks/heartbeat_rscstatus +++ b/checks/heartbeat_rscstatus @@ -36,9 +36,12 @@ def inventory_heartbeat_rscstatus(checktype, info): return [ (None, '"%s"' % line[0]) for line in info if line[0] != '' ] def check_heartbeat_rscstatus(item, expected_state, info): - if (type(expected_state) == list and info[0][0] in expected_state) or info[0][0] == expected_state: - return (0, "OK - Current state: %s" % (info[0][0])) + if len(info) > 0 and len(info[0]) > 0: + if (type(expected_state) == list and info[0][0] in expected_state) or info[0][0] == expected_state: + return (0, "OK - Current state: %s" % (info[0][0])) + else: + return (2, "CRITICAL - Current state: %s (Expected: %s)" % (info[0][0], expected_state)) else: - return (2, "CRITICAL - Current state: %s (Expected: %s)" % (info[0][0], expected_state)) + return (3, "UNKNOWN - Got no information from agent") check_info['heartbeat_rscstatus'] = (check_heartbeat_rscstatus, "Heartbeat Ressource Status", 0, inventory_heartbeat_rscstatus)

13 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011