Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64482 discussions

Check_MK Git: check_mk: changelog updated: moved fixed memory leak to 1.2. 2p3

by Andreas Boesl

Module: check_mk Branch: master Commit: 6dba878cc9c38254714ef8e6af3bfa6c3a95208e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dba878cc9c382… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 25 17:23:24 2013 +0200 changelog updated: moved fixed memory leak to 1.2.2p3 --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa24215..7e2e860 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,7 +114,6 @@ * table statehist: no longer computes an unmonitored state for hosts and services on certain instances. (showed up as no hosts/services in the multisite gui) - * table statehist: fixed memory leak 1.2.3i4: Core: @@ -632,6 +631,10 @@ * FIX: apply rewriting of application/hostname also when cancelling events * FIX: check_mkevents now uses case insensitive host name matching + Livestatus: + * livestatus: fixed incorrect output formatting of comments_with_info column + * table statehist: fixed memory leak + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n

10 years, 11 months

Check_MK Git: check_mk: table statehist: fixed memory leak

by Andreas Boesl

Module: check_mk Branch: master Commit: b99b29197896ca3c259a8c4de4571d82ab83afe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b99b29197896ca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 25 17:14:53 2013 +0200 table statehist: fixed memory leak --- ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 55101fc..9a73686 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * table statehist: no longer computes an unmonitored state for hosts and services on certain instances. (showed up as no hosts/services in the multisite gui) + * table statehist: fixed memory leak 1.2.3i4: Core: diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 6a6d93c..ac95135 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -633,6 +633,12 @@ void TableStateHistory::answerQuery(Query *query) process(query, hst); it_hst++; } + it_hst = state_info.begin(); + while (it_hst != state_info.end()) { + delete it_hst->second; + it_hst++; + } + g_store->logCache()->unlockLogCache(); }

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1082

by Mathias Kettner

Module: check_mk Branch: master Commit: dd39b47643319699c39bc2c8032546509a754e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd39b476433196… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 25 16:27:38 2013 +0200 Updated bug entries #1082 --- .bugs/1082 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1082 b/.bugs/1082 new file mode 100644 index 0000000..8e6bc36 --- /dev/null +++ b/.bugs/1082 @@ -0,0 +1,10 @@ +Title: Part of services missing after save in WATO +Component: wato +State: open +Date: 2013-10-25 16:26:45 +Targetversion: 1.2.2 +Class: bug + +When you save the service list of a host in WATO then sometimes +some checks are not being saved and displayed as "missing" the +next time you enter the services list.

10 years, 11 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 70483102bf8d092eb6fe47e33cb73dac4974ccf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70483102bf8d09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 25 16:26:37 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 6d5177e..9c79b4b 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1082 +1092

10 years, 11 months

Check_MK Git: check_mk: initial release of brocade_mlx check:

by Bernd Stroessenreuther

up to now it is only able to check power supplies in Brocade MLX Series routers Message-ID: <526a6c34.FU3nwFy1HWuzFA45%bs(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: 98333628750ca51d80abac1c82d9d2127eda0989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98333628750ca5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Oct 25 15:03:42 2013 +0200 initial release of brocade_mlx check: up to now it is only able to check power supplies in Brocade MLX Series routers --- checks/brocade_mlx | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/checks/brocade_mlx b/checks/brocade_mlx new file mode 100644 index 0000000..24973cf --- /dev/null +++ b/checks/brocade_mlx @@ -0,0 +1,61 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +brocade_mlx_info = ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ 1, 2, 3 ]) + +def inventory_brocade_mlx_power(info): + inventory = [] + for power_id, power_descr, power_state in info: + if power_descr == "": + power_item = power_id + else: + power_item = "%s %s" % (power_id, power_descr) + inventory.append( (power_item, None) ) + return inventory + +def check_brocade_mlx_power(item, _no_params, info): + for power_id, power_descr, power_state in info: + if power_descr == "": + power_item = power_id + else: + power_item = "%s %s" % (power_id, power_descr) + if power_item == item: + if power_state == "2": + return 0, "Power supply reports status 2 (normal)" + elif power_state == "3": + return 2, "Power supply reports status 3 (failure)" + else: + return 3, "Power supply reports unidentified status %s" % power_state + return 3, "Power supply %s not found" % item + +check_info["brocade_mlx.power"] = { + "check_function" : check_brocade_mlx_power, + "inventory_function" : inventory_brocade_mlx_power, + "service_description" : "Power supply %s", + "snmp_info" : brocade_mlx_info, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), + "has_perfdata" : False, +}

10 years, 11 months

Check_MK Git: check_mk: Removed different handling for single service description result and multi results

by Lars Michelsen

Module: check_mk Branch: master Commit: 52145591a4f3113702be182ade3ea53bed9ad028 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52145591a4f311… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 25 13:54:00 2013 +0200 Removed different handling for single service description result and multi results --- web/htdocs/sidebar.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 1bb7f4c..a4ab649 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -658,10 +658,7 @@ def search_url_tmpl(ty, exact = True): else: return 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' elif ty == 'service': - if exact: - return 'view.py?view_name=servicedesc&service=%(name)s&site=%(site)s' - else: - return 'view.py?view_name=allservices&service=%(name)s&site=%(site)s' + return 'view.py?view_name=allservices&service=%(name)s&site=%(site)s' def search_livestatus(ty, q): try:

