Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

3812 FIX winperf_phydisk: reintroduced read and write queue length performance data

by Andreas Boesl

Module: check_mk Branch: master Commit: ceecd53b700149907bb69cce9adc7c41e2bda3da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceecd53b700149… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 21 13:36:34 2016 +0200 3812 FIX winperf_phydisk: reintroduced read and write queue length performance data These values were lost due to a recent code refactoring. --- .werks/3812 | 10 ++++++++++ ChangeLog | 1 + checks/diskstat.include | 15 +++++++++++++++ checks/winperf_phydisk | 13 ++++++++++++- web/plugins/metrics/check_mk.py | 20 ++++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/.werks/3812 b/.werks/3812 new file mode 100644 index 0000000..67a4ad3 --- /dev/null +++ b/.werks/3812 @@ -0,0 +1,10 @@ +Title: winperf_phydisk: reintroduced read and write queue length performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474457752 +Class: fix + +These values were lost due to a recent code refactoring. + diff --git a/ChangeLog b/ChangeLog index 3277607..ba7a5c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -401,6 +401,7 @@ * 3807 FIX: mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin * 3808 FIX: df.include: fixed incorrect levels calculations on very small filesystems... * 3810 FIX: windows agent: no longer truncates plugin output, no longer freezes when plugin produces too much output... + * 3812 FIX: winperf_phydisk: reintroduced read and write queue length performance data... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/diskstat.include b/checks/diskstat.include index 1c0cc08..52f0a6e 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -308,6 +308,8 @@ def diskstat_select_disk(disks, item): # "average_write_wait" : 0.0, # "average_write_request_size" : 0.0, # "queue_length" : 0.0, + # "read_ql" : 0.0, + # "write_ql" : 0.0, } if disks: @@ -360,6 +362,8 @@ def diskstat_select_disk(disks, item): # 'write_ios' : 1.6153846153846154, # 'write_throughput' : 65536.0, # 'queue_length' : 0.0, +# 'read_ql' : 0.0, +# 'write_ql' : 0.0, # }} def check_diskstat_dict(item, params, disks): # Take care of previously discovered services @@ -373,6 +377,7 @@ def check_diskstat_dict(item, params, disks): if not disk: return + # Averaging # Note: this check uses a simple method of averaging: As soon as averaging # is turned on the actual metrics are *replaced* by the averaged ones. No @@ -423,6 +428,16 @@ def check_diskstat_dict(item, params, disks): unit = "ms", scale = 0.001, statemarkers=False) yield state, "Latency: %.2f ms%s" % (latency * 1000.0, text), extraperf + # Queue lengths + for what, plugin_text in [ ("queue_length", "Queue Length"), + ("read_ql", "Read Queue Length"), + ("write_ql", "Write Queue Length") ]: + if what in disk: + ql = disk[what] + state, levels_text, extraperf = check_levels(ql, what, params.get(what), + statemarkers=False) + yield state, "Average %s: %.2f%s" % (plugin_text, ql, levels_text), extraperf + # All the other metrics are currently not output in the plugin output - simply because # of their amount. They are present as performance data and will shown in graphs. diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 580bc8e..927e82b 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -60,7 +60,7 @@ # 1248 2664021277 2664021277 type(40030500) # 1250 1330 1330 counter -check_includes['winperf_phydisk'] = [ "diskstat.include" ] + def winperf_phydisk_convert(info): # node_info has been activated. This check simply ignores this @@ -182,6 +182,16 @@ def check_winperf_phydisk(item, params, info): 'average_write_wait' : (sec_per_write_counter / frequency) / sec_per_write_base, }) + + # Queue Lengths (currently only Windows). Windows uses counters here. + # I have not understood, why.... + for what, ctr in [ ("read_ql", disk[7]), + ("write_ql", disk[8]) ]: + qlx = get_rate("%s_%s" % (what, disk_id) , this_time, int(ctr)) + ql = qlx / 10000000.0 + result[disk[1]].update({what: ql}) + + return result return check_diskstat_dict(item, params, dictify(winperf_phydisk_convert(info))) @@ -194,5 +204,6 @@ check_info["winperf_phydisk"] = { 'service_description': 'Disk IO %s', 'node_info': True, 'has_perfdata': True, + 'includes': [ "diskstat.include" ], 'group': 'disk_io', } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 5269624..de564b3 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1614,6 +1614,18 @@ metric_info["write_latency"] = { metric_info["disk_queue_length"] = { "title" : _("Average disk I/O-queue length"), "unit" : "", + "color" : "35/a", +} + +metric_info["disk_read_ql"] = { + "title" : _("Average disk read queue length"), + "unit" : "", + "color" : "45/a", +} + +metric_info["disk_write_ql"] = { + "title" : _("Average disk write queue length"), + "unit" : "", "color" : "#7060b0", } @@ -5813,6 +5825,14 @@ graph_info.append({ }) graph_info.append({ + "title" : _("Read / Write queue length"), + "metrics" : [ + ( "disk_read_ql", "area" ), + ( "disk_write_ql", "-area" ) + ], +}) + +graph_info.append({ "title" : _("Backup time"), "metrics" : [ ( "checkpoint_age", "area" ),

8 years, 1 month

added compiled files

by Andreas Boesl

Module: check_mk Branch: master Commit: 47ba8517b0ff629d76710c24e1bb814da69201e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ba8517b0ff62… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 21 12:34:14 2016 +0200 added compiled files --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323008 -> 1323008 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15007391 -> 15007391 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323008 -> 1323008 bytes agents/windows/check_mk_agent.exe | Bin 1297408 -> 1297408 bytes agents/windows/check_mk_agent.msi | Bin 2890240 -> 2890240 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13270746 -> 13270746 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297408 -> 1297408 bytes agents/windows/install_agent-64.exe | Bin 584250 -> 584255 bytes agents/windows/install_agent.exe | Bin 580927 -> 580929 bytes 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 621d402..d84af76 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2083 +2085 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 2c28a99..8bcf0d1 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 9419387..559f31a 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 040b7e7..6ab8c42 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.exe b/agents/windows/check_mk_agent.exe index b12d127..ffb72da 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 a7881a9..8bc89fd 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index cf46c32..9acda74 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 3c4a1b0..9c1d465 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 842360b..a193b30 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 6e81291..d9b4622 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 1 month

Fixed validation errors

by Lars Michelsen

Module: check_mk Branch: master Commit: 433f26ebc12aed260945c9310b614a771779f57f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=433f26ebc12aed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 21 11:53:17 2016 +0200 Fixed validation errors --- bin/mkeventd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index b1a24b5..bee4b63 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3863,7 +3863,7 @@ def do_event_action(action, event, user=""): # This function creates a Check_MK Notification for a locally running Check_MK. # We simulate a *service* notification. def do_notify(event, username=None, is_cancelling=False): - if core_has_notifications_disabled(): + if core_has_notifications_disabled(event): return # Create notification context based on event @@ -4002,7 +4002,7 @@ def add_rbn_contact_information(context, host, contact_groups, contact_groups_no }) -def core_has_notifications_disabled(): +def core_has_notifications_disabled(event): try: answer = livestatus_query("GET status\nColumns: enable_notifications\nOutputFormat: python\n") if answer: @@ -4026,7 +4026,7 @@ def fetch_contacts_of_group_from_livestatus(group_name): if "check-mk-notify" in contacts: # Remove artifical contact used for rule based notifications contacts.remove("check-mk-notify") return contacts - except True: + except: # TODO: Make this more specific if opt_debug: raise @@ -4049,7 +4049,7 @@ def fetch_contacts_and_groups_of_host_from_livestatus(host): contacts.remove("check-mk-notify") return contacts, groups - except True: + except: # TODO: Make this more specific if opt_debug: raise

8 years, 1 month

3887 Event contact groups are now handled in notifications (optionally)

by Lars Michelsen

Module: check_mk Branch: master Commit: fff455238c2a073f26cbe0930f0a8932acbecc23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fff455238c2a07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 21 11:45:36 2016 +0200 3887 Event contact groups are now handled in notifications (optionally) Previously you could already configure contact groups in Event Console rules, but those groups were only used to control the visibility of the events in the GUI. Now these groups can be used to control the visibility and also make them relevant for the notifications created by the Event Console. Besides adding the groups to the rule, you can configure whether or not to add the contact groups to the notifications and also configure the precedence of the groups in case there are host contact groups configured and event contact groups in the rule. Existing rules are treated as before. The contact groups of the rule will not be added to the notifications until you open the rule, tick the checkbox and save the rule again. --- .werks/3887 | 22 ++++++ ChangeLog | 1 + bin/mkeventd | 180 ++++++++++++++++++++++++++++++++++++++----- modules/notify.py | 2 + web/plugins/wato/mkeventd.py | 87 +++++++++++++-------- 5 files changed, 239 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fff455238c…

8 years, 1 month

3811 FIX HW/SW Inventory: Fixed GUI display crash when querying data from older software versions

by Andreas Boesl

Module: check_mk Branch: master Commit: f2ab5c3ff72c01a510714a8f018ea058135603c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2ab5c3ff72c01… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 21 11:36:35 2016 +0200 3811 FIX HW/SW Inventory: Fixed GUI display crash when querying data from older software versions Older software (livestatus) versions did not provide sufficient inventory data. The crash happened when a site with a newer software version tried to query data from a site running an older version. --- .werks/3811 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/inventory.py | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/.werks/3811 b/.werks/3811 new file mode 100644 index 0000000..090bef1 --- /dev/null +++ b/.werks/3811 @@ -0,0 +1,13 @@ +Title: HW/SW Inventory: Fixed GUI display crash when querying data from older software versions +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1474450273 + +Older software (livestatus) versions did not provide sufficient inventory data. + +The crash happened when a site with a newer software version tried to query +data from a site running an older version. diff --git a/ChangeLog b/ChangeLog index f309aa3..0dc1fd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -726,6 +726,7 @@ * 3455 FIX: Fixed broken switch port filtering/sorting view * 3663 FIX: Added missing system manufacturer filter/painter * 3664 FIX: Fixed not working hardware/system serial and model painters and filters... + * 3811 FIX: HW/SW Inventory: Fixed GUI display crash when querying data from older software versions... 1.2.8b1: diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 5f9a6ba..a13efb2 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -135,6 +135,14 @@ def get(tree, path): path = path[1:] node = tree + + # The root node of the tree MUST be dictionary + # This info is taken from the host_inventory column in a livestatus table + # Older versions, which do not know this column, report None as fallback value + # This workaround prevents the inevitable crash + if node == None: + node = {} + current_what = "." while path not in ('.', ':', ''): parts = re.split("[:.]", path)

8 years, 1 month

Unmonitored services view can be cloned again

by Konstantin Büttner

Module: check_mk Branch: master Commit: e46ac468de4844b8c3bd78a8a0d9d80d3d0e23f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e46ac468de4844… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 21 10:30:48 2016 +0200 Unmonitored services view can be cloned again --- web/plugins/views/datasources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index b08e594..2b4c5cc 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -279,7 +279,7 @@ multisite_datasources["service_discovery"] = { "title" : _("Service discovery"), "table" : query_service_discovery, "add_columns" : [ "discovery_state", "discovery_check", "discovery_service" ], - "infos" : [ "host", "host_discovery" ], + "infos" : [ "host", "discovery" ], "keys" : [], "idkeys" : [ "host_name" ] }

8 years, 1 month

3877 ibm_tl_changer_devices, ibm_tl_media_access_devices,

by Simon Betz

