Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64449 discussions

Check_MK Git: check_mk: Ruleset: display of rulesets which are not used by any host

by Andreas Boesl

Module: check_mk Branch: master Commit: 2c2f70fd5a9de527bce268d2ead80db94e27a08f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c2f70fd5a9de5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 6 16:33:31 2013 +0100 Ruleset: display of rulesets which are not used by any host --- web/htdocs/wato.py | 141 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 126 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c2f70fd5a…

11 years, 7 months

Check_MK Git: check_mk: FIX: mysql.connections: avoid crash on legacy agent output

by Mathias Kettner

Module: check_mk Branch: master Commit: d6b3afe7f43f398429852222fc0bffc5c6924b5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6b3afe7f43f39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 18:03:37 2013 +0100 FIX: mysql.connections: avoid crash on legacy agent output --- ChangeLog | 1 + checks/mysql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index baa3ef5..e23dfbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * FIX: mssql: Agent plugin now supports MSSQL Server 2012 * FIX: hr_mem: fix max value in performance data (thanks to Michaël COQUARD) * FIX: f5_bigip_psu: fix inventory function (returned list instead of tuple) + * FIX: mysql.connections: avoid crash on legacy agent output * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/checks/mysql b/checks/mysql index a908d16..99ad45f 100644 --- a/checks/mysql +++ b/checks/mysql @@ -166,7 +166,7 @@ check_info['mysql.innodb_io'] = { def inventory_mysql_connections(info): values = parse_mysql(info) - if 'Max_used_connections' in values: + if 'Max_used_connections' in values and 'max_connections' in values: return [(None, {})] def check_mysql_connections(item, params, info):

11 years, 7 months

Check_MK Git: check_mk: FIX: f5_bigip_psu: fix inventory function ( returned list instead of tuple)

by Mathias Kettner

Module: check_mk Branch: master Commit: 1735dd1cfe68d903b4d380c7a8363d7d1d1dc4c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1735dd1cfe68d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 17:45:35 2013 +0100 FIX: f5_bigip_psu: fix inventory function (returned list instead of tuple) --- ChangeLog | 1 + checks/f5_bigip_psu | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a5c812..baa3ef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * FIX: check_ldap: added missing version option -2, -3, -3 -T (TLS) * FIX: mssql: Agent plugin now supports MSSQL Server 2012 * FIX: hr_mem: fix max value in performance data (thanks to Michaël COQUARD) + * FIX: f5_bigip_psu: fix inventory function (returned list instead of tuple) * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index 4218cf0..2304945 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -46,7 +46,7 @@ def inventory_f5_bigip_psu(info): psu, state = line[0] # inventorize the PSU unless it's in state 2 (notpresent) if state != "2": - inventory.append([("%s" % psu), None]) + inventory.append(psu, None) return inventory

11 years, 7 months

Check_MK Git: check_mk: FIX: allow TCP checks on SNMP hosts if piggybacked

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d0ec4ca0b777d3b1ebfc15de3e9cc07c64c8b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d0ec4ca0b777d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 17:42:32 2013 +0100 FIX: allow TCP checks on SNMP hosts if piggybacked --- modules/check_mk_base.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 13658e4..fe87abb 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -352,6 +352,9 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): write_cache_file(cache_relpath, repr(table) + "\n") return table + # Note: even von SNMP-tagged hosts TCP based checks can be used, if + # the data comes piggyback! + # No SNMP check. Then we must contact the check_mk_agent. Have we already # tries to get data from the agent? If yes we must not do that again! Even if # no cache file is present. @@ -383,8 +386,10 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): output += piggy_output - if len(output) == 0: + if len(output) == 0 and is_tcp_host(hostname): raise MKAgentError("Empty output from agent") + elif len(output) == 0: + return elif len(output) < 16: raise MKAgentError("Too short output from agent: '%s'" % output)

11 years, 7 months

Check_MK Git: check_mk: migrated wato ruleset registration syntax

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f04b2af258b61a42df0cdd6df5f5dd1330f979e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f04b2af258b61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 14:08:19 2013 +0100 migrated wato ruleset registration syntax --- web/plugins/wato/check_parameters.py | 306 ++++++++++++++++++---------------- 1 files changed, 162 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f04b2af25…

11 years, 7 months

Check_MK Git: check_mk: Logwatch to Event Console forwarding can be configured rule based

by Lars Michelsen

Module: check_mk Branch: master Commit: f9158c7a939f350f137514eb98b0a5d2fad1962e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9158c7a939f35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 13:43:40 2013 +0100 Logwatch to Event Console forwarding can be configured rule based Removed global option logwatch_forward_to_ec, moved this to the logwatch_ec ruleset. With this option the forwarding can now be enabled for each logfile on a host --- ChangeLog | 3 + checks/logwatch | 74 +++++++++----- web/plugins/wato/check_mk_configuration.py | 11 -- web/plugins/wato/check_parameters.py | 150 ++++++++++++++++------------ 4 files changed, 138 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f9158c7a93…

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 35ecb38ff96d4c2fec772eca8547aa3db661c96c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ecb38ff96d4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 14:08:23 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 1efbb9337e161040abe7c5a36090f69bce5907be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1efbb9337e1610… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 15:15:52 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: fix deadlock due to lock on contacts.mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 176d9cdfc22b69adf69540d79b7cc8488d061f53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=176d9cdfc22b69… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 14:45:40 2013 +0100 FIX: fix deadlock due to lock on contacts.mk --- ChangeLog | 1 + web/htdocs/index.py | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b70289..c7a6884 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * FIX: sidebar snapins which refresh do not register for restart detection anymore * FIX: fix user database corruption in case of a race condition * FIX: added checks wether or not a contactgroup can be deleted + * FIX: Avoid deadlock due to lock on contacts.mk in some situations * Changed sidebar snapin reload to a global interval (option: sidebar_update_interval), defaults to 30 seconds * Sidebar snapins are now bulk updated with one HTTP request each interval diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ffd836c..81fd8a8 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -236,6 +236,7 @@ def handler(req, profiling = True): retcode = cProfile.run("import index; from mod_python import apache; index.handler(apache._profiling_req, False)", profilefile) 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) + release_all_locks() return apache.OK # Make sure all plugins are avaiable as early as possible. At least @@ -271,6 +272,7 @@ def handler(req, profiling = True): handler() except Exception, e: html.write(str(e)) + release_all_locks() return apache.OK # Prepare output format @@ -300,6 +302,7 @@ def handler(req, profiling = True): req.myfile = req.uri.split("/")[-1][:-3] handler = pagehandlers.get(req.myfile, page_not_found) else: + release_all_locks() return result # Call userdb page hooks which are executed on a regular base to e.g. syncronize

11 years, 7 months

Check_MK Git: check_mk: cisco_qos: drop supports percentage values

by Andreas Boesl