10 years, 11 months

Check_MK Git: check_mk: Added "permanently ignore" button to inventory services dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 183d9e67a015a46e7f77c46528b0f6330f907715 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=183d9e67a015a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 24 16:08:35 2013 +0200 Added "permanently ignore" button to inventory services dialog --- ChangeLog | 2 ++ web/htdocs/images/icon_ignore.png | Bin 0 -> 3640 bytes web/htdocs/wato.py | 52 ++++++++++++++++++++++++++++--------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b34bfca..de49408 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,8 @@ * bulk operations now also available when checkboxes are off * LDAP: Added test to validate the configured role sync groups * Disabled replication type "peer" in site editor. + * Added "permanently ignore" button to inventory services dialog which + links directly to the disabled services view * FIX: correct display of number of hosts in bulk inventory * FIX: nailed down ".siteid" exception when added new site * FIX: fixed setting for locking mode from 'ait' to 'wait' diff --git a/web/htdocs/images/icon_ignore.png b/web/htdocs/images/icon_ignore.png new file mode 100644 index 0000000..6b4497d Binary files /dev/null and b/web/htdocs/images/icon_ignore.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ac32bf7..d08f172 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2296,9 +2296,12 @@ def show_service_table(host, firsttime): continue if first: html.write('<tr class=groupheader><td colspan=7><br>%s</td></tr>\n' % state_name) - html.write("<tr><th>" + _("Status") + "</th><th>" + _("Checktype") + "</th><th>" + _("Item") + "</th>" - "<th>" + _("Service Description") + "</th><th>" - + _("Current check") + "</th><th></th><th></th></tr>\n") + html.write("<tr><th>" + _("Status") + "</th>" + "<th>" + _("Checktype") + "</th>" + "<th>" + _("Item") + "</th>" + "<th>" + _("Service Description") + "</th>" + "<th>" + _("Current check") + "</th>" + "<th></th><th></th><th></th></tr>\n") first = False trclass = trclass == "even" and "odd" or "even" statename = nagios_short_state_names.get(state, "PEND") @@ -2346,12 +2349,32 @@ def show_service_table(host, firsttime): html.write("</td>") - # Checkbox + # Permanently disable icon + html.write("<td>") + if state_type in ['new', 'old']: + url = make_link([ + ('mode', 'edit_ruleset'), + ('varname', 'ignored_services'), + ('host', hostname), + ('item', mk_repr(descr)), + ('mode', 'new_rule'), + ('_new_host_rule', '1'), + ('filled_in', 'new_rule'), + ('rule_folder', ''), + ('back_mode', 'inventory'), + ]) + html.write('<a href="%s"><img title="%s" class=icon src="images/icon_ignore.png"></a>' % + (url, _("Create rule to permanently disable this service"))) + html.write("</td>") + + # Temporary ignore checkbox html.write("<td>") if checkbox != None: varname = "_%s_%s" % (ct, item) - html.checkbox(varname, checkbox) - html.write("</td></tr>\n") + html.checkbox(varname, checkbox, add_attr = ['title="%s"' % _('Temporary ignore this service')]) + html.write("</td>") + + html.write("</tr>\n") html.write("</table>\n") html.end_form() @@ -11288,15 +11311,20 @@ def mode_edit_rule(phase, new = False): varname = html.var("varname") rulespec = g_rulespecs[varname] + back_mode = html.var('back_mode') if phase == "title": return _("%s rule %s") % (new and _("New") or _("Edit"), rulespec["title"]) elif phase == "buttons": - var_list = [("mode", "edit_ruleset"), ("varname", varname), ("host", html.var("host",""))] - if html.var("item"): - var_list.append( ("item", html.var("item")) ) - html.context_button(_("Abort"), make_link(var_list), "abort") + if not back_mode: + var_list = [("mode", "edit_ruleset"), ("varname", varname), ("host", html.var("host",""))] + if html.var("item"): + var_list.append( ("item", html.var("item")) ) + backurl = make_link(var_list) + else: + backurl = make_link([('mode', back_mode), ("host", html.var("host",""))]) + html.context_button(_("Abort"), backurl, "abort") return folder = html.has_var("_new_host_rule") and g_folder or g_folders[html.var("rule_folder")] @@ -11371,9 +11399,9 @@ def mode_edit_rule(phase, new = False): "folder %s to %s") % (rulespec["title"], folder["title"], new_rule_folder["title"])) else: - return "edit_ruleset" + return back_mode - return ("edit_ruleset", + return (back_mode, (new and _("Created new rule in ruleset '%s' in folder %s") or _("Editor rule in ruleset '%s' in folder %s")) % (rulespec["title"], new_rule_folder["title"]))

10 years, 11 months

Check_MK Git: check_mk: if/if64: Fixed check info in case of missing interface indexes

by Bastian Kuhn

Module: check_mk Branch: master Commit: ed4172d34318c023edbc3a5c43c52a2cff1a9978 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4172d34318c0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 25 13:21:59 2013 +0200 if/if64: Fixed check info in case of missing interface indexes --- checks/if | 3 ++- checks/if64 | 32 ++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/checks/if b/checks/if index 4cc331d..458beb0 100644 --- a/checks/if +++ b/checks/if @@ -33,7 +33,8 @@ def check_if(item, params, info): def if_convert_to_if64(info): newinfo = [] for line in info: - newinfo.append(line[0:8] + ['0'] + line[8:12] + ['0'] + line[12:16] + line[1:2] + line[16:17]) + if saveint(line[0]) > 0: #Fix for switches with empty indexes + newinfo.append(line[0:8] + ['0'] + line[8:12] + ['0'] + line[12:16] + line[1:2] + line[16:17]) return newinfo check_includes['if'] = [ "if.include" ] diff --git a/checks/if64 b/checks/if64 index d45d098..485d290 100644 --- a/checks/if64 +++ b/checks/if64 @@ -29,7 +29,9 @@ def fix_if64_highspeed(info): if type(line[3]) == str: # not yet converted line[3] = saveint(line[3]) * 1000000 + def inventory_if64(info): + info = [ x for x in info if saveint(x[0]) > 0 ] #Fix for switches like DLINK, with empty lines in MIB fix_if64_highspeed(info) return inventory_if_common(info) @@ -38,7 +40,25 @@ def check_if64(item, params, info): return check_if_common(item, params, info) -# check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 +def if64_scan_function(oid): + ignored_strings = [ + "LANCOM", + ] + for string in ignored_strings: + if string in oid(".1.3.6.1.2.1.1.1.0"): + return False + + if ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0"): + return False + + if if64_disabled(g_hostname): + return False + + if oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None: + return True + return False + + check_info["if64"] = { 'check_function': check_if64, @@ -68,11 +88,7 @@ check_info["if64"] = { "31.1.1.1.18", # ifAlias 18 "2.2.1.6", # ifPhysAddress 19 ]), - 'snmp_scan_function': \ - lambda oid: "LANCOM" not in oid(".1.3.6.1.2.1.1.1.0") and \ - ".4.1.11863." not in oid(".1.3.6.1.2.1.1.2.0") and \ - (not if64_disabled(g_hostname)) and \ - oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, - 'group': 'if', - 'default_levels_variable': 'if_default_levels', + 'snmp_scan_function' : if64_scan_function, + 'group' : 'if', + 'default_levels_variable' : 'if_default_levels', }

10 years, 11 months

Check_MK Git: check_mk: table statehist: no longer computes an unmonitored

by Andreas Boesl

Module: check_mk Branch: master Commit: d4235d710569f44caf0cd2699791952bedb8cd18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4235d710569f4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 25 12:37:25 2013 +0200 table statehist: no longer computes an unmonitored state for hosts and services in certain instances --- ChangeLog | 3 +++ livestatus/src/LogEntry.h | 1 + livestatus/src/TableStateHistory.cc | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b34bfca..55101fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,9 @@ Livestatus: * Removed "livecheck". It never was really stable. Nagios4 has something similar built in. And also the Check_MK Micro Core. + * table statehist: no longer computes an unmonitored state for hosts and + services on certain instances. + (showed up as no hosts/services in the multisite gui) 1.2.3i4: Core: diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index b744b64..1a3d18c 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -33,6 +33,7 @@ #define LOGCLASS_COMMAND 5 // external commands #define LOGCLASS_STATE 6 // initial or current states #define LOGCLASS_TEXT 7 // specific text passages. e.g "logging initial states" + // TODO: This LOGCLASS sets different logclasses on match -> fix this #define LOGCLASS_INVALID -1 // never stored #define LOGCLASS_ALL 0xffff diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 4848bd5..6a6d93c 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -115,7 +115,7 @@ struct HostServiceState { extern Store *g_store; -#define CLASSMASK_STATEHIST 0xC2 +#define CLASSMASK_STATEHIST 0xC6 // Debug information int total_update_calls = 0;

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0942

by Andreas Boesl

Module: check_mk Branch: master Commit: 8352e36b0e3e03b9cfbe9cb50aed743255ce23b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8352e36b0e3e03… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 24 16:16:37 2013 +0200 Updated bug entries #0942 --- .bugs/942 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/942 b/.bugs/942 new file mode 100644 index 0000000..d85870b --- /dev/null +++ b/.bugs/942 @@ -0,0 +1,12 @@ +Title: Painter log_type paints wrong data +Component: multisite +State: open +Date: 2013-10-24 16:14:43 +Targetversion: 1.2.3i6 +Class: bug + +This painter should contain SERVICE_ALERT / HOST_ALERT / ... +however the painter displayed +Warning: Check result queue contained results for + +-> livestatus issue

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits