Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64149 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: 0fc79a02992577f33c2c23507deb0691f494b49d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc79a02992577… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 10:34:43 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44ede4bd7ba9b3f633c5e4e61d2d5b1712598035 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44ede4bd7ba9b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 17:53:59 2011 +0200 Updated bug entries --- .bugs/243 | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/.bugs/243 b/.bugs/243 new file mode 100644 index 0000000..f42eddb --- /dev/null +++ b/.bugs/243 @@ -0,0 +1,35 @@ +Title: Removal of brackets from regular expression is broken +Component: bi +Benefit: 1 +State: open +Cost: 2 +Date: 2011-04-07 17:52:29 +Class: bug + +Invalid regular expression '(zbghora12)):((zbghora13)$': unbalanced parenthesis. + +aggregation_rules["cluster_fs"] = ( + "Filesystems", [ "aHOSTA", "aHOSTB", ], "worst", [ + ( "ora_fs", [ "$HOSTA$", ] ), # oracle.mk + ( "ora_fs", [ "$HOSTB$", ] ), # oracle.mk + ( "ora_fs", [ "$HOSTA$:$HOSTB$", ] ), # oracle.mk + ] +) + +aggregation_rules["database_cluster"] = ( + "$DB$", [ "aHOSTA", "aHOSTB", "aDB", ], "worst", [ + ( "oracle_db_status", [ "$HOSTA$:$HOSTB$", "$DB$" ] ), + ( "oracle_db_tbs", [ "$HOSTA$:$HOSTB$", "$DB$" ] ), + ( "oracle_db_logs", [ "$HOSTA$:$HOSTB$", "$DB$" ] ), + ( "oracle_db_procs", [ "$HOSTA$:$HOSTB$", "$DB$" ] ), + ( "oracle_asm", [ "$HOSTA$:$HOSTB$", ] ), # oracle.mk + ( "cluster_fs", [ "$HOSTA$", "$HOSTB$" ] ), + ( "networking", [ "$HOSTA$", ] ), # os.mk + ( "networking", [ "$HOSTB$", ] ), # os.mk + ( "$HOSTA$", HOST_STATE ), + ( "$HOSTB$", HOST_STATE ), + ] +) + +Problem here: from ((.*))((.*)) we must not remove the leftmost +and rightmost brackets!

13 years, 5 months

Check_MK Git: check_mk: FIX: blade_bays: add missing SNMP OIDs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66c8f3fd8ddcd10cb1285a356c02e2fb47804ee6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c8f3fd8ddcd1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 11:28:26 2011 +0200 FIX: blade_bays: add missing SNMP OIDs --- ChangeLog | 1 + checks/blade_bays | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b23ebd2..cd49654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: blade_bays: add missing SNMP OIDs (check was always UNKNOWN) * FIX: df: fix layout problems in PNP template * FIX: df: fix trend computation (thanks to Sebastian Talmon) * FIX: df: fix status in case of critical trend and warning used diff --git a/checks/blade_bays b/checks/blade_bays index e6043eb..8532148 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -39,7 +39,7 @@ def check_blade_bays(item, params, info): for line in info: if line[0] == item: state = saveint(line[1]) - type = line[2] + type = line[2].split('(')[0] if state == 1: return (0, "OK - State %s (Type: %s, ID: %s)" % (blade_bays_module_state.get(state, 'Unhandled'), type, line[3])) @@ -52,7 +52,7 @@ def check_blade_bays(item, params, info): return (3, "UNKNOWN - no data for '%s' in SNMP info" % item) check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays) -snmp_info['blade_bays'] = ( ".1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6 ] ) # BLADE-MIB +snmp_info['blade_bays'] = ( ".1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6, 2, 1 ] ) # BLADE-MIB snmp_scan_functions['blade_bays'] = \ lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module'

13 years, 5 months