ibm_tl_scsi_prot_ctrl: new checks for IBM tape library which support the SNIA-SML and SML MIB. Message-ID: <57e22eb2.ZfaDxUWoXl+Nt8WP%si(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: f873fe0a471007d0cde3a7d639f8231e44f7f19c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f873fe0a471007… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 21 08:54:34 2016 +0200 3877 ibm_tl_changer_devices, ibm_tl_media_access_devices, ibm_tl_scsi_prot_ctrl: new checks for IBM tape library which support the SNIA-SML and SML MIB. --- .werks/3877 | 9 +++ ChangeLog | 1 + checkman/ibm_tl_changer_devices | 16 ++++++ checkman/ibm_tl_media_access_devices | 16 ++++++ checkman/ibm_tl_scsi_prot_ctrl | 16 ++++++ checks/ibm_tape_library.include | 90 ++++++++++++++++++++++++++++++ checks/ibm_tl_changer_devices | 58 +++++++++++++++++++ checks/ibm_tl_media_access_devices | 104 +++++++++++++++++++++++++++++++++++ checks/ibm_tl_scsi_prot_ctrl | 60 ++++++++++++++++++++ 9 files changed, 370 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f873fe0a47…

8 years, 1 month

updated werk 3876

by Simon Betz

Module: check_mk Branch: master Commit: 2997db097d7f394ea35e3d15315fa6810fb937ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2997db097d7f39… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 21 08:27:06 2016 +0200 updated werk 3876 --- .werks/3876 | 2 +- ChangeLog | 2 +- web/plugins/visuals/filters.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.werks/3876 b/.werks/3876 index 136eaae..c9f4f3d 100644 --- a/.werks/3876 +++ b/.werks/3876 @@ -1,4 +1,4 @@ -Title: new option "negation" for filter "several service groups" +Title: New filter option: negation for several service and host groups Level: 1 Component: multisite Compatible: compat diff --git a/ChangeLog b/ChangeLog index ab0ec0e..9887a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -426,7 +426,7 @@ * 3864 tactical overview now shows the number of stale hosts and services * 3847 Painter options can now be reset to defaults... * 3856 Improved handling of Check_MK GUI request timeouts... - * 3876 new option "negation" for filter "several service groups" + * 3876 New filter option: negation for several service and host groups * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index a5b3d39..3eaf307 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -387,16 +387,16 @@ class FilterGroupCombo(Filter): (table, lqencode(current_value)), current_value) return alias -declare_filter(104, FilterGroupCombo("host", _("Host is in Group"), False), _("Optional selection of host group")) -declare_filter(105, FilterMultigroup("host", _("Several Host Groups")), _("Selection of multiple host groups")) +declare_filter(104, FilterGroupCombo("host", _("Host is in Group"), False), _("Optional selection of host group")) +declare_filter(105, FilterMultigroup("host", _("Several Host Groups"), True), _("Selection of multiple host groups")) declare_filter(204, FilterGroupCombo("service", _("Service is in Group"), False), _("Optional selection of service group")) declare_filter(205, FilterGroupCombo("service", _("Servicegroup (enforced)"), True), _("Dropdown list, selection of service group is <b>enforced</b>")) -declare_filter(205, FilterMultigroup("service", _("Several Service Groups"), True), _("Selection of multiple service groups")) +declare_filter(205, FilterMultigroup("service", _("Several Service Groups"), True), _("Selection of multiple service groups")) declare_filter(106, FilterGroupCombo("host_contact", _("Host Contact Group"), False), _("Optional selection of host contact group")) declare_filter(206, FilterGroupCombo("service_contact", _("Service Contact Group"), False), _("Optional selection of service contact group")) -declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) +declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) declare_filter(207, FilterText("service_ctc", _("Service Contact"), "service", "service_contacts", "service_ctc", ">="))

8 years, 1 month

3886 Notifications that do not match any rule are sent to fallback mail / contacts

by Lars Michelsen

Module: check_mk Branch: master Commit: f163fcc6615e6218c29b2c3990050fe227ddaee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f163fcc6615e62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 15:39:13 2016 +0200 3886 Notifications that do not match any rule are sent to fallback mail / contacts When a notification is received and is not matched by any notification rule, it could be sent to a globally configured and optional fallback email address. So, if you did not configure this fallback email address, it was possible that generated notifications, e.g. from the Event Console, were not sent to any user. This has been extended so that you can either configure the global mail address or set and attribute for your user accounts individually. For each of your users you can now set the flag "Receive fallback notifications". Another change: If you use the rule based notifications and have not configured any fallback contact (either globally or user), there will be a warning message displayed on the notification configuration page. Another change: When having a notification rule that has a condition on contact groups, or any user creates a custom notification rule, and a notification was generated which had no contact group information at all, the notification was sent to ALL users, instead of none. That was implemented this way just to be sure that the notifications are not suppressed by accident. This has been changed to be also processed like other notifications that do not match any rule. Finally these notifications will be handled with the configured fallback contacts. --- .werks/3886 | 31 ++++++++++++++++++++ ChangeLog | 1 + modules/events.py | 6 ++-- modules/notify.py | 32 +++++++++++++++----- web/htdocs/wato.py | 50 +++++++++++++++++++++++++------- web/plugins/wato/globals_notification.py | 3 +- 6 files changed, 101 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f163fcc661…

8 years, 1 month

3810 FIX windows agent: no longer truncates plugin output, no longer freezes when plugin produces too much output

by Andreas Boesl

Module: check_mk Branch: master Commit: e078fb842dac704c63fa6d3602eee0958fb0b67d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e078fb842dac70… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 20 15:12:33 2016 +0200 3810 FIX windows agent: no longer truncates plugin output, no longer freezes when plugin produces too much output Contains two bugfixes. Fixed race condition where data from a script was not completely read from the suprocess's pipes. Fixed an agent freeze when the plugin data exceeded 2MB. --- .werks/3810 | 14 ++++++++++++++ ChangeLog | 1 + agents/windows/ExternalCmd.cc | 22 +++++++++++----------- agents/windows/ExternalCmd.h | 4 ++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323520 -> 1323008 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15356869 -> 15007391 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323520 -> 1323008 bytes agents/windows/check_mk_agent.exe | Bin 1297920 -> 1297408 bytes agents/windows/check_mk_agent.msi | Bin 2891264 -> 2890240 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13279233 -> 13270746 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297920 -> 1297408 bytes agents/windows/install_agent-64.exe | Bin 584441 -> 584250 bytes agents/windows/install_agent.exe | Bin 581128 -> 580927 bytes agents/windows/sections/SectionMRPE.cc | 1 + agents/windows/sections/SectionPluginGroup.cc | 4 ++-- 16 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.werks/3810 b/.werks/3810 new file mode 100644 index 0000000..53b3bc2 --- /dev/null +++ b/.werks/3810 @@ -0,0 +1,14 @@ +Title: windows agent: no longer truncates plugin output, no longer freezes when plugin produces too much output +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474377073 +Class: fix + +Contains two bugfixes. +Fixed race condition where data from a script was not completely read from the suprocess's pipes. + +Fixed an agent freeze when the plugin data exceeded 2MB. + + diff --git a/ChangeLog b/ChangeLog index 1cee385..adb89ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -399,6 +399,7 @@ * 3862 FIX: mknotifyd mknotifyd.connection: New service description (when enabled)... * 3807 FIX: mssql_counters: fixed crash when the check is unable to parse a timestamp provided by the plugin * 3808 FIX: df.include: fixed incorrect levels calculations on very small filesystems... + * 3810 FIX: windows agent: no longer truncates plugin output, no longer freezes when plugin produces too much output... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/ExternalCmd.cc b/agents/windows/ExternalCmd.cc index 9064afc..78dbb09 100644 --- a/agents/windows/ExternalCmd.cc +++ b/agents/windows/ExternalCmd.cc @@ -48,20 +48,13 @@ ExternalCmd::ExternalCmd(const char *cmdline) { // child process needs to be able to inherit the pipe handles security_attributes.bInheritHandle = true; - HANDLE script_stdout{INVALID_HANDLE_VALUE}; - HANDLE script_stderr{INVALID_HANDLE_VALUE}; - OnScopeExit release_handles([script_stdout, script_stderr]() { - ::CloseHandle(script_stdout); - ::CloseHandle(script_stderr); - }); - - if (!CreatePipe(&_stdout, &script_stdout, &security_attributes, 0)) { + if (!CreatePipe(&_stdout, &_script_stdout, &security_attributes, 0)) { throw win_exception("failed to create pipe"); } if (with_stderr) { - if (!CreatePipe(&_stderr, &script_stderr, &security_attributes, 0)) { + if (!CreatePipe(&_stderr, &_script_stderr, &security_attributes, 0)) { throw win_exception("failed to create pipe"); } } @@ -73,8 +66,9 @@ ExternalCmd::ExternalCmd(const char *cmdline) { GetStartupInfo(&si); si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; - si.hStdOutput = script_stdout; - si.hStdError = with_stderr ? script_stdout : script_stderr; + si.hStdOutput = _script_stdout; + si.hStdError = with_stderr ? _script_stdout : _script_stderr; + PROCESS_INFORMATION pi; ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); @@ -111,6 +105,12 @@ void ExternalCmd::terminateJob(DWORD exit_code) { _job_object = INVALID_HANDLE_VALUE; } +void ExternalCmd::closeScriptHandles() { + ::CloseHandle(_script_stderr); + ::CloseHandle(_script_stdout); +} + + DWORD ExternalCmd::exitCode() { DWORD res; GetExitCodeProcess(_process, &res); diff --git a/agents/windows/ExternalCmd.h b/agents/windows/ExternalCmd.h index 5d1db99..89939c3 100644 --- a/agents/windows/ExternalCmd.h +++ b/agents/windows/ExternalCmd.h @@ -41,6 +41,8 @@ public: DWORD stderrAvailable(); + void closeScriptHandles(); + DWORD readStdout(char *buffer, size_t buffer_size, bool block = true); DWORD readStderr(char *buffer, size_t buffer_size, bool block = true); @@ -49,6 +51,8 @@ private: DWORD readPipe(HANDLE pipe, char *buffer, size_t buffer_size, bool block); private: + HANDLE _script_stderr{INVALID_HANDLE_VALUE}; + HANDLE _script_stdout{INVALID_HANDLE_VALUE}; HANDLE _process{INVALID_HANDLE_VALUE}; HANDLE _job_object{INVALID_HANDLE_VALUE}; HANDLE _stdout{INVALID_HANDLE_VALUE}; diff --git a/agents/windows/build_version b/agents/windows/build_version index 1296a95..621d402 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2081 +2083 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index cb7539f..2c28a99 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 5bfc1e9..9419387 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 337f707..040b7e7 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.exe b/agents/windows/check_mk_agent.exe index 97de829..b12d127 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 f53f6ac..a7881a9 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index e1709e5..cf46c32 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index ea3e09d..3c4a1b0 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 e61b1ab..842360b 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 2e8443a..6e81291 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionMRPE.cc b/agents/windows/sections/SectionMRPE.cc index b610d39..9fba51a 100644 --- a/agents/windows/sections/SectionMRPE.cc +++ b/agents/windows/sections/SectionMRPE.cc @@ -163,6 +163,7 @@ bool SectionMRPE::produceOutputInner(std::ostream &out, int nagios_code = command.exitCode(); out << nagios_code << " " << plugin_output << "\n"; crash_log("Script finished"); + command.closeScriptHandles(); } catch (const std::exception &e) { crash_log("mrpe failed: %s", e.what()); out << "3 Unable to execute - plugin may be missing.\n"; diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index d2feb1d..23d80d5 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -103,6 +103,7 @@ static int launch_program(script_container *cont) { HeapSize(GetProcessHeap(), 0, cont->buffer_work); } else { result = BUFFER_FULL; + break; } } if (result != BUFFER_FULL) { @@ -122,8 +123,6 @@ static int launch_program(script_container *cont) { crash_log("plugin produced more than 2MB output -> dropped"); } - cont->exit_code = command.exitCode(); - if (cont->exit_code != STILL_ACTIVE) { result = SUCCESS; } @@ -147,6 +146,7 @@ static int launch_program(script_container *cont) { memcpy(cont->buffer_work, buffer_u8.c_str(), buffer_u8.size() + 1); } + command.closeScriptHandles(); } catch (const std::exception &e) { crash_log("%s", e.what()); result = CANCELED;

8 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016