Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64430 discussions

Check_MK Git: check_mk: cisco_qos: different method to determine qos bandwidth

by Andreas Boesl

Module: check_mk Branch: master Commit: 35854cdb60e80eb12f4667c575e938e602910471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35854cdb60e80e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 22 14:02:55 2013 +0100 cisco_qos: different method to determine qos bandwidth --- checks/cisco_qos | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index 73c78c9..80e0688 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -182,10 +182,17 @@ def check_cisco_qos(item, params, info): drop_b = drop_bytes[policy_if_id+'.'+policy_if_id2] speed = saveint(if_speeds[if_id]) - for key, value in parents.items(): - if value == policy_if_id2: - if parents_type[key] == "4": - speed = saveint(if_qos_bandwidth[config[key]]) * 1000 + speed_found = False + for a_key, a_value in config.items(): + if speed_found: + break + if a_value == class_id: + parent_value = a_key.split(".")[1] + for b_key, b_value in parents.items(): + if parent_value == b_value: + if parents_type[b_key] == "4": + speed = saveint(if_qos_bandwidth[config[b_key]]) * 1000 + speed_found = True # Bandwidth needs to be in bytes for later calculations bw = speed / 8.0

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: b331ae6e1e0b936bc266ef5e25ad1d0a5c2d8895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b331ae6e1e0b93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 11:15:33 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: sidebar snapins which refresh do not register for restart detection anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a5677afb6159cefa925bc3caaa73040db693787 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a5677afb6159c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 11:14:08 2013 +0100 FIX: sidebar snapins which refresh do not register for restart detection anymore Conflicts: ChangeLog --- ChangeLog | 1 + web/plugins/sidebar/shipped.py | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c72ecb..fc86ecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * FIX: Improved handling of error messages in bulk inventory * FIX: fixed focus bug in transform valuespec class * FIX: stop doing snapin refreshes after they have been removed + * FIX: sidebar snapins which refresh do not register for restart detection anymore BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b8761bd..075e849 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -250,7 +250,6 @@ sidebar_snapins["hosts"] = { "render" : lambda: render_hosts("hosts"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, - "restart": True, "styles" : snapin_allhosts_styles, } @@ -260,7 +259,6 @@ sidebar_snapins["summary_hosts"] = { "render" : lambda: render_hosts("summary"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, - "restart": True, "styles" : snapin_allhosts_styles, } @@ -270,7 +268,6 @@ sidebar_snapins["problem_hosts"] = { "render" : lambda: render_hosts("problems"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, - "restart": True, "styles" : snapin_allhosts_styles, }

11 years, 7 months

Check_MK Git: check_mk: Code formating; Fixed SAP value "None"

by Lars Michelsen

matching all values now Message-ID: <51274548.2BcBuNZqTNSsCYcn%lm(a)mathias-kettner.de> 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: 2b2c0da702a8e0a292c4957f804a1671988b48ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b2c0da702a8e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 22 11:12:13 2013 +0100 Code formating; Fixed SAP value "None" matching all values now --- agents/plugins/mk_sap | 45 ++++++++++++++++++++++++++++++++++----------- checks/sap | 6 +++--- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index b436dc0..c762daf 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -1,5 +1,28 @@ #!/usr/bin/python # encoding: utf-8 +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. # # This agent plugin has been built to collect information from SAP R/3 systems # using RFC calls. It needs the python module sapnwrfc (available in Check_MK @@ -171,27 +194,27 @@ def query(what, params, debug = False): ret = f.RETURN.value if ret['TYPE'] == 'E': sys.stderr.write("ERROR: %s\n" % ret['MESSAGE'].strip()) - + return f def login(): f = query('BAPI_XMI_LOGON', { - 'EXTCOMPANY': 'Mathias Kettner GmbH', - 'EXTPRODUCT': 'Check_MK SAP Agent', - 'INTERFACE': 'XAL', - 'VERSION': '1.0', + 'EXTCOMPANY': 'Mathias Kettner GmbH', + 'EXTPRODUCT': 'Check_MK SAP Agent', + 'INTERFACE': 'XAL', + 'VERSION': '1.0', }) #print f.RETURN return f.SESSIONID.value def logout(): query('BAPI_XMI_LOGOFF', { - 'INTERFACE': 'XAL', + 'INTERFACE': 'XAL', }) def mon_list(): f = query("BAPI_SYSTEM_MON_GETLIST", { - 'EXTERNAL_USER_NAME': cfg['user'], + 'EXTERNAL_USER_NAME': cfg['user'], }) l = [] for mon in f.MONITOR_NAMES.value: @@ -200,7 +223,7 @@ def mon_list(): def ms_list(): f = query("BAPI_SYSTEM_MS_GETLIST", { - 'EXTERNAL_USER_NAME': cfg['user'], + 'EXTERNAL_USER_NAME': cfg['user'], }) l = [] for ms in f.MONITOR_SETS.value: @@ -337,7 +360,7 @@ for ms_name, mon_name in mon_list(): path = ms_name + SEPARATOR + mon_name if not to_be_monitored(path, True): continue - + tree = mon_tree(ms_name, mon_name) for node in tree: if not to_be_monitored(node['PATH']): @@ -381,7 +404,7 @@ for ms_name, mon_name in mon_list(): dt = parse_dt(last_alert["ALERTDATE"], last_alert["ALERTTIME"]) alert_state, alert_msg = alert_details(last_alert) last_msg = '%s: %s - %s' % (dt, STATE_VALUE_MAP[alert_state['VALUE']][1], alert_msg) - + status_details = '%d Messages, Last: %s' % (len(alerts), last_msg) else: status_details = 'The log is empty' @@ -394,7 +417,7 @@ for ms_name, mon_name in mon_list(): sid = node["MTSYSID"].strip() or 'Other' context = node["MTMCNAME"].strip() or 'Other' path = node["PATH"] - + sap_data.setdefault(sid, []) sap_data[sid].append("%s\t%d\t%3d\t%s\t%s\t%s\t%s" % (context, state['VALUE'], state['SEVERITY'], path, perfvalue, uom, status_details)) diff --git a/checks/sap b/checks/sap index 9a177b9..10d3971 100644 --- a/checks/sap +++ b/checks/sap @@ -92,7 +92,9 @@ def inventory_sap_value(info): return inv def sap_value_path_matches(path, pattern): - if pattern[0] != '~' and path == pattern: + if pattern is None: + return True + elif pattern[0] != '~' and path == pattern: # exact path match return True elif pattern[0] == '~': @@ -105,8 +107,6 @@ def sap_value_path_matches(path, pattern): matchobject = reg.match(path) if matchobject: return True - elif pattern is None: - return True return False def check_sap_value(item, params, info):

11 years, 7 months

Check_MK Git: check_mk: FIX: jolokia_metrics.mem: renamed parameter totalheap to total

by Andreas Boesl

Module: check_mk Branch: master Commit: 04e5b290969f20c70d112724a7a2faf065ec6a12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04e5b290969f20… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 22 10:56:14 2013 +0100 FIX: jolokia_metrics.mem: renamed parameter totalheap to total --- ChangeLog | 1 + checkman/jolokia_metrics.mem | 10 +++++----- checks/jolokia_metrics | 14 ++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c72ecb..f8d3065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups * FIX: check_mk_base: fixed rounding error in get_bytes_human_readable + * FIX: jolokia_metrics.mem: renamed parameter totalheap to total Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/checkman/jolokia_metrics.mem b/checkman/jolokia_metrics.mem index 2a2a5e7..dc1225a 100644 --- a/checkman/jolokia_metrics.mem +++ b/checkman/jolokia_metrics.mem @@ -22,7 +22,7 @@ examples: jolokia_metrics_mem_default_levels = { "heap" : (2000,1000), # heap warning when 2000MB left, heap crit when 1000 MB left "nonheap" : (75.0, 95.7), # nonheap warning at 75.0% usage, nonheap crit at 95.7% usage - "totalheap" : (3000, 2200), # totalheap warning at 3000MB left, totalheap crit at 2200MB left + "total" : (3000, 2200), # total warning at 3000MB left, total crit at 2200MB left } perfdata: @@ -45,11 +45,11 @@ parameters (dict): This check requires a dictionary with the following keys. Integer numbers are interpreted as remaining nonheap memory Float numbers are interpreted as available nonheap memory usage - {"totalheap"} - A pair of two values to be used as WARN/CRIT levels - Integer numbers are interpreted as remaining totalheap memory - Float numbers are interpreted as available totalheap memory usage + {"total"} - A pair of two values to be used as WARN/CRIT levels + Integer numbers are interpreted as remaining total memory + Float numbers are interpreted as available total memory usage [configuration] -jolokia_metrics_mem_default_levels (dict): Default warn/crit levels for heap, nonheap and totalheap +jolokia_metrics_mem_default_levels (dict): Default warn/crit levels for heap, nonheap and total diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index b9143a5..0163283 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -167,7 +167,13 @@ def check_jolokia_metrics_mem(item, params, info): # convert old parameter version ( warn, crit ) # represented levels of total heap if type(params) == tuple: - params = {"totalheap": params} + params = {"total": params} + + # rename totalheap to total + # this block can be removed in the future (today 22.02.13) + if "totalheap" in params: + params["total"] = params["totalheap"] + del params["totalheap"] d = parsed[item] mb = 1024 * 1024.0 @@ -186,13 +192,13 @@ def check_jolokia_metrics_mem(item, params, info): for (what, value, value_max) in [ ("heap", heap, heapmax), ("nonheap", nonheap, nonheapmax), - ("totalheap", total, totalmax), + ("total", total, totalmax), ]: param_state = 0 level_info = "" if params.get(what): if type(params[what][0]) == int: - if what != "totalheap": + if what != "total": perfdata.append((what, value, value_max - params[what][0], value_max - params[what][1], "", value_max)) if value_max - value <= params[what][1]: param_state = 2 @@ -201,7 +207,7 @@ def check_jolokia_metrics_mem(item, params, info): param_state = 1 level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) else: - if what != "totalheap": + if what != "total": perfdata.append((what, value, value_max * params[what][0] / 100.0, value_max * params[what][1] / 100.0, "", value_max)) if value >= value_max * params[what][1] / 100.0: param_state = 2

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: 2455360f88c40377d3274f58bf1c3c1e99192225 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2455360f88c403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 15:12:35 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: First implementation of SAP monitoring with Check_MK

by Lars Michelsen

Module: check_mk Branch: master Commit: 249646ae1d8beb008703906b3c6e8b13eb70df40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=249646ae1d8beb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 21 13:22:26 2013 +0100 First implementation of SAP monitoring with Check_MK --- ChangeLog | 5 + agents/plugins/mk_sap | 420 ++++++++++++++++++++++++++++++++++ agents/sap/sap.cfg | 58 +++++ agents/sap/sapnwrfc-0.19.tar.gz | Bin 0 -> 40733 bytes checkman/sap.dialog | 22 ++ checkman/sap.value | 51 ++++ checks/sap | 139 +++++++++++ web/plugins/wato/check_parameters.py | 35 +++ 8 files changed, 730 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=249646ae1d…

11 years, 7 months

Check_MK Git: check_mk: Make TextAreaUnicode tolerate None values

by Mathias Kettner

Module: check_mk Branch: master Commit: f5e6a9668d90783f8656ae9293cdfa2ad756458a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5e6a9668d9078… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 15:11:27 2013 +0100 Make TextAreaUnicode tolerate None values --- web/htdocs/valuespec.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5dc445d..a229732 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -511,6 +511,8 @@ class TextAreaUnicode(TextUnicode): return "<pre class=ve_textarea>%s</pre>" % value def render_input(self, varprefix, value): + if value == None: + value = "" # should never happen, but avoids exception for invalid input if self._rows == "auto": attrs = { "onkeyup" : 'valuespec_textarea_resize(this);' } if html.has_var(varprefix):

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: e9fc3c6effb45aa3b4e7e4fa9b6622bffc2a318b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fc3c6effb45a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 21 15:11:30 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: check_mk_base: fixed rounding error in get_bytes_human_readable

by Andreas Boesl

Module: check_mk Branch: master Commit: 0569d8ec91444fcfb90e17e33a7e59b80c940ace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0569d8ec91444f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 21 14:28:17 2013 +0100 FIX: check_mk_base: fixed rounding error in get_bytes_human_readable --- ChangeLog | 1 + modules/check_mk_base.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7178e6b..e06afbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups + * FIX: check_mk_base: fixed rounding error in get_bytes_human_readable Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a547100..7fd93c1 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1290,6 +1290,7 @@ def savefloat(f): # The unit parameter simply changes the returned string, but does not interfere # with any calcluations def get_bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): + base = float(base) # Handle negative bytes correctly prefix = '' if b < 0:

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