Module: check_mk Branch: master Commit: 7021e302b8e2720dda3ab9129a8deaa3f2df1a9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7021e302b8e272… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 5 13:41:30 2013 +0100 cisco_qos: drop supports percentage values fixed bug with worst state --- ChangeLog | 4 ++-- checks/cisco_qos | 33 ++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 20 +++++++++++++++----- 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 208dd4d..8b70289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,8 @@ * if.include: new configurable parameters for assumed input and output speed * cisco_qos: new param unit: switches between bit/byte display new param average: average the values over the given minute - new param post can now be configured via int and float, now - supports percentage values + new params post/drop can be configured via int and float + fixed incorrect worst state if different parameters exceed limit * logwatch.ec: Added optional spooling to the check to prevent dataloss when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device diff --git a/checks/cisco_qos b/checks/cisco_qos index 5a20bea..a87963f 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -157,14 +157,6 @@ def check_cisco_qos(item, params, info): post_warn, post_crit = params.get("post",(None, None)) drop_warn, drop_crit = params.get("drop",(None, None)) - # Convert the drop levels to byte - if unit == "bit": - # But only if our params where already provided in the new format - if not had_legacy_params: - if type(drop_warn) == int: - drop_warn = drop_warn / 8.0 - if type(drop_crit) == int: - drop_crit = drop_crit / 8.0 # Load values and format them ifs = dict(info[0]) @@ -230,6 +222,20 @@ def check_cisco_qos(item, params, info): post_warn = post_warn / 8 post_crit = post_crit / 8 + # Determine drop warn/crit levels + if type(drop_warn) == float and not had_legacy_params: + drop_warn = bw / 100.0 * drop_warn + drop_crit = bw / 100.0 * drop_crit + # Convert the drop levels to byte + elif unit == "bit": + # But only if our params where already provided in the new format + if not had_legacy_params: + if type(drop_warn) == int: + drop_warn = drop_warn / 8.0 + if type(drop_crit) == int: + drop_crit = drop_crit / 8.0 + + # Handle counter values state = 0 infotext = '' @@ -240,17 +246,17 @@ def check_cisco_qos(item, params, info): perfdata_avg = [] min_value = ("0", "0.0")[unit == 'bit'] - for name, counter, warn, crit, min, max in [ ( "post", post_b, post_warn, post_crit, min_value, bw), + for name, counter, warn, crit, min_val, max_val in [ ( "post", post_b, post_warn, post_crit, min_value, bw), ( "drop", drop_b, drop_warn, drop_crit, min_value, bw) ]: try: timedif, rate = get_counter("cisco_qos.%s.%s" % (name, item), this_time, saveint(counter)) rates.append(rate) - perfdata.append( (name, rate, warn, crit, min, max) ) + perfdata.append( (name, rate, warn, crit, min_val, max_val) ) if average: timedif, avg_value = get_average("cisco_qos.%s.%s.avg" % (name, item), this_time, rate, average) rates.append(avg_value) - perfdata_avg.append( ("%s_avg_%d" % (name, average), avg_value, warn, crit, min, max) ) + perfdata_avg.append( ("%s_avg_%d" % (name, average), avg_value, warn, crit, min_val, max_val) ) except MKCounterWrapped, e: wrapped = True @@ -273,14 +279,15 @@ def check_cisco_qos(item, params, info): else: post_rate = rates[0] drop_rate = rates[1] + for what, rate, warn, crit in [ ("post", post_rate, post_warn, post_crit), ("drop", drop_rate, drop_warn, drop_crit) ]: infotext += ', %s: %s' % (what, format_value(rate)) if crit is not None and rate >= crit: - state = 2 + state = max(2, state) infotext += '(!!)' elif warn is not None and rate >= warn: - state = 1 + state = max(1, state) infotext += '(!)' infotext += ', Policy-Name: %s, Int-Bandwidth: %s' % (policy_name, format_value(bw)) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 569c6a6..30db9ea 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1392,15 +1392,25 @@ checkgroups.append(( ) ), ( "drop", - Tuple( + Alternative( title = _("Number of dropped bits or bytes per second"), help = _("Depending on the measurement unit (defaults to bit) you can set the warn and crit " "levels for the number of dropped bits or bytes"), elements = [ - Float(title = _("Warning at"), size = 8, label = _("bits / bytes per second")), - Float(title = _("Critical at"), size = 8, label = _("bits / bytes per second")), - ] - ) + Tuple( + title = _("Percentual levels (in relation to policy speed)"), + elements = [ + Percentage(title = _("Warning at"), max_value=1000, label = _("% of port speed")), + Percentage(title = _("Critical at"), max_value=1000, label = _("% of port speed")), + ] + ), + Tuple( + elements = [ + Integer(title = _("Warning at"), size = 8, label = _("bits / bytes per second")), + Integer(title = _("Critical at"), size = 8, label = _("bits / bytes per second")), + ] + ) + ]) ), ]), TextAscii(

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits