Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3461 FIX Fixed exception in case manpage for non existant check is accessed

by Lars Michelsen

Module: check_mk Branch: master Commit: 49a372bf2ef84bcc9a264eac989b9136f1f86b40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49a372bf2ef84b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 3 08:10:34 2016 +0200 3461 FIX Fixed exception in case manpage for non existant check is accessed --- .werks/3461 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/3461 b/.werks/3461 new file mode 100644 index 0000000..9ce76fe --- /dev/null +++ b/.werks/3461 @@ -0,0 +1,10 @@ +Title: Fixed exception in case manpage for non existant check is accessed +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462255808 + + diff --git a/ChangeLog b/ChangeLog index 0c8bf8b..1309c74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -339,6 +339,7 @@ * 3457 FIX: Bulk edit: Prevent browser auto completion of stored credentials * 3458 FIX: Bulk edit: Fixed broken unchecking of attributes after complain * 3459 FIX: Bulk edit: Fixed mixup of attributes during consecutive bulk edits + * 3461 FIX: Fixed exception in case manpage for non existant check is accessed Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/modules/automation.py b/modules/automation.py index 8be74cd..f3d467a 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -651,6 +651,9 @@ def automation_get_check_manpage(args): # Assume active check elif check_type.startswith("check_"): manpage["type"] = "active" + else: + raise MKAutomationError("Could not detect type of manpage: %s. " + "Maybe the check is missing." % check_type) return manpage

8 years, 1 month

3459 FIX Bulk edit: Fixed mixup of attributes during consecutive bulk edits

by Lars Michelsen

Module: check_mk Branch: master Commit: 74506e53e5b91d06cfbd6ff866576198eff591c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74506e53e5b91d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 3 07:55:05 2016 +0200 3459 FIX Bulk edit: Fixed mixup of attributes during consecutive bulk edits --- .werks/3459 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 11 +++++++++++ 3 files changed, 22 insertions(+) diff --git a/.werks/3459 b/.werks/3459 new file mode 100644 index 0000000..c6d7aec --- /dev/null +++ b/.werks/3459 @@ -0,0 +1,10 @@ +Title: Bulk edit: Fixed mixup of attributes during consecutive bulk edits +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462254841 + + diff --git a/ChangeLog b/ChangeLog index aaaf86c..0c8bf8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -338,6 +338,7 @@ * 3451 FIX: Fixed exception in host list when no local site configured * 3457 FIX: Bulk edit: Prevent browser auto completion of stored credentials * 3458 FIX: Bulk edit: Fixed broken unchecking of attributes after complain + * 3459 FIX: Bulk edit: Fixed mixup of attributes during consecutive bulk edits Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0c15682..3759d12 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3625,6 +3625,16 @@ def mode_bulk_edit(phase): host_names = get_hostnames_from_checkboxes() hosts = dict([(host_name, Folder.current().host(host_name)) for host_name in host_names]) + current_host_hash = sha256(repr(hosts)) + + # When bulk edit has been made with some hosts, then other hosts have been selected + # and then another bulk edit has made, the attributes need to be reset before + # rendering the form. Otherwise the second edit will have the attributes of the + # first set. + host_hash = html.var("host_hash") + if not host_hash or host_hash != current_host_hash: + html.del_all_vars(prefix="attr_") + html.del_all_vars(prefix="bulk_change_") html.write("<p>" + _("You have selected <b>%d</b> hosts for bulk edit. You can now change " "host attributes for all selected hosts at once. ") % len(hosts)) @@ -3634,6 +3644,7 @@ def mode_bulk_edit(phase): html.begin_form("edit_host", method = "POST") html.prevent_password_auto_completion() + html.hidden_field("host_hash", current_host_hash) configure_attributes(False, hosts, "bulk", parent = Folder.current()) forms.end() html.button("_save", _("Save & Finish"))

8 years, 1 month

3458 FIX Bulk edit: Fixed broken unchecking of attributes after complain

by Lars Michelsen

Module: check_mk Branch: master Commit: 3456ed621505929a61feea1d971017da164129ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3456ed62150592… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 3 07:43:16 2016 +0200 3458 FIX Bulk edit: Fixed broken unchecking of attributes after complain --- .werks/3458 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 48 +++++++++++++++++++++++++++++++++--------------- web/htdocs/wato.py | 9 +++++---- 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/.werks/3458 b/.werks/3458 new file mode 100644 index 0000000..7132521 --- /dev/null +++ b/.werks/3458 @@ -0,0 +1,10 @@ +Title: Bulk edit: Fixed broken unchecking of attributes after complain +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462254179 + + diff --git a/ChangeLog b/ChangeLog index b024b9d..aaaf86c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -337,6 +337,7 @@ * 3450 FIX: Site properties: It was not possible to switch a site back to "local site" connection * 3451 FIX: Fixed exception in host list when no local site configured * 3457 FIX: Bulk edit: Prevent browser auto completion of stored credentials + * 3458 FIX: Bulk edit: Fixed broken unchecking of attributes after complain Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 40aaf60..7125e4a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -335,13 +335,21 @@ class html(GUITester): self.write('<br>'.join(self.user_errors.values())) self.write('</div>\n') - def hidden_field(self, var, value, id = None, add_var = False): - if value != None: - id = id and ' id="%s"' % self.attrencode(id) or '' - self.write("<input type=\"hidden\" name=\"%s\" value=\"%s\"%s />" % - (self.attrencode(var), self.attrencode(value), id)) - if add_var: - self.add_form_var(var) + + def hidden_field(self, *args, **kwargs): + self.write(self.render_hidden_field(*args, **kwargs)) + + + def render_hidden_field(self, var, value, id=None, add_var=False): + if value == None: + return "" + + if add_var: + self.add_form_var(var) + + id = id and ' id="%s"' % self.attrencode(id) or '' + return "<input type=\"hidden\" name=\"%s\" value=\"%s\"%s />" % \ + (self.attrencode(var), self.attrencode(value), id) # Beware: call this method just before end_form(). It will # add all current non-underscored HTML variables as hiddedn @@ -737,14 +745,21 @@ class html(GUITester): def end_checkbox_group(self): self.end_radio_group() - def checkbox(self, varname, deflt=False, cssclass = '', onclick = None, label=None, id=None, add_attr = None): + + def checkbox(self, *args, **kwargs): + self.write(self.render_checkbox(*args, **kwargs)) + + + def render_checkbox(self, varname, deflt=False, cssclass = '', onclick = None, label=None, + id=None, add_attr = None): if add_attr == None: add_attr = [] # do not use [] as default element, it will be a global variable! + code = "" error = self.user_errors.get(varname) if error: - self.write("<x class=inputerror>") + code += "<x class=inputerror>" - self.write("<span class=checkbox>") + code += "<span class=checkbox>" # Problem with checkboxes: The browser will add the variable # only to the URL if the box is checked. So in order to detect # wether we should add the default value, we need to detect @@ -765,14 +780,17 @@ class html(GUITester): add_attr_code = '' if add_attr: add_attr_code = ' ' + ' '.join(add_attr) - self.write("<input type=checkbox name=\"%s\"%s%s%s%s>\n" % - (varname, checked, cssclass, onclick_code, add_attr_code)) + code += "<input type=checkbox name=\"%s\"%s%s%s%s>\n" % \ + (varname, checked, cssclass, onclick_code, add_attr_code) self.form_vars.append(varname) if label: - self.write('<label for="%s">%s</label>\n' % (id, label)) - self.write("</span>") + code += '<label for="%s">%s</label>\n' % (id, label) + code += "</span>" if error: - self.write("</x>") + code += "</x>" + + return code + # Check if the current form is currently filled in (i.e. we display # the form a second time while showing value typed in at the first diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 653c022..0c15682 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15805,12 +15805,13 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if (for_what == "host" and parent.locked_hosts()) or (for_what == "folder" and myself and myself.locked()): checkbox_code = None elif force_entry: - checkbox_code = '<input type=checkbox name="ignored_%s" CHECKED DISABLED>' % checkbox_name - checkbox_code += '<input type=hidden name="%s" value="on">' % checkbox_name + checkbox_code = html.render_checkbox("ignored_" + checkbox_name, add_attr=["disabled"]) + checkbox_code += html.render_hidden_field(checkbox_name, "on") else: + add_attr = disabled and ["disabled"] or [] onclick = "wato_fix_visibility(); wato_toggle_attribute(this, '%s');" % attrname - checkbox_code = '<input type=checkbox name="%s" %s %s onclick="%s">' % ( - checkbox_name, active and "CHECKED" or "", disabled and "DISABLED" or "", onclick) + checkbox_code = html.render_checkbox(checkbox_name, active, + onclick=onclick, add_attr=add_attr) forms.section(_u(attr.title()), checkbox=checkbox_code, id="attr_" + attrname) html.help(attr.help())

8 years, 1 month

3457 FIX Bulk edit: Prevent browser auto completion of stored credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: 5488898c99549fdef7b7a4ce8462bb5011acee53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5488898c99549f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 16:45:49 2016 +0200 3457 FIX Bulk edit: Prevent browser auto completion of stored credentials --- .werks/3457 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3457 b/.werks/3457 new file mode 100644 index 0000000..d79fe4e --- /dev/null +++ b/.werks/3457 @@ -0,0 +1,10 @@ +Title: Bulk edit: Prevent browser auto completion of stored credentials +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462200299 + + diff --git a/ChangeLog b/ChangeLog index 1a85e67..b024b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -336,6 +336,7 @@ * 3383 FIX: Host search: Don't preselect any optional field (Searched for empty values) * 3450 FIX: Site properties: It was not possible to switch a site back to "local site" connection * 3451 FIX: Fixed exception in host list when no local site configured + * 3457 FIX: Bulk edit: Prevent browser auto completion of stored credentials Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a6dd16b..653c022 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3633,6 +3633,7 @@ def mode_bulk_edit(phase): "will keep their individual settings.") + "</p>") html.begin_form("edit_host", method = "POST") + html.prevent_password_auto_completion() configure_attributes(False, hosts, "bulk", parent = Folder.current()) forms.end() html.button("_save", _("Save & Finish"))

8 years, 1 month

3431 netextreme_cpu_util: new check which monitors the CPU utilization of a Extreme Networks Switch which supports the EXTREME-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 31f923b3b18214caac8a02238af239d6f3054987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31f923b3b18214… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 2 18:43:55 2016 +0200 3431 netextreme_cpu_util: new check which monitors the CPU utilization of a Extreme Networks Switch which supports the EXTREME-MIB --- .werks/3431 | 9 +++++++ ChangeLog | 1 + checkman/netextreme_cpu_util | 16 ++++++++++++ checks/netextreme_cpu_util | 55 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) diff --git a/.werks/3431 b/.werks/3431 new file mode 100644 index 0000000..d61fc65 --- /dev/null +++ b/.werks/3431 @@ -0,0 +1,9 @@ +Title: netextreme_cpu_util: new check which monitors the CPU utilization of a Extreme Networks Switch which supports the EXTREME-MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1462207393 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3c8e1d0..1a85e67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition * 3446 mssql_version: Outputs info about cluster state and cluster name * 3128 mem.win: graphs now display the available memory + * 3431 netextreme_cpu_util: new check which monitors the CPU utilization of a Extreme Networks Switch which supports the EXTREME-MIB * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/netextreme_cpu_util b/checkman/netextreme_cpu_util new file mode 100644 index 0000000..8f52237 --- /dev/null +++ b/checkman/netextreme_cpu_util @@ -0,0 +1,16 @@ +title: Extreme Networks Switch: CPU utilization +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the CPU utilization of a Extreme Networks Switch + which supports the EXTREME-MIB. + + Default levels are 80, 90 percent. These are configurable. + +perfdata: + The CPU utilization. + +inventory: + One service is created. diff --git a/checks/netextreme_cpu_util b/checks/netextreme_cpu_util new file mode 100644 index 0000000..1655acc --- /dev/null +++ b/checks/netextreme_cpu_util @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# .1.3.6.1.4.1.1916.1.32.1.2.0 59 --> EXTREME-SOFTWARE-MONITOR-MIB::extremeCpuMonitorTotalUtilization.0$ + + +# As in some other checks +netextreme_cpu_util_default_levels = (80.0, 90.0) + + +def inventory_netextreme_cpu_util(info): + if info: + return [ (None, "netextreme_cpu_util_default_levels") ] + + +def check_netextreme_cpu_util(_no_item, params, info): + return check_cpu_util(float(info[0][0]), params) + + +check_info['netextreme_cpu_util'] = { + 'inventory_function' : inventory_netextreme_cpu_util, + 'check_function' : check_netextreme_cpu_util, + 'service_description' : 'CPU utilization', + 'snmp_info' : (".1.3.6.1.4.1.1916.1.32.1.2", [ + "0", # EXTREME-SOFTWARE-MONITOR-MIB::extremeCpuMonitorTotalUtilization + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1916.2"), + 'has_perfdata' : True, + 'includes' : [ 'cpu_util.include' ], + 'group' : 'cpu_utilization', +}

8 years, 2 months

fixed missing include statement

by Simon Betz

Module: check_mk Branch: master Commit: 23334eab1a2a96aa79035622b9e7c2dcfcc49d5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23334eab1a2a96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 2 18:36:21 2016 +0200 fixed missing include statement --- checks/cisco_oldcpu | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/cisco_oldcpu b/checks/cisco_oldcpu index 33c659c..316967b 100644 --- a/checks/cisco_oldcpu +++ b/checks/cisco_oldcpu @@ -52,4 +52,5 @@ check_info['cisco_oldcpu'] = { and not oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*") \ and oid(".1.3.6.1.4.1.9.2.1.57.0"), 'group' : "cpu_utilization", + 'includes' : [ "cpu_util.include" ], }

8 years, 2 months

fixed perfdata if no upper levels are given

by Simon Betz

Module: check_mk Branch: master Commit: a56cec682f6f0a5fec9a492401f72e184c3361a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a56cec682f6f0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 2 18:13:05 2016 +0200 fixed perfdata if no upper levels are given --- checks/elphase.include | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/checks/elphase.include b/checks/elphase.include index 86979e9..2d6495b 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -70,6 +70,7 @@ def check_elphase(item, params, parsed): infotext = "%s: %s%s" % (title, tostring(value), unit) status = 0 + perfdata = [ (what, value * factor) ] if what in params: warn_lower = crit_lower = warn = crit = None @@ -100,10 +101,7 @@ def check_elphase(item, params, parsed): status = max(status, 1) infotext += levelstext - perfdata = [ (what, value * factor, warn * factor, crit * factor) ] - - else: - perfdata = [ (what, value * factor) ] + perfdata = [ (what, value * factor, warn * factor, crit * factor) ] yield status, infotext, perfdata

8 years, 2 months

Fix missing include entry

by Mathias Kettner

Module: check_mk Branch: master Commit: ca9afeea0132ee9b00dfa26e1ab3085a2afbb543 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca9afeea0132ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 17:03:52 2016 +0200 Fix missing include entry --- livestatus/src/LogwatchListColumn.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 6a0ef97..008cfaa 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -25,6 +25,7 @@ #include <string> #include <sys/types.h> #include <dirent.h> +#include <string.h> #include "LogwatchListColumn.h" #include "Query.h" #include "mk_logwatch.h"

8 years, 2 months

3466 Logwatch pages now work in distributed environment without HTTH reverse proxy

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c6c876e553382e27104e979cb98729eead044f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c6c876e553382… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 16:59:59 2016 +0200 3466 Logwatch pages now work in distributed environment without HTTH reverse proxy The web pages for viewing and acknowledging files from logwatch checks now no longer need a HTTP reverse proxy setup but simply work. The use Livestatus - just like the other status data. This means that in the Enterprise Edition you can now drop the reverse proxying totally. In the Raw Edition you still need it for the performance graphs from PNP4Nagios. In a manual setup you need to tell the Livestatus Nagios-Module where it finds the logwatch files with the option <tt>mk_logwatch_path=.....</tt>. Specify the absolute path to the base directory where Check_MK stores the logwatch files. This path always ends with <tt>/logwatch</tt>. Note: You need to update Livestatus / Check_MK on all remote sites. If you just update the central site then the logwatch GUI will stop working. --- .werks/3466 | 21 ++ ChangeLog | 1 + web/htdocs/livestatus.py | 2 +- web/htdocs/logwatch.py | 566 ++++++++++++++++++++++++------------------ web/htdocs/wato.py | 4 +- web/plugins/icons/builtin.py | 10 +- 6 files changed, 355 insertions(+), 249 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c6c876e55…

8 years, 2 months

Livestatus: Correct handling of missing blob files, None instead of ""

by Mathias Kettner

Module: check_mk Branch: master Commit: fda8456cdc4f5cfc9c689c230a227f7219edccc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fda8456cdc4f5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 2 16:54:59 2016 +0200 Livestatus: Correct handling of missing blob files, None instead of "" --- livestatus/src/BlobColumn.cc | 7 ++----- livestatus/src/LogwatchListColumn.cc | 3 +++ livestatus/src/Query.cc | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index 7aa09f6..616d355 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -29,10 +29,7 @@ void BlobColumn::output(void *data, Query *query) { int size; char *buffer = getBlob(data, &size); - if (buffer != nullptr) { - query->outputBlob(buffer, size); + query->outputBlob(buffer, size); + if (buffer != nullptr) free(buffer); - } else { - query->outputBlob("", 0); - } } diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index a7a4bc4..6a0ef97 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -67,6 +67,9 @@ void LogwatchListColumn::output(void *data, Query *query) closedir(dir); break; } + if (!strcmp(dep->d_name, ".") || !strcmp(dep->d_name, "..")) + continue; + if (first) first = false; else diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 83a6535..45cf46d 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1079,9 +1079,13 @@ void Query::outputUnicodeEscape(unsigned value) { void Query::outputBlob(const char *buffer, int size) { if (_output_format != OUTPUT_FORMAT_CSV) { - outputString(buffer, size); + if (buffer) + outputString(buffer, size); + else + outputNull(); } else { - _output->addBuffer(buffer, size); + if (buffer) + _output->addBuffer(buffer, size); } }

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016