Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3531 Reduced Check_MK helper size for certain dists/python versions

by Andreas Boesl

Module: check_mk Branch: master Commit: 17ae8d394d39a4a54a129b7035acbedc29553001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17ae8d394d39a4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 17 10:37:51 2016 +0200 3531 Reduced Check_MK helper size for certain dists/python versions The config of the Check_MK check helper is now written as marshaled python code, instead of plain python text. This reduces the helpers peak resident memory size while parsing the config file. Some distributions (or python versions) tend not to shrink the resident memory of the check helper again, so the check helper size can only grow. By using marshaled config data the initial check helper size can be drastically lower. Actual use case example: System setup: <ul> <li>CentOS6</li> <li>Python 2.6</li> <li>11k Hosts</li> <li>40k Services</li> </ul> The size of the config is roughly 8MB (this highly depends on the configured rules). <table> <tr><td>Marshal config</td><td>320MB</td></tr> <tr><td>Plain text config</td><td>30MB</td></tr> </table> --- .werks/3531 | 34 ++++++++++++++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 19 ++++++++++++++----- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/.werks/3531 b/.werks/3531 new file mode 100644 index 0000000..039d728 --- /dev/null +++ b/.werks/3531 @@ -0,0 +1,34 @@ +Title: Reduced Check_MK helper size for certain dists/python versions +Level: 1 +Component: core +Compatible: compat +Version: 1.2.9i1 +Date: 1463473106 +Class: feature + +The config of the Check_MK check helper is now written as marshaled python code, +instead of plain python text. This reduces the helpers peak resident memory size +while parsing the config file. + + +Some distributions (or python versions) tend not to shrink the resident memory +of the check helper again, so the check helper size can only grow. + + +By using marshaled config data the initial check helper size can be drastically lower. +Actual use case: + +System setup +<ul> +<li>CentOS6</li> +<li>Python 2.6</li> +<li>11k Hosts</li> +<li>40k Services</li> +</ul> +The size of the config is roughly 8MB (this highly depends on the configured rules). + +<table> +<tr><td>Marshal config</td><td>320MB</td></tr> +<tr><td>Plain text config</td><td>30MB</td></tr> +</table> + diff --git a/ChangeLog b/ChangeLog index fcdc6c8..186bf86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 3342 MKP: local/lib and local/bin of sites can now be packed... * 3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default)... + * 3531 Reduced Check_MK helper size for certain dists/python versions... * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts diff --git a/modules/check_mk.py b/modules/check_mk.py index 2bfae88..f99a5d5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2421,7 +2421,7 @@ def pack_config(): except: return False - filepath = var_dir + "/core/config.mk" + filepath = var_dir + "/core/helper_config.mk" out = file(filepath + ".new", "w") out.write("#!/usr/bin/python\n" "# encoding: utf-8\n" @@ -2439,7 +2439,19 @@ def pack_config(): out.write("\nif %r in globals():\n del %s\n" % (varname, varname)) out.close() - os.rename(filepath + ".new", filepath) + + import marshal + code = compile(open(filepath + ".new").read(), '<string>', 'exec') + marshal.dump(code, open(filepath + ".compiled", "wb")) + os.rename(filepath + ".compiled", filepath) + # Remove the configs readable version + os.unlink(filepath + ".new") + + +def read_packed_config(): + import marshal + filepath = var_dir + "/core/helper_config.mk" + exec(marshal.load(open(filepath)), globals()) def pack_autochecks(): dstpath = var_dir + "/core/autochecks" @@ -2462,9 +2474,6 @@ def pack_autochecks(): if f not in needed: os.remove(dstpath + "/" + f) -def read_packed_config(): - filepath = var_dir + "/core/config.mk" - execfile(filepath, globals()) #. # .--Man-Pages-----------------------------------------------------------.

8 years, 1 month

mssql: no longer reporting a warning if relative levels have been configured for a db that has no max_size

by Sebastian Herbord

Module: check_mk Branch: master Commit: 882b16c92de7990841c1e797f9010eba18cb3a98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=882b16c92de799… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 17 09:57:18 2016 +0200 mssql: no longer reporting a warning if relative levels have been configured for a db that has no max_size --- checks/mssql.include | 24 +++++++++++++----------- web/plugins/wato/check_parameters.py | 6 ++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/checks/mssql.include b/checks/mssql.include index ed4ece6..fe91584 100644 --- a/checks/mssql.include +++ b/checks/mssql.include @@ -57,18 +57,18 @@ def inventory_mssql_datafiles(mode, info): def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, unlimited): def calculate_levels(levels, reference_value): if isinstance(levels[0], float): - if reference_value == -1: - return 0, None - else: + if reference_value != -1: return map(lambda x: (x * reference_value) / 100, levels) elif levels[0] is not None: return map(lambda x: x * 1024 * 1024, levels) - else: - return None, None + + return None, None if unlimited: max_size = -1 + rel_levels = False + for param_key, name, perf_key, value, reference_value in [ ('used_levels', "used", "data_size", used_size, max_size), ('allocated_used_levels', "allocated used", None, used_size, allocated_size), @@ -85,6 +85,8 @@ def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, u break else: warn, crit = calculate_levels(levels, reference_value) + if isinstance(levels[0], float): + rel_levels = True if crit is not None and value >= crit: status = 2 @@ -92,12 +94,9 @@ def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, u status = 1 if status > 0: - if warn == 0: - wc_msg = " (max_size is unlimited, please use absolute levels)" - else: - wc_msg = " (warn/crit at %s/%s)" % ( - get_bytes_human_readable(warn), - get_bytes_human_readable(crit)) + wc_msg = " (warn/crit at %s/%s)" % ( + get_bytes_human_readable(warn), + get_bytes_human_readable(crit)) else: wc_msg = "" @@ -114,6 +113,9 @@ def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, u name, wc_msg), \ [(perf_key, value, warn, crit, 0, reference_value)] + if unlimited and rel_levels: + yield 0, "no maximum size", [] + def check_mssql_datafiles(item, params, info): max_size_sum = allocated_size_sum = used_size_sum = 0 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d1cc396..d85c82a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6822,6 +6822,9 @@ register_check_parameters( _("MSSQL Transactionlog Sizes"), Dictionary( title = _("File Size Levels"), + help = _("Specify levels for transactionlogs of a database. Please note that relative " + "levels will only work if there is a max_size set for the file on the database " + "side."), elements = [ ("used_levels", levels_absolute_or_dynamic(_("Transactionlog"), _("used"))), ("allocated_used_levels", levels_absolute_or_dynamic(_("Transactionlog"), _("used of allocation"))), @@ -6840,6 +6843,9 @@ register_check_parameters( _("MSSQL Datafile Sizes"), Dictionary( title = _("File Size Levels"), + help = _("Specify levels for datafiles of a database. Please note that relative " + "levels will only work if there is a max_size set for the file on the database " + "side."), elements = [ ("used_levels", levels_absolute_or_dynamic(_("Datafile"), _("used"))), ("allocated_used_levels", levels_absolute_or_dynamic(_("Datafile"), _("used of allocation"))),

8 years, 1 month

Fixed wording: inventory -> discvoery

by Mathias Kettner

Module: check_mk Branch: master Commit: a1263f05b3b5203ccb7e81d587cd1463a82afbab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1263f05b3b520… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 17 09:11:43 2016 +0200 Fixed wording: inventory -> discvoery --- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index a18ddad..b128ece 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1746,7 +1746,7 @@ register_rule(group, "ignored_services", title = _("Disabled services"), help = _("Services that are declared as <u>disabled</u> by this rule set will not be added " - "to a host during inventory (automatic service detection). Services that already " + "to a host during discovery (automatic service detection). Services that already " "exist will continued to be monitored but be marked as obsolete in the service " "list of a host."), itemtype = "service") diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e27ad21..d1cc396 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -41,7 +41,7 @@ subgroup_environment = _("Temperature, Humidity, Electrical Parameters, etc.") subgroup_applications = _("Applications, Processes & Services") subgroup_virt = _("Virtualization") subgroup_hardware = _("Hardware, BIOS") -subgroup_inventory = _("Inventory - automatic service detection") +subgroup_inventory = _("Discovery - automatic service detection") # register_rule(group, varname, valuespec = None, title = None, # help = None, itemspec = None, itemtype = None, itemname = None, @@ -3066,7 +3066,7 @@ register_rule(group + '/' + subgroup_storage, '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 ' - 'the inventory will automatically create a group service instead ' + '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. ' 'Furthermore, the current time/date in a configurable format '

8 years, 1 month

clarified white-/blacklisting of automatic service activation

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2ee84f0c660706c9a119ab76549944f62af9c9d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee84f0c660706… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 16:19:50 2016 +0200 clarified white-/blacklisting of automatic service activation --- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7f3d1f9..a18ddad 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1887,13 +1887,21 @@ register_rule(group, )), ( "service_whitelist", ListOfStrings( - title = _("Whitelist Services"), + title = _("Activate only services matching"), allow_empty = False, + help = _("Set service names or regular expression patterns here to " + "allow only matching services to be activated automatically. " + "If you set both this and \'Don't activate services matching\', " + "both rules have to apply for a service to be activated."), )), ( "service_blacklist", ListOfStrings( - title = _("Blacklist Services"), + title = _("Don't activate services matching"), allow_empty = False, + help = _("Set service names or regular expression patterns here to " + "prevent matching services from being activated automatically. " + "If you set both this and \'Activate only services matching\', " + "both rules have to apply for a service to be activated."), )), ], optional_keys = ["service_whitelist", "service_blacklist"],

8 years, 1 month

normalized text

by Sebastian Herbord

Module: check_mk Branch: master Commit: 68fb24d5b1fbb4fe4b641966f21af4dec6b975f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68fb24d5b1fbb4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 16:03:06 2016 +0200 normalized text --- web/plugins/metrics/check_mk.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ee8a433..910aab1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3100,7 +3100,7 @@ metric_info["page_lookups_sec"] = { } metric_info["failed_search"] = { - "title" : _("Failed Search requests"), + "title" : _("Failed search requests"), "unit": "1/s", "color": "42/a" } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4d92272..e27ad21 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1220,7 +1220,7 @@ register_check_parameters( elements = [ ('failed_search_requests', Dictionary( - title = _("Failed Search Requests"), + title = _("Failed search requests"), elements = [ ("upper", Tuple(

8 years, 1 month

Use TAB as separator for 'plain' format. Fixed serialization.

by Sven Panne

Module: check_mk Branch: master Commit: 5e4a602d120e9ee78eaf3b9220284406637c4898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4a602d120e9e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 13 15:34:11 2016 +0200 Use TAB as separator for 'plain' format. Fixed serialization. --- bin/mkeventd | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index f060feb..400d616 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -757,6 +757,8 @@ def to_utf8(x): def quote_tab(col): if type(col) in [ float, int ]: return str(col) + elif type(col) == bool: + return col and "1" or "0" elif type(col) in [ tuple, list ]: col = "\1" + "\1".join(map(to_utf8, col)) elif col == None: @@ -2669,13 +2671,8 @@ class StatusServer: raise MKClientError("Invalid method %s (allowed are GET, COMMAND and REPLICATE)" % method) if output_format == "plain": - def format_column(value): - try: - return value.encode("utf-8") - except Exception, e: - return repr(value) for line in response: - socket.send("\x02".join(map(lambda x: format_column(x), line))) + socket.send("\t".join([to_utf8(quote_tab(c)) for c in line])) socket.send("\n") else: socket.send(repr(response))

8 years, 1 month

3134 FIX windows agent: fixed bug where the last message of an eventlog was always re-read

by Sebastian Herbord

Module: check_mk Branch: master Commit: e6ee441da3433833970a290e69699a5d2d4d59e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ee441da34338… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 14:09:53 2016 +0200 3134 FIX windows agent: fixed bug where the last message of an eventlog was always re-read --- .werks/3134 | 10 ++++++++++ ChangeLog | 2 ++ agents/windows/EventLog.cc | 10 ++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1250304 -> 1250304 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1250304 -> 1250304 bytes agents/windows/check_mk_agent.cc | 5 +++-- agents/windows/check_mk_agent.exe | Bin 1222656 -> 1223168 bytes agents/windows/check_mk_agent.msi | Bin 2740224 -> 2741760 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1222656 -> 1223168 bytes agents/windows/install_agent-64.exe | Bin 554242 -> 554590 bytes agents/windows/install_agent.exe | Bin 550946 -> 551424 bytes 12 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/3134 b/.werks/3134 new file mode 100644 index 0000000..deb9f26 --- /dev/null +++ b/.werks/3134 @@ -0,0 +1,10 @@ +Title: windows agent: fixed bug where the last message of an eventlog was always re-read +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1463141164 + + diff --git a/ChangeLog b/ChangeLog index 6c99ea3..fcdc6c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,8 +214,10 @@ * 3529 FIX: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0)... * 3573 FIX: ps: Fixed possible wrong matching of ps and ucb ps commands * 3131 FIX: if64, if64adm: These checks now display the speed of interfaces slower than 1Mbit correctly... + NOTE: Please refer to the migration notes! * 3470 FIX: mounts: Fix exception when displaying check parameters in WATO services list... * 3530 FIX: agent_vsphere: improved performance, too much perfcounters were queried + * 3134 FIX: windows agent: fixed bug where the last message of an eventlog was always re-read Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index 7aca1e9..fe3f3cc 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -334,6 +334,16 @@ void EventLog::close() { CloseEventLog(_log); } bool EventLog::fillBuffer() { _buffer_offset = 0; + // test if we're at the end of the log, as we don't get + // a proper error message when reading beyond the last log record + DWORD oldest_record, record_count; + if (::GetOldestEventLogRecord(_log, &oldest_record) && + ::GetNumberOfEventLogRecords(_log, &record_count)) { + if (_record_offset >= oldest_record + record_count) { + return false; + } + } + DWORD flags = EVENTLOG_FORWARDS_READ; if ((_record_offset != 0) && (_seek_possible)) { flags |= EVENTLOG_SEEK_READ; diff --git a/agents/windows/build_version b/agents/windows/build_version index c7410a5..9b53651 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1675 +1677 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 78f7232..cf32296 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 39b29a0..8d1d7e8 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4946650..c0bb076 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -680,7 +680,8 @@ void output_eventlog(OutputProxy &out, LPCWSTR logname, uint64_t &first_record, out.output("[[[%ls]]]\n", logname); int worst_state = 0; - first_record = log->seek(first_record); + // record_number is the last event we read, so we want to seek past it + first_record = log->seek(first_record + 1); uint64_t last_record = first_record; @@ -700,7 +701,7 @@ void output_eventlog(OutputProxy &out, LPCWSTR logname, uint64_t &first_record, // second pass - if there were, print everything if ((worst_state >= level) || !logwatch_suppress_info) { log->reset(); - log->seek(first_record); + log->seek(first_record + 1); std::shared_ptr<IEventLogRecord> record = log->read(); while (record.get() != nullptr) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 86481ac..2998712 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 382b65d..3817ff6 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e20cf5a..895f03d 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index c13ad98..b2d593a 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1ac8618..f63a624 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 1 month

werk 3131 is actually incompatible. Also reduced the impact of this incompatibility

by Sebastian Herbord

Module: check_mk Branch: master Commit: 935d2b680590ca5efdf1c9387b55d5593c4c51c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=935d2b680590ca… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 11:51:16 2016 +0200 werk 3131 is actually incompatible. Also reduced the impact of this incompatibility --- .werks/3131 | 6 +++++- checks/if64.include | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.werks/3131 b/.werks/3131 index a6ba5e5..b783704 100644 --- a/.werks/3131 +++ b/.werks/3131 @@ -1,7 +1,7 @@ Title: if64, if64adm: These checks now display the speed of interfaces slower than 1Mbit correctly Level: 1 Component: checks -Compatible: compat +Compatible: incomp Version: 1.2.9i1 Date: 1462952497 Class: fix @@ -10,3 +10,7 @@ Previously, the two checks relied on a counter that has 10^6 bit resolution, so less than 1Mbit speed were reported as "speed unknown", whereas the if check was capped at 4Gbit speed, reporting wrong speed for faster interfaces. The if64, if64adm checks have now been updated to provide the correct speed for all interfaces. + +This change is incompatible as the interfaces previously reported as "speed unknown" will now report +warn state as the previously discovered speed (0) was stored during service discovery and deviations from +that are reported. You need to re-discover these services to get rid of the warning. diff --git a/checks/if64.include b/checks/if64.include index fe9a65e..74194e3 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -35,7 +35,10 @@ def parse_if64(info): # ifHighSpeed (idx 21) can't represent interfaces with less than 10^6 bit bandwidth, # ifSpeed (idx 4) is capped at 4GBit. # combine the two to get the actual interface speed - real_speed = (saveint(line[-1]) * 1000000) + (saveint(line[4]) % 1000000) + if line[-1] == "0": + real_speed = saveint(line[4]) + else: + real_speed = saveint(line[-1]) * 1000000 parsed.append(line[:4] + [real_speed] + line[5:-1]) return parsed

8 years, 1 month

split up the view introduced in werk 3129 into two views. Some cosmetic improvements

by Sebastian Herbord

Module: check_mk Branch: master Commit: a66ccf2b2c8f527b89c2a418727e1eb5e51355de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66ccf2b2c8f52… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu May 12 14:57:45 2016 +0200 split up the view introduced in werk 3129 into two views. Some cosmetic improvements --- web/plugins/views/builtin.py | 54 ++++++++++++++++++++++++++++++++++++----- web/plugins/views/painters.py | 16 +++++++++--- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1d73861..d9e1726 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -155,16 +155,19 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('site_host', False)], 'title': _('All hosts (Mini)'), 'topic': _('Hosts')}, - 'service_discovery': {'browser_reload': 0, + 'unmonitored_services': {'browser_reload': 0, 'column_headers': 'pergroup', 'datasource': 'service_discovery', - 'description': _('Differences to currently monitored services on a host.'), + 'description': _('Services not being monitored due to configuration.'), + 'context': { + 'discovery_state': {'discovery_state_var0': 'on', + 'discovery_state_var1': '', + 'discovery_state_var2': ''} + }, 'group_painters': [('sitealias', None), ('host_with_state', 'host')], 'hard_filters': [], - 'hard_filtervars': [('site', ''), - ('host', ''), - ('opthostgroup', '')], + 'hard_filtervars': [('state', 'unmonitored')], 'hidden': False, 'hide_filters': [], 'layout': 'table', @@ -189,8 +192,47 @@ multisite_builtin_views.update({ 'opthost_contactgroup'], 'sorters': [('site', False), ('site_host', False)], - 'title': _('Discovery of host'), + 'title': _('Unmonitored services'), 'topic': _('Services')}, + 'pending_discovery': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'service_discovery', + 'description': _('Differences to currently monitored services on a host.'), + 'context': { + 'discovery_state': {'discovery_state_var0': '', + 'discovery_state_var1': 'on', + 'discovery_state_var2': 'on'} + }, + 'group_painters': [('sitealias', None), + ('host_with_state', 'host')], + 'hard_filters': [], + 'hard_filtervars': [('state', ['new', 'vanished'])], + 'hidden': False, + 'hide_filters': [], + 'layout': 'table', + 'mustsearch': False, + 'name': 'service_discovery', + 'num_columns': 1, + 'owner': '', + 'painters': [('service_discovery_service', None), + ('service_discovery_check', None), + ('service_discovery_state', None)], + 'play_sounds': False, + 'public': True, + 'show_filters': ['host_scheduled_downtime_depth', + 'host_in_notification_period', + 'hoststate', + 'siteopt', + 'host_acknowledged', + 'hostregex', + 'host_notifications_enabled', + 'opthostgroup', + 'host_check_command', + 'opthost_contactgroup'], + 'sorters': [('site', False), + ('site_host', False)], + 'title': _('Pending service discovery'), + 'topic': _('Problems')}, 'allservices': {'browser_reload': 90, 'column_headers': 'pergroup', 'datasource': 'services', diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 638a227..b5a34cf 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1735,12 +1735,20 @@ def paint_discovery_output(field, row): if field == "discovery_state": ruleset_url = "wato.py?mode=edit_ruleset&varname=ignored_services" discovery_url = "wato.py?mode=inventory&host=%s&mode=inventory" % row["host_name"] + return None, { - "ignored" : '<a href="%s">Hidden by rule</a>' % ruleset_url, - "vanished" : '<a href="%s">No longer available</a>' % discovery_url, - "unmonitored" : '<a href="%s">Newly discovered</a>' % discovery_url + "ignored" : html.render_icon_button(ruleset_url, 'Disabled (configured away by admin)', 'rulesets') + "Disabled (configured away by admin)", + "vanished" : html.render_icon_button(discovery_url, 'Vanished (checked, but no longer exist)', 'services') + "Vanished (checked, but no longer exist)", + "unmonitored" : html.render_icon_button(discovery_url, 'Available (missing)', 'services') + "Available (missing)" }.get(value, value) - return None, value + elif field == "discovery_service" and row["discovery_state"] == "vanished": + link = "view.py?view_name=service&site=%s&host=%s&service=%s" % ( + html.urlencode(row["site"]), + html.urlencode(row["host_name"]), + html.urlencode(value)) + return None, "<div><a href=\"%s\">%s</a></div>" % (link, value) + else: + return None, value multisite_painters["service_discovery_state"] = { "title": _("Service discovery: State"),

8 years, 1 month

3133 windows agent: support for rotated log files and for reading new files from the first line

by Sebastian Herbord

Module: check_mk Branch: master Commit: 94cb41d7589de8e7ebb38a2cdda0d15bfc034410 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94cb41d7589de8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 13 09:39:33 2016 +0200 3133 windows agent: support for rotated log files and for reading new files from the first line Please see the check_mk.example.ini for details on how to configure this. With rotated logs, a pattern has to be specified to match all "generations" of the log and the agent will read each in sequence and report them as one item. --- .werks/3133 | 11 + ChangeLog | 1 + agents/windows/Configuration.cc | 426 +++++++++++++++------- agents/windows/Configuration.h | 29 +- agents/windows/Makefile | 5 +- agents/windows/PerfCounter.cc | 8 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 16 + agents/windows/check_mk_agent-64.exe | Bin 1157632 -> 1250304 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1157632 -> 1250304 bytes agents/windows/check_mk_agent.cc | 226 ++++++------ agents/windows/check_mk_agent.exe | Bin 1121792 -> 1222656 bytes agents/windows/check_mk_agent.msi | Bin 2545152 -> 2740224 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1121792 -> 1222656 bytes agents/windows/install_agent-64.exe | Bin 517316 -> 554242 bytes agents/windows/install_agent.exe | Bin 509285 -> 550946 bytes agents/windows/stringutil.cc | 5 + agents/windows/stringutil.h | 1 + agents/windows/types.h | 18 +- 19 files changed, 495 insertions(+), 253 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=94cb41d758…

8 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016