Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Better output of skipped checks in verbose commandline mode

by Mathias Kettner

Module: check_mk Branch: master Commit: f81d16575a09f7e1901d40bd6d18178ee5b1a725 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f81d16575a09f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 22 17:29:00 2015 +0100 Better output of skipped checks in verbose commandline mode --- modules/check_mk_base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 28d1749..1459ce3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1310,8 +1310,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): # handling of wrapped counters via exception. Do not submit # any check result in that case: except MKCounterWrapped, e: - if opt_verbose: - print "Cannot compute check result: %s" % e + verbose("%-20s PEND - Cannot compute check result: %s\n" % (description, e)) dont_submit = True except Exception, e:

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2270

by Mathias Kettner

Module: check_mk Branch: master Commit: 9eb6b4028963b5a3187108480a51d6279d5dfa11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eb6b4028963b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 22 14:46:18 2015 +0100 Updated bug entries #2270 --- .bugs/2270 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2270 b/.bugs/2270 new file mode 100644 index 0000000..aa7346c --- /dev/null +++ b/.bugs/2270 @@ -0,0 +1,8 @@ +Title: Fix many WATO rules where above needs to be replaced with at +Component: checks +State: open +Date: 2015-01-22 14:45:46 +Targetversion: 1.2.5i1 +Class: bug + +There is a commit that needs to be reverted.

9 years, 9 months

Check_MK Git: check_mk: #1847 FIX oracle_logswitches: Fixed description of WATO rule for levels

by Mathias Kettner

Module: check_mk Branch: master Commit: de9c297a3650de96af017f9c6fb8c1592aa46f8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de9c297a3650de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 22 14:44:34 2015 +0100 #1847 FIX oracle_logswitches: Fixed description of WATO rule for levels Both levels are compared with <= or >=. The description now clearly shows this. --- .werks/1847 | 11 +++++++++++ ChangeLog | 3 ++- web/plugins/wato/check_parameters.py | 8 ++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/1847 b/.werks/1847 new file mode 100644 index 0000000..335d896 --- /dev/null +++ b/.werks/1847 @@ -0,0 +1,11 @@ +Title: oracle_logswitches: Fixed description of WATO rule for levels +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421934217 + +Both levels are compared with <= or >=. The description now clearly +shows this. diff --git a/ChangeLog b/ChangeLog index d0ae087..ef85f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,9 +99,10 @@ NOTE: Please refer to the migration notes! * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... - * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm * 1874 FIX: ps: Old process inventory configurations work now again... * 1875 FIX: Fixed possible exceptions of CMC Check_MK helpers when using some custom checks... + * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm + * 1847 FIX: oracle_logswitches: Fixed description of WATO rule for levels... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index cca93b2..62aec36 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3550,10 +3550,10 @@ register_check_parameters( help = _("This check monitors the number of log switches of an ORACLE " "database instance in the last 60 minutes. You can set levels for upper and lower bounds."), elements = [ - Integer(title = _("Critical if fewer than"), unit=_("log switches")), - Integer(title = _("Warning if fewer than"), unit=_("log switches")), - Integer(title = _("Warning if more than"), unit=_("log switches")), - Integer(title = _("Critical if more than"), unit=_("log switches")), + Integer(title = _("Critical at or below"), unit=_("log switches / hour"), default_value = -1), + Integer(title = _("Warning at or below"), unit=_("log switches / hour"), default_value = -1), + Integer(title = _("Warning at or above"), unit=_("log switches / hour"), default_value = 50), + Integer(title = _("Critical at or above"), unit=_("log switches / hour"), default_value = 100), ]), TextAscii( title = _("Database SID"),

9 years, 9 months

Check_MK Git: check_mk: Interface groups: changed input field of interface port type to dropdown choice

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d1a7c59f245da36176bb7ec8f77e9191c4bd8a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d1a7c59f245da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 22 14:28:21 2015 +0100 Interface groups: changed input field of interface port type to dropdown choice --- web/plugins/wato/check_parameters.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index de4bfac..cca93b2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4669,20 +4669,23 @@ register_rule(group + '/' + subgroup_networking, help = _("Name of group in service description"), allow_empty = False, )), - ("iftype", Integer( - title = _("Restrict interface port type"), - help = _("Only interfaces with the given port type are put into this group. " - "For example 53 (propVirtual)."), - default_value = 6, - minvalue = 1, - maxvalue = 255, + ("iftype", Transform( + DropdownChoice( + title = _("Select interface port type"), + choices = _if_porttype_choices, + help = _("Only interfaces with the given port type are put into this group. " + "For example 53 (propVirtual)."), + ), + forth = lambda x: str(x), + back = lambda x: int(x), )), ("include_items", ListOfStrings( title = _("Restrict interface items"), help = _("Only interface with this item names are put into this group."), )), ("single", Checkbox( - title = _("Do not list grouped interfaces separately"), + title = _("Group separately"), + label = _("Do not list grouped interfaces separately"), )), ], required_keys = ["name", "single"]),

9 years, 9 months

Check_MK Git: check_mk: #1858 FIX docsis_channels_downstream:

by Goetz Golla

allow for negative values of power in dBm Message-ID: <54c0ece5.LgvPok4Lh7wXcLgP%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1434871de12c39bdf02037683ac5f3c128250c69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1434871de12c39… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jan 22 13:27:36 2015 +0100 #1858 FIX docsis_channels_downstream: allow for negative values of power in dBm --- .werks/1858 | 9 +++++++++ ChangeLog | 1 + checks/docsis_channels_downstream | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1858 b/.werks/1858 new file mode 100644 index 0000000..1eefa41 --- /dev/null +++ b/.werks/1858 @@ -0,0 +1,9 @@ +Title: docsis_channels_downstream: allow for negative values of power in dBm +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421929594 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7281e67..1cff9a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ NOTE: Please refer to the migration notes! * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... + * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/docsis_channels_downstream b/checks/docsis_channels_downstream index 10d0d6a..f4109b5 100644 --- a/checks/docsis_channels_downstream +++ b/checks/docsis_channels_downstream @@ -38,7 +38,7 @@ def check_docsis_channels_downstream(item, params, info): if channel_id == item: # Power warn, crit = params["power"] - power_dbmv = abs(float(int(power))) / 10 + power_dbmv = float(int(power)) / 10 infotext = "Power is %.1f dBmV" % power_dbmv levels = " (Levels Warn/Crit at %d dBmV/ %d dBmV)" % ( warn, crit ) state = 0

9 years, 9 months

Check_MK Git: check_mk: #1876 FIX User sorting of views can now be disabled again

by Lars Michelsen

Module: check_mk Branch: master Commit: 5350718b04182a3ceee6f351e8733345404d954e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5350718b04182a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 12:16:27 2015 +0100 #1876 FIX User sorting of views can now be disabled again --- .werks/1876 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1876 b/.werks/1876 new file mode 100644 index 0000000..80f09c3 --- /dev/null +++ b/.werks/1876 @@ -0,0 +1,10 @@ +Title: User sorting of views can now be disabled again +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421925361 + + diff --git a/ChangeLog b/ChangeLog index 137e94a..a94d7cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 1870 FIX: Joined columns were empty in CSV, JSON or PYTHON exports of view... * 1871 FIX: Site filter is only shown as host related filter now... * 1872 FIX: View editor hides filter selection for object types which have no filter to choose... + * 1876 FIX: User sorting of views can now be disabled again WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 321f65e..0d0d2bc 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2237,7 +2237,7 @@ def paint_header(view, p): onclick = '' title = '' if 'L' in html.display_options \ - and view.get('user_sortable', True) \ + and view.get('user_sortable', False) \ and get_sorter_name_of_painter(painter) is not None: params = [ ('sort', sort_url(view, painter, join_index)),

9 years, 9 months

Check_MK Git: check_mk: logwatch: added some useful check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 007b7b7715cf17dc0b9e7010a87840ae1b9f37c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=007b7b7715cf17… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 22 12:13:57 2015 +0100 logwatch: added some useful check output --- checks/logwatch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index d24596d..5dd602f 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -589,6 +589,11 @@ def check_logwatch_ec(item, params, info): if "logwatch_patterns" not in params: logwatch_ec_precompile(g_hostname, None, params) + + # Keep track of reclassifed lines + rclfd_total = 0 + rclfd_to_ignore = 0 + for logfile, lines in logs.items(): # Determine logwatch patterns specifically for this logfile log_reclassify_patterns = [] @@ -602,10 +607,13 @@ def check_logwatch_ec(item, params, info): for line in lines: if log_reclassify_patterns: counts = {} # unused... - level, text = line.split(" ", 1) - level = logwatch_reclassify(counts, log_reclassify_patterns, line[2:]) or level - if level == "I": # Ignored lines are not forwarded - continue + old_level, text = line.split(" ", 1) + level = logwatch_reclassify(counts, log_reclassify_patterns, line[2:]) or old_level + if level != old_level: + rclfd_total += 1 + if level == "I": # Ignored lines are not forwarded + rclfd_to_ignore += 1 + continue msg = '<%d>' % (facility + logwatch_to_prio(line[0]),) @@ -666,6 +674,9 @@ def check_logwatch_ec(item, params, info): logfile_info = "" infotexts.append('Forwarded %d messages%s to event console' % (num_messages, logfile_info)) + if rclfd_total: + infotexts.append('Reclassified %d messages through logwatch patterns (%d to IGNORE)' % + (rclfd_total, rclfd_to_ignore)) return (status, ", ".join(infotexts), [('messages', num_messages)]) except Exception, e:

9 years, 9 months

Check_MK Git: check_mk: #1875 FIX Fixed possible exceptions of CMC Check_MK helpers when using some custom checks

by Lars Michelsen

Module: check_mk Branch: master Commit: f9238743ec4db3b6f67f48cb50cea8624ebbc88b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9238743ec4db3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 10:17:27 2015 +0100 #1875 FIX Fixed possible exceptions of CMC Check_MK helpers when using some custom checks When using the CMC together with some custom checks which register variables in the global context which can not be written out with repr() and read with eval() like for example python module references or function pointers, all Check_MK workers stopped working and were restarting in an endless loop. A verification has been added to prevent those variable from being written to the Check_MK check helper config var/check_mk/core/config.mk. --- .werks/1875 | 16 ++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 20 ++++++++++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.werks/1875 b/.werks/1875 new file mode 100644 index 0000000..4c18162 --- /dev/null +++ b/.werks/1875 @@ -0,0 +1,16 @@ +Title: Fixed possible exceptions of CMC Check_MK helpers when using some custom checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421918120 + +When using the CMC together with some custom checks which register variables +in the global context which can not be written out with repr() and read with +eval() like for example python module references or function pointers, all +Check_MK workers stopped working and were restarting in an endless loop. + +A verification has been added to prevent those variable from being written +to the Check_MK check helper config var/check_mk/core/config.mk. diff --git a/ChangeLog b/ChangeLog index ab7d841..137e94a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 1671 FIX: windows agent: fixed gaps in eventlog monitoring after agent restart... * 1856 FIX: ibm_svc_array ibm_svc_mdisk ibm_svc_mdiskgrp ibm_svc_portfc: made checks more robust for varying number of parameters of IBM SVC agent plugin... * 1874 FIX: ps: Old process inventory configurations work now again... + * 1875 FIX: Fixed possible exceptions of CMC Check_MK helpers when using some custom checks... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/modules/check_mk.py b/modules/check_mk.py index d52e6bd..89a23ac 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2967,13 +2967,25 @@ no_inventory_possible = None # the running system. derived_config_variable_names = [ "hosttags", "all_hosts_untagged" ] def pack_config(): + # Checks whether or not a variable can be written to the config.mk + # and read again from it. + def packable(varname, val): + if type(val) in [ int, str, unicode, bool ] or not val: + return True + + try: + eval(repr(val)) + return True + except: + return False + filepath = var_dir + "/core/config.mk" out = file(filepath + ".new", "w") out.write("#!/usr/bin/python\n# encoding: utf-8\n# Created by Check_MK. Dump of the currently active configuration\n\n") - for varname in config_variable_names: - out.write("\n%s = %r\n" % (varname, globals()[varname])) - for varname in derived_config_variable_names: - out.write("\n%s = %r\n" % (varname, globals()[varname])) + for varname in list(config_variable_names) + derived_config_variable_names: + val = globals()[varname] + if packable(varname, val): + out.write("\n%s = %r\n" % (varname, val)) for varname, factory_setting in factory_settings.items(): if varname in globals(): out.write("\n%s = %r\n" % (varname, globals()[varname]))

9 years, 9 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 37c2442333182916cb9df0c7e8b8dd092a9663e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37c24423331829… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 09:50:24 2015 +0100 Testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 03f8db7..ab7d841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale + 1.2.6b1: Core & Setup: * 1439 mk-job: now also available on solaris systems...

9 years, 9 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: f776489281a372e56d884b1e833e8cfabc73b433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f776489281a372… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 09:49:48 2015 +0100 Testcommit --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab7d841..03f8db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,7 +166,6 @@ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale - 1.2.6b1: Core & Setup: * 1439 mk-job: now also available on solaris systems...

9 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015