Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 1071656b0ecf8f231c0f6fe72933be59ec702aaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1071656b0ecf8f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 11:52:13 2016 +0200 Revert "fixed typo" Not only fixed typo, ups This reverts commit 1b9c224e99a549002af84ee7b6f9977170c65e04. --- checks/fileinfo | 2 +- checks/oracle_tablespaces | 20 +++----------------- web/plugins/wato/check_parameters.py | 21 --------------------- 3 files changed, 4 insertions(+), 39 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index dc37936..5d52695 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -89,7 +89,7 @@ def fileinfo_groups_of_file(check_filename, reftime): incl_match = fnmatch.fnmatch(check_filename, inclusion) if exclusion.startswith("~"): - reg = regex(exclusion[1:]) + reg = regex(exlusion[1:]) excl_match = reg.match( check_filename ) else: excl_match = fnmatch.fnmatch(check_filename, exclusion) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 573a400..7e799cc 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -224,7 +224,6 @@ def check_oracle_tablespaces(item, params, parsed): num_increments = 0 increment_size = 0 free_space = 0 - dfs_recover_offline = {} # Conversion of old autochecks params if type(params) == tuple: @@ -235,18 +234,9 @@ def check_oracle_tablespaces(item, params, parsed): for datafile in tablespace["datafiles"]: - df_file_online_status = datafile["file_online_status"] - if df_file_online_status in [ "OFFLINE", "RECOVER" ]: - if params.get("set_file_online_status"): - dfs_recover_offline.setdefault(df_file_online_status, { - "state" : params["set_file_online_status"][df_file_online_status], - "sids" : [], - }) - dfs_recover_offline[df_file_online_status]["sids"].append(sid) - - else: - yield 2, "One or more datafiles OFFLINE or RECOVER" - return + if datafile["file_online_status"] in [ "OFFLINE", "RECOVER" ]: + yield 2, "One or more datafiles OFFLINE or RECOVER" + return num_files += 1 if datafile["status"] in [ "AVAILABLE", "ONLINE", "READONLY" ]: @@ -357,10 +347,6 @@ def check_oracle_tablespaces(item, params, parsed): yield 0, "%d data files (%d avail, %d autoext)" % \ (num_files, num_avail, num_extensible) - for df_file_online_status, this_state_info in dfs_recover_offline: - this_state = this_state_info["state"] - yield this_state, "Datafiles %s: %s" % (this_state, ", ".join(this_state_info["sids"])) - check_info['oracle_tablespaces'] = { "parse_function" : parse_oracle_tablespaces, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0b9ab66..8aa8c29 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7418,27 +7418,6 @@ register_check_parameters( ] ) ), - ( "set_file_online_status", - Dictionary( - title = _("Interpretation of datafiles' file online states RECOVER or OFFLINE"), - help = _("If specified the datafiles with state RECOVER or OFFLINE are collected"), - elements = [ - ( "RECOVER", - MonitoringState( - title = _("Interpretation of RECOVER state"), - default_value = 2, - ) - ), - ( "OFFLINE", - MonitoringState( - title = _("Interpretation of OFFLINE state"), - default_value = 2, - ) - ), - ], - required_keys = [ "RECOVER", "OFFLINE" ] - ), - ), ], ), TextAscii(

7 years, 11 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 1b9c224e99a549002af84ee7b6f9977170c65e04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b9c224e99a549… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 11:51:52 2016 +0200 fixed typo --- checks/fileinfo | 2 +- checks/oracle_tablespaces | 20 +++++++++++++++++--- web/plugins/wato/check_parameters.py | 21 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 5d52695..dc37936 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -89,7 +89,7 @@ def fileinfo_groups_of_file(check_filename, reftime): incl_match = fnmatch.fnmatch(check_filename, inclusion) if exclusion.startswith("~"): - reg = regex(exlusion[1:]) + reg = regex(exclusion[1:]) excl_match = reg.match( check_filename ) else: excl_match = fnmatch.fnmatch(check_filename, exclusion) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 7e799cc..573a400 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -224,6 +224,7 @@ def check_oracle_tablespaces(item, params, parsed): num_increments = 0 increment_size = 0 free_space = 0 + dfs_recover_offline = {} # Conversion of old autochecks params if type(params) == tuple: @@ -234,9 +235,18 @@ def check_oracle_tablespaces(item, params, parsed): for datafile in tablespace["datafiles"]: - if datafile["file_online_status"] in [ "OFFLINE", "RECOVER" ]: - yield 2, "One or more datafiles OFFLINE or RECOVER" - return + df_file_online_status = datafile["file_online_status"] + if df_file_online_status in [ "OFFLINE", "RECOVER" ]: + if params.get("set_file_online_status"): + dfs_recover_offline.setdefault(df_file_online_status, { + "state" : params["set_file_online_status"][df_file_online_status], + "sids" : [], + }) + dfs_recover_offline[df_file_online_status]["sids"].append(sid) + + else: + yield 2, "One or more datafiles OFFLINE or RECOVER" + return num_files += 1 if datafile["status"] in [ "AVAILABLE", "ONLINE", "READONLY" ]: @@ -347,6 +357,10 @@ def check_oracle_tablespaces(item, params, parsed): yield 0, "%d data files (%d avail, %d autoext)" % \ (num_files, num_avail, num_extensible) + for df_file_online_status, this_state_info in dfs_recover_offline: + this_state = this_state_info["state"] + yield this_state, "Datafiles %s: %s" % (this_state, ", ".join(this_state_info["sids"])) + check_info['oracle_tablespaces'] = { "parse_function" : parse_oracle_tablespaces, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8aa8c29..0b9ab66 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7418,6 +7418,27 @@ register_check_parameters( ] ) ), + ( "set_file_online_status", + Dictionary( + title = _("Interpretation of datafiles' file online states RECOVER or OFFLINE"), + help = _("If specified the datafiles with state RECOVER or OFFLINE are collected"), + elements = [ + ( "RECOVER", + MonitoringState( + title = _("Interpretation of RECOVER state"), + default_value = 2, + ) + ), + ( "OFFLINE", + MonitoringState( + title = _("Interpretation of OFFLINE state"), + default_value = 2, + ) + ), + ], + required_keys = [ "RECOVER", "OFFLINE" ] + ), + ), ], ), TextAscii(

7 years, 11 months

3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde

by Simon Betz

Module: check_mk Branch: master Commit: 732c87d4bdcb7f68311740bd6470e249ec4d26b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=732c87d4bdcb7f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 11 11:42:36 2016 +0200 3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde --- .werks/3956 | 9 +++++++++ ChangeLog | 1 + checks/fileinfo | 21 +++++++++++++++++---- web/plugins/wato/check_parameters.py | 6 ++++-- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.werks/3956 b/.werks/3956 new file mode 100644 index 0000000..1d48cca --- /dev/null +++ b/.werks/3956 @@ -0,0 +1,9 @@ +Title: fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476178717 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b54045a..7b0cc4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 3913 gude_relayport, gude_temp, gude_humidity: new checks and relayport check now monitors electricity * 3954 postfix_mailq_status: new check which monitors the status of postfix mail instances * 3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO... + * 3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checks/fileinfo b/checks/fileinfo index ff5201a..5d52695 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -73,17 +73,30 @@ def fileinfo_process_date(pattern, reftime): return pattern -def fileinfo_groups_of_file(check_filename,reftime): +def fileinfo_groups_of_file(check_filename, reftime): groups = [] for line in host_extra_conf(g_hostname, fileinfo_groups): for group_name, pattern in line: if type(pattern) == str: # support old format pattern = ( pattern, '' ) + inclusion, exclusion = pattern - inclusion = fileinfo_process_date(inclusion,reftime) - if fnmatch.fnmatch(check_filename, inclusion) \ - and not fnmatch.fnmatch(check_filename, exclusion): + if inclusion.startswith("~"): + reg = regex(inclusion[1:]) + incl_match = reg.match( check_filename ) + else: + inclusion = fileinfo_process_date(inclusion, reftime) + incl_match = fnmatch.fnmatch(check_filename, inclusion) + + if exclusion.startswith("~"): + reg = regex(exlusion[1:]) + excl_match = reg.match( check_filename ) + else: + excl_match = fnmatch.fnmatch(check_filename, exclusion) + + if incl_match and not excl_match: groups.append(group_name) + return groups def fileinfo_check_timeranges(params): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index eba58d5..8aa8c29 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4300,7 +4300,9 @@ register_rule(group + '/' + subgroup_storage, 'not only for the total size and the age of the oldest/youngest ' 'file but also on the count. You can define one or several ' 'patterns for a group containing <tt>*</tt> and <tt>?</tt>, for example ' - '<tt>/var/log/apache/*.log</tt>. For files contained in a group ' + '<tt>/var/log/apache/*.log</tt>. If the pattern begins with a tilde then ' + 'this pattern is interpreted as a regular expression otherwise it is a ' + 'glob. For files contained in a group ' 'the discovery will automatically create a group service instead ' 'of single services for each file. This rule also applies when ' 'you use manually configured checks instead of inventorized ones. ' @@ -4314,7 +4316,7 @@ register_rule(group + '/' + subgroup_storage, 'The YESTERDAY syntax simply subtracts one day from the reference time.'), valuespec = ListOf( Tuple( - help = _("This defines one file grouping pattern"), + help = _("This defines one file grouping pattern."), show_titles = True, orientation = "horizontal", elements = [

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b14890ea9903aba18bf389c03d8f13a54a5d6b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b14890ea9903ab… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 11 10:24:28 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistColumn.cc | 4 +- livestatus/src/AttributelistFilter.cc | 5 +- livestatus/src/Column.cc | 4 +- livestatus/src/Column.h | 17 +- livestatus/src/CustomVarsFilter.cc | 2 +- livestatus/src/DoubleFilter.cc | 4 +- livestatus/src/DowntimesOrComments.cc | 9 +- livestatus/src/DowntimesOrComments.h | 3 + livestatus/src/DynamicLogwatchFileColumn.cc | 9 +- livestatus/src/EventConsoleConnection.cc | 23 +- livestatus/src/EventConsoleConnection.h | 4 +- livestatus/src/Filter.cc | 3 + livestatus/src/Filter.h | 5 + livestatus/src/HostFileColumn.cc | 10 +- livestatus/src/HostlistFilter.cc | 4 +- livestatus/src/InputBuffer.cc | 16 +- livestatus/src/InputBuffer.h | 4 +- livestatus/src/IntFilter.cc | 12 +- livestatus/src/ListFilter.cc | 9 +- livestatus/src/LogCache.cc | 33 +- livestatus/src/LogCache.h | 2 + livestatus/src/Logfile.cc | 39 ++- livestatus/src/Logfile.h | 2 + livestatus/src/Logger.cc | 102 +++--- livestatus/src/Logger.h | 162 +++++++-- livestatus/src/OffsetStringMacroColumn.cc | 3 +- livestatus/src/OutputBuffer.cc | 10 +- livestatus/src/OutputBuffer.h | 4 +- livestatus/src/Query.cc | 59 ++-- livestatus/src/Query.h | 6 +- livestatus/src/Renderer.cc | 24 +- livestatus/src/Renderer.h | 7 +- livestatus/src/RendererBrokenCSV.cc | 4 +- livestatus/src/RendererBrokenCSV.h | 2 +- livestatus/src/RendererCSV.cc | 5 +- livestatus/src/RendererCSV.h | 2 +- livestatus/src/RendererJSON.cc | 5 +- livestatus/src/RendererJSON.h | 2 +- livestatus/src/RendererPython.cc | 5 +- livestatus/src/RendererPython.h | 3 +- livestatus/src/RendererPython3.cc | 5 +- livestatus/src/RendererPython3.h | 3 +- livestatus/src/ServicelistFilter.cc | 11 +- livestatus/src/Store.cc | 56 ++-- livestatus/src/Store.h | 4 +- livestatus/src/StringUtils.cc | 29 +- livestatus/src/StringUtils.h | 9 +- livestatus/src/Table.cc | 10 +- livestatus/src/Table.h | 5 +- livestatus/src/TableColumns.cc | 2 +- livestatus/src/TableColumns.h | 3 +- livestatus/src/TableCommands.cc | 5 +- livestatus/src/TableCommands.h | 3 +- livestatus/src/TableComments.cc | 5 +- livestatus/src/TableComments.h | 3 +- livestatus/src/TableContactgroups.cc | 2 +- livestatus/src/TableContactgroups.h | 3 +- livestatus/src/TableContacts.cc | 4 +- livestatus/src/TableContacts.h | 3 +- livestatus/src/TableDowntimes.cc | 5 +- livestatus/src/TableDowntimes.h | 3 +- livestatus/src/TableEventConsole.cc | 5 +- livestatus/src/TableEventConsole.h | 3 +- livestatus/src/TableEventConsoleEvents.cc | 3 +- livestatus/src/TableEventConsoleEvents.h | 4 +- livestatus/src/TableEventConsoleHistory.cc | 3 +- livestatus/src/TableEventConsoleHistory.h | 4 +- livestatus/src/TableEventConsoleReplication.cc | 12 +- livestatus/src/TableEventConsoleReplication.h | 4 +- livestatus/src/TableEventConsoleStatus.cc | 3 +- livestatus/src/TableEventConsoleStatus.h | 4 +- livestatus/src/TableHostgroups.cc | 4 +- livestatus/src/TableHostgroups.h | 3 +- livestatus/src/TableHosts.cc | 4 +- livestatus/src/TableHosts.h | 3 +- livestatus/src/TableHostsByGroup.cc | 3 +- livestatus/src/TableHostsByGroup.h | 4 +- livestatus/src/TableLog.cc | 15 +- livestatus/src/TableLog.h | 3 +- livestatus/src/TableServicegroups.cc | 4 +- livestatus/src/TableServicegroups.h | 3 +- livestatus/src/TableServices.cc | 4 +- livestatus/src/TableServices.h | 3 +- livestatus/src/TableServicesByGroup.cc | 3 +- livestatus/src/TableServicesByGroup.h | 4 +- livestatus/src/TableServicesByHostGroup.cc | 3 +- livestatus/src/TableServicesByHostGroup.h | 4 +- livestatus/src/TableStateHistory.cc | 15 +- livestatus/src/TableStateHistory.h | 4 +- livestatus/src/TableStatus.cc | 2 +- livestatus/src/TableStatus.h | 4 +- livestatus/src/TableTimeperiods.cc | 2 +- livestatus/src/TableTimeperiods.h | 3 +- livestatus/src/TimeperiodsCache.cc | 15 +- livestatus/src/TimeperiodsCache.h | 13 +- livestatus/src/VariadicFilter.cc | 7 +- livestatus/src/mk_logwatch.cc | 10 +- livestatus/src/module.cc | 436 +++++++++++++------------ 98 files changed, 835 insertions(+), 589 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b14890ea99…

7 years, 11 months

3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO

by Marcel Arentz

Module: check_mk Branch: master Commit: 275a62c08b58531e2d97a216749236b336b045b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=275a62c08b5853… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 10 18:42:37 2016 +0200 3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO Memory on fortigate clusters are now configurable by WATO similar to other memory checks. --- .werks/3945 | 9 +++++++++ ChangeLog | 1 + checks/fortigate_node | 34 ++++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 14 deletions(-) diff --git a/.werks/3945 b/.werks/3945 new file mode 100644 index 0000000..4ae604c --- /dev/null +++ b/.werks/3945 @@ -0,0 +1,9 @@ +Title: fortigate_node: Memory on fortigate clusters are now configurable by WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476117532 +Class: feature + +Memory on fortigate clusters are now configurable by WATO similar to other memory checks. diff --git a/ChangeLog b/ChangeLog index de0a0ee..b54045a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 3912 elphase.include: now device states can be mapped to monitoring states * 3913 gude_relayport, gude_temp, gude_humidity: new checks and relayport check now monitors electricity * 3954 postfix_mailq_status: new check which monitors the status of postfix mail instances + * 3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO... * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checks/fortigate_node b/checks/fortigate_node index 521695a..4bc1b10 100644 --- a/checks/fortigate_node +++ b/checks/fortigate_node @@ -165,34 +165,38 @@ check_info["fortigate_node.cpu"] = { # '----------------------------------------------------------------------' -fortigate_node_memory_default_levels = (70, 80) +#fortigate_node_memory_default_levels = (70, 80) +factory_settings['fortigate_node_memory_default_levels'] = { + 'levels' : ( 70.0, 80.0 ), +} def inventory_fortigate_node_mem(parsed): for hostname in parsed["nodes"]: - yield hostname, "fortigate_node_memory_default_levels" + yield hostname, {} def check_fortigate_node_mem(item, params, parsed): if item in parsed["nodes"]: - if type(params) == dict: - params = params["levels"] - + status = 3 + current = parsed["nodes"][item]["memory"] # This check is only able to check the used space # The checkgroup "memory" might set negative values which act as levels for free space # These levels are converted to used space, too.. - warn, crit = map(abs, params) - - current = parsed["nodes"][item]["memory"] + if type(params) == dict: + warn, crit = map(abs, params["levels"]) + else: + warn, crit = map(abs, params) - status = 0 if current >= crit: status = 2 elif current >= warn: status = 1 + else: + status = 0 if status > 0: - wcsuffix = ", (warn/crit at %d/%d)" % (warn, crit) + wcsuffix = ", (warn/crit at %d/%d)" % (float(warn), float(crit)) else: wcsuffix = "" @@ -201,10 +205,12 @@ def check_fortigate_node_mem(item, params, parsed): check_info["fortigate_node.memory"] = { - "inventory_function" : inventory_fortigate_node_mem, - "check_function" : check_fortigate_node_mem, - "service_description" : "Memory usage %s", - "has_perfdata" : True, + "inventory_function" : inventory_fortigate_node_mem, + "check_function" : check_fortigate_node_mem, + "service_description" : "Memory usage %s", + "has_perfdata" : True, + "default_levels_variable" : "fortigate_node_memory_default_levels", + "group" : "fortigate_node_memory", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index adc6508..eba58d5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4051,6 +4051,40 @@ register_check_parameters( ) #. +# .--Os------------------------------------------------------------------. +# | ___ | +# | / _ \ ___ | +# | | | | / __| | +# | | |_| \__ \ | +# | \___/|___/ | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +register_check_parameters( + subgroup_os, + "fortigate_node_memory", + _("Fortigate node memory"), + Dictionary( + elements = [ + ("levels", Tuple ( + title = _("Levels"), + elements = [ + Percentage(title = _("Warning at"), default_value = 70.0, ), + Percentage(title = _("Critical at"), default_value = 80.0, ), + ], + )) + ], + ), + TextAscii( + title = _("node"), + ), + "dict", +) + + +#. # .--Unsorted--(Don't create new stuff here!)----------------------------. # | _ _ _ _ | # | | | | |_ __ ___ ___ _ __| |_ ___ __| | |

7 years, 11 months

Added todo

by Lars Michelsen

Module: check_mk Branch: master Commit: 24a751df3a319299ae63c0170b7885947614d0ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24a751df3a3192… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 16:18:10 2016 +0200 Added todo --- lib/paths.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/paths.py b/lib/paths.py index 0a4bcfd..b84d44b 100644 --- a/lib/paths.py +++ b/lib/paths.py @@ -171,6 +171,9 @@ def _set_core_specific_paths(): }) +# TODO: Find a better way to determine the currently configured core. +# For example generalize the etc/check_mk/conf.d/microcore.mk which is written by the CORE +# hook -> Change the name to core.mk and write it for all configured cores. def _get_core_name(): try: for l in open(os.path.join(omd_root, "etc/omd/site.conf")):

7 years, 11 months

3896 FIX Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ea9d4d31eaf9854f72413b8d7f57edf69b46517 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ea9d4d31eaf98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 15:42:52 2016 +0200 3896 FIX Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm --- .werks/3896 | 9 +++++++++ ChangeLog | 1 + agents/check-mk-agent.spec | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/3896 b/.werks/3896 new file mode 100644 index 0000000..fed55be --- /dev/null +++ b/.werks/3896 @@ -0,0 +1,9 @@ +Title: Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476106561 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3250114..de0a0ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 3909 FIX: postfix_mailq: fixed readout postfix config * 3748 FIX: vertias_vcs: Fix empty agent section for standard xinetd configuration... * 3935 FIX: FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core + * 3896 FIX: Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index cd81e8c..6c3d1b1 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -35,6 +35,7 @@ AutoReq: off AutoProv: off BuildArch: noarch Obsoletes: check_mk-agent check_mk_agent +Provides: check_mk-agent check_mk_agent %description The Check_MK Agent uses xinetd to provide information about the system

7 years, 11 months

3955 BI rule ID can now be renamed

by Simon Betz

Module: check_mk Branch: master Commit: ad1dac0ac09229e84cf8ae9f8c27974b5b2b4d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad1dac0ac09229… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 10 14:40:12 2016 +0200 3955 BI rule ID can now be renamed --- .werks/3955 | 9 +++++++ ChangeLog | 3 +++ web/plugins/wato/bi.py | 66 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/.werks/3955 b/.werks/3955 new file mode 100644 index 0000000..213bcc0 --- /dev/null +++ b/.werks/3955 @@ -0,0 +1,9 @@ +Title: BI rule ID can now be renamed +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i2 +Date: 1476103155 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bfd956e..3250114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,9 @@ * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... + BI: + * 3955 BI rule ID can now be renamed + Livestatus: * 3740 Moved livedump utility from treasures directly into bin directory... diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index adb4ae0..2463647 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1351,10 +1351,29 @@ class ModeBIEditRule(ModeBI): def action(self): self.must_be_contact_for_pack() - if html.check_transaction(): - vs_rule = self.valuespec() - new_rule = vs_rule.from_html_vars('rule') - vs_rule.validate_value(new_rule, 'rule') + + vs_rule = self.valuespec() + new_rule = vs_rule.from_html_vars('rule') + vs_rule.validate_value(new_rule, 'rule') + + if self._ruleid and self._ruleid != new_rule["id"]: + existing_ruleid = self._ruleid + new_ruleid = new_rule["id"] + c = wato_confirm(_("Confirm renaming existing BI rule"), + _("Do you really want to rename the existing BI rule %s to %s?") % \ + (existing_ruleid, new_ruleid)) + if c: + self._ruleid = new_ruleid + del self._pack["rules"][existing_ruleid] + self._pack["rules"][new_ruleid] = new_rule + self._rename_existing_ruleid_after_confirm(existing_ruleid) + log_pending(SYNC, None, "bi-edit-rule", _("Renamed BI rule %s") % self._ruleid) + self.save_config() + + else: + return False + + elif html.check_transaction(): if self._new: self._ruleid = new_rule["id"] @@ -1365,6 +1384,7 @@ class ModeBIEditRule(ModeBI): _("There is already a rule with the id %s. " "It is in the pack %s and as the title %s") % ( self._ruleid, pack["title"], existing_rule["title"])) + if not new_rule["nodes"]: raise MKUserError(None, _("Please add at least one child node. Empty rules are useless.")) @@ -1380,11 +1400,25 @@ class ModeBIEditRule(ModeBI): raise MKUserError(None, _("There is a cycle in your rules. This rule calls itself - " "either directly or indirectly.")) log_pending(SYNC, None, "bi-edit-rule", _("Modified BI rule %s") % self._ruleid) + self.save_config() return "bi_rules" + def _rename_existing_ruleid_after_confirm(self, existing_ruleid): + for packinfo in self._packs.values(): + for rule_id, rule_info in packinfo['rules'].items(): + new_nodes = [] + for this_node in rule_info.get('nodes', []): + node_ty, node_info = this_node + if node_ty == 'call' and existing_ruleid == node_info[0]: + new_nodes.append( ('call', tuple( [self._ruleid] + list(node_info)[1:] )) ) + else: + new_nodes.append( this_node ) + rule_info['nodes'] = new_nodes + + def page(self): if self._new: cloneid = html.var("clone") @@ -1410,6 +1444,16 @@ class ModeBIEditRule(ModeBI): def valuespec(self): elements = [ + ( "id", + TextAscii( + title = _("Unique Rule ID"), + help = _("The ID of the rule must be a unique text. It will be used as an internal key " + "when rules refer to each other. The rule IDs will not be visible in the status " + "GUI. They are just used within the configuration."), + allow_empty = False, + size = 24, + ), + ), ( "title", TextUnicode( title = _("Rule Title"), @@ -1473,20 +1517,6 @@ class ModeBIEditRule(ModeBI): ), ] - - if self._new: - elements = [ - ( "id", - TextAscii( - title = _("Unique Rule ID"), - help = _("The ID of the rule must be a unique text. It will be used as an internal key " - "when rules refer to each other. The rule IDs will not be visible in the status " - "GUI. They are just used within the configuration."), - allow_empty = False, - size = 24, - ), - )] + elements - return Dictionary( title = _("General Properties"), optional_keys = False,

7 years, 11 months

RegExp valuespec: mode is now a mandatory positional argument

by Lars Michelsen

Module: check_mk Branch: master Commit: bd7950d107166748f39767c57b998e2ddd38f50a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd7950d1071667… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 13:36:02 2016 +0200 RegExp valuespec: mode is now a mandatory positional argument --- web/htdocs/valuespec.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 124f935..d6e3f0d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -518,9 +518,8 @@ class RegExp(TextAscii): prefix = "prefix" complete = "complete" - # TODO: Make "mode" a positional argument - def __init__(self, help=None, **kwargs): - self._mode = kwargs.get("mode") + def __init__(self, mode, help=None, **kwargs): + self._mode = mode self._case_sensitive = kwargs.get("case_sensitive", True) TextAscii.__init__(self,

7 years, 11 months

Small cleanup of service condition rendering in rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 6861663f2da5f4bfd6ed2c7ab005da8917cf20e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6861663f2da5f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 13:44:41 2016 +0200 Small cleanup of service condition rendering in rule editor --- web/htdocs/wato.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 004dc1a..a85bf7b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9880,7 +9880,10 @@ def load_notification_table(): help = _("Configure the hosts for this notification. Without prefix, only exact, case sensitive matches, " "<tt>!</tt> for negation and <tt>~</tt> for regex matches."), orientation = "horizontal", - valuespec = RegExp(size = 20), + # TODO: Clean this up to use an alternative between TextAscii() and RegExp(). Also handle the negation in a different way + valuespec = TextAscii( + size = 20, + ), ), ), ( "only_services", @@ -9889,7 +9892,10 @@ def load_notification_table(): help = _("Configure regular expressions that match the beginning of the service names here. Prefix an " "entry with <tt>!</tt> in order to exclude that service."), orientation = "horizontal", - valuespec = RegExp(size = 20), + # TODO: Clean this up to use an alternative between TextAscii() and RegExp(). Also handle the negation in a different way + valuespec = TextAscii( + size = 20, + ), validate = validate_only_services, ), ), @@ -9898,7 +9904,10 @@ def load_notification_table(): title = _("Blacklist the following services"), help = _("Configure regular expressions that match the beginning of the service names here."), orientation = "horizontal", - valuespec = RegExp(size = 20), + valuespec = RegExp( + size = 20, + mode = RegExp.prefix, + ), validate = validate_only_services, ), ), @@ -13028,7 +13037,7 @@ def get_rule_conditions(ruleset): itemspec = ListChoice(choices = itemenum, columns = 3) item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] else: - vs = ListOfStrings(valuespec = RegExpUnicode()) + vs = vs_rule_service_conditions() item_list = vs.from_html_vars("itemlist") vs.validate_value(item_list, "itemlist") @@ -13049,6 +13058,16 @@ def get_rule_conditions(ruleset): return tag_list, host_list, item_list +def vs_rule_service_conditions(): + return ListOfStrings( + orientation = "horizontal", + valuespec = RegExpUnicode( + size = 30, + mode = RegExpUnicode.prefix + ), + ) + + def date_and_user(): return time.strftime("%F", time.localtime()) + " " + config.user.id + ": " @@ -13294,9 +13313,7 @@ def mode_edit_rule(phase, new = False): itemspec = ListChoice(choices = itemenum, columns = 3) itemspec.render_input("item", value) else: - ListOfStrings( - orientation = "horizontal", - valuespec = RegExpUnicode(size = 30)).render_input("itemlist", cleaned_item_list) + vs_rule_service_conditions().render_input("itemlist", cleaned_item_list) html.write(" ") html.checkbox("negate_entries", negate_entries, label =

7 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016