Check_MK Git: check_mk: FIX: vms_df: fix completely broken check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1b83a6e035317cccea1b0d8fc71f846cd42ec74c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b83a6e035317c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 7 13:26:54 2011 +0200 FIX: vms_df: fix completely broken check --- ChangeLog | 1 + checks/vms_df | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd49654..619bfeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: vms_df: fix, was completely broken due to conversion to df.include * FIX: blade_bays: add missing SNMP OIDs (check was always UNKNOWN) * FIX: df: fix layout problems in PNP template * FIX: df: fix trend computation (thanks to Sebastian Talmon) diff --git a/checks/vms_df b/checks/vms_df index 36e642c..73b2e4b 100644 --- a/checks/vms_df +++ b/checks/vms_df @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -check_includes['hr_fs'] = [ "df.include" ] +check_includes['vms_df'] = [ "df.include" ] # DSA101 0.77 400.00 0.07 0.93 16271539.00 35556389 # DSA102 0.00 400.00 0.00 0.00 86651840.00 106669167 @@ -48,6 +48,7 @@ def check_vms_df(item, params, info): status, text, perfdata = df_check_filesystem(g_hostname, item, size_mb, free_mb, params) perfdata.append( ('iops', "%.2f" % io_ops_total_per_sec ) ) + return status, text, perfdata return (3, "Disk %s not found" % (item,))

13 years, 5 months

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

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: 2bcd96b7e624bf2a030f57b9693bc2d549c623e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bcd96b7e624bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 18:10:21 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: BI: error handling of unused variables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a461ae2f4841877fdbeaf423cfe3f4c01547b7e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a461ae2f484187… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 18:10:18 2011 +0200 BI: error handling of unused variables --- ChangeLog | 3 --- web/htdocs/bi.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b2c7fe..b23ebd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,9 +17,6 @@ BI: * Added new component BI to Multisite. - * New third argument for worst and best: the worst possible - state (see docu) - * Make PENDING be slightly worst than OK WATO: * Allow moving hosts from one to another config file diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c032fc3..b7a036a 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -272,10 +272,13 @@ def compile_aggregation(rule, args, lvl = 0): # value for all SINGLE arguments groups = {} + used_parameters = set([]) single_names = [ varname for (varname, (expansion, value)) in arginfo.items() if expansion == SINGLE ] for instargs, node in elements: # Honor that some variables might be unused and thus not contained in instargs key = tuple([ (varname, instargs[varname]) for varname in single_names if varname in instargs ]) + for var in instargs: + used_parameters.add(var) nodes = groups.get(key, []) nodes.append(node) groups[key] = nodes @@ -375,6 +378,7 @@ def compile_aggregation(rule, args, lvl = 0): while bilateral_mergegroups(groups): pass + # Check for unmergeable entries, fill up missing values # from parameters (assuming they are not regexes) for ikey, inodes in groups.items(): @@ -386,6 +390,15 @@ def compile_aggregation(rule, args, lvl = 0): newkey = tuple(d.items()) groups[newkey] = inodes del groups[ikey] + + # track unused parameters - if we are not empty anyway + if len(groups) > 0: + for var in single_names: + if var not in used_parameters: + raise MKConfigError("<h1>Invalid rule</h1>" + "The rule '<tt>%s</tt>' never uses the variable '<tt>%s</tt>'.<br>" + "This is not allowed. All singleton parameters must be used in the rule." \ + % (description, var)) # now sort groups after instantiations def cmp_group(a, b):

13 years, 5 months

Check_MK Git: check_mk: netif.params: honor linux_nic_check

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 877ec65a3a542a001f46fc82a371051dd6454d28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877ec65a3a542a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 13:36:01 2011 +0200 netif.params: honor linux_nic_check --- checks/netif | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checks/netif b/checks/netif index 155870f..ac3646c 100644 --- a/checks/netif +++ b/checks/netif @@ -57,6 +57,8 @@ def check_netif_link(item, targetstate, info): def inventory_netif_params(checkname, info): + if linux_nic_check != "legacy": + return [] return [ (i[0], '', tuple(i[1:4])) for i in info if len(i) == 5 ] def check_netif_params(item, params, info):

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits