Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4661 msexch_isstore, msexch_isclienttype: Split up check files. Second one needs its own check plugin file if using Nagios core

by Simon Betz

Module: check_mk Branch: master Commit: 15494ef09b45781a804bdee9ca4bc6afb2954f9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15494ef09b4578… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 18:35:35 2017 +0200 4661 msexch_isstore, msexch_isclienttype: Split up check files. Second one needs its own check plugin file if using Nagios core Change-Id: I03e8b9000592785b41efa9142329b83d47c00a62 --- .werks/4661 | 12 ++++++++ checks/msexch_isclienttype | 68 ++++++++++++++++++++++++++++++++++++++++++++++ checks/msexch_isstore | 23 ---------------- 3 files changed, 80 insertions(+), 23 deletions(-) diff --git a/.werks/4661 b/.werks/4661 new file mode 100644 index 0000000..f32c456 --- /dev/null +++ b/.werks/4661 @@ -0,0 +1,12 @@ +Title: msexch_isstore, msexch_isclienttype: Split up check files. Second one needs its own check plugin file if using Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494865578 + +This incompatible change relates only to Check_MK installations using +Nagios core. In this case please perform a re-discovery on affected hosts. diff --git a/checks/msexch_isclienttype b/checks/msexch_isclienttype new file mode 100644 index 0000000..96d7d39 --- /dev/null +++ b/checks/msexch_isclienttype @@ -0,0 +1,68 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + + +# checks for is store and is clienttype +# as I understand it, these are logically related but the performance +# counters are completely separate + + +# source for these defaults: +# https://blogs.technet.microsoft.com/samdrey/2015/01/26/exchange-2013-perfor… +factory_settings['msexch_isclienttype_defaultlevels'] = { + 'store_latency': { + 'upper': (40.0, 50.0) + }, + 'clienttype_latency': { + 'upper': (40.0, 50.0) + }, + 'clienttype_requests': { + 'upper': (60, 70) + } +} + + +def check_msexch_isclienttype(item, params, parsed): + yield wmi_yield_raw_average(parsed, item, "RPCAverageLatency", + label="ms average latency", + perfvar="average_latency", + levels=params['clienttype_latency']) + yield wmi_yield_raw_persec(parsed, item, "RPCRequests", + label=" RPC Requests", + perfvar="requests_per_sec", + levels=params['clienttype_requests']) + + +check_info['msexch_isclienttype'] = { + 'inventory_function' : inventory_wmi_table, + 'check_function' : check_msexch_isclienttype, + 'parse_function' : parse_wmi_table, + 'has_perfdata' : True, + 'service_description' : "Exchange IS Client Type %s", + 'includes' : ['wmi.include'], + 'group' : 'msx_info_store', + 'default_levels_variable' : 'msexch_isclienttype_defaultlevels' +} diff --git a/checks/msexch_isstore b/checks/msexch_isstore index 123e200..385ea76 100644 --- a/checks/msexch_isstore +++ b/checks/msexch_isstore @@ -62,26 +62,3 @@ check_info['msexch_isstore'] = { 'group' : 'msx_info_store', 'default_levels_variable' : 'msexch_info_store_defaultlevels' } - - -def check_msexch_isclienttype(item, params, parsed): - yield wmi_yield_raw_average(parsed, item, "RPCAverageLatency", - label="ms average latency", - perfvar="average_latency", - levels=params['clienttype_latency']) - yield wmi_yield_raw_persec(parsed, item, "RPCRequests", - label=" RPC Requests", - perfvar="requests_per_sec", - levels=params['clienttype_requests']) - - -check_info['msexch_isclienttype'] = { - 'inventory_function' : inventory_wmi_table, - 'check_function' : check_msexch_isclienttype, - 'parse_function' : parse_wmi_table, - 'has_perfdata' : True, - 'service_description' : "Exchange IS Client Type %s", - 'includes' : ['wmi.include'], - 'group' : 'msx_info_store', - 'default_levels_variable' : 'msexch_info_store_defaultlevels' -}

7 years, 4 months

4682 SEC Add permission "Can add or modify executables" to be able to fine tune access rights

by Lars Michelsen

Module: check_mk Branch: master Commit: d357457fecb1fdb201297b3eaf2ef8ffcb049125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d357457fecb1fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 15 15:20:20 2017 +0200 4682 SEC Add permission "Can add or modify executables" to be able to fine tune access rights It is now possible to explicitly allow/deny users of WATO to add or modify executables. This done with the new permission Can add or modify executables. By default only users with the role Administrator have this permission. There are different places in Check_MK where an admin, the user of the configuration GUI, can use the GUI to add executable code to Check_MK. For example when configuring datasource programs, the user inserts a command line for gathering monitoring data. This command line is then executed during monitoring by Check_MK. Another example is the upload of extension packages (MKPs). These functions have in common that the user provides data that is executed by Check_MK later in the context of Check_MK. If you want to ensure that your WATO users can not "inject" arbitrary executables into your Check_MK installation, you only need to revoke this permission. This permission is needed in addition to the other component related permissions. For example you need the <tt>wato.rulesets</tt> permission together with the new permission to be able to configure rulesets where bare command lines are configured. These things are protected by the new permission at the moment: <ul> <li>Ruleset: Classical active and passive monitoring checks</li> <li>Ruleset: Datasource programs</li> <li>Ruleset: Configuring custom host check command</li> <li>Host diagnostic page: Setting arbritary command line as datasource program</li> <li>Configure event console actions</li> <li> Incompatible: User with the role Users are allowed to edit rulesets for the WATO folders they are permitted on. In previous versions they were also able to insert arbitrary commands into the rulesets mentioned above. This has now been removed (by default) for security reasons. If you still need this functionality, you need to set the new permission to yes for this role. Change-Id: Ic52c52e53b8cbd10c8f2af064559ff0bed9b41c7 --- .werks/4682 | 47 ++++++++++++++++++++++++++ web/htdocs/js/wato.js | 4 ++- web/htdocs/wato.py | 54 ++++++++++++++++++++++++------ web/plugins/wato/check_mk_configuration.py | 34 +++++++++++++------ 4 files changed, 117 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d357457fec…

7 years, 4 months

4660 FIX win_os: Fixed wrong OS information if eg. ESX is installed on Windows host

by Simon Betz

Module: check_mk Branch: master Commit: 67604cec40e3d48a43196559432162e7813d3b09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67604cec40e3d4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 13:15:17 2017 +0200 4660 FIX win_os: Fixed wrong OS information if eg. ESX is installed on Windows host Change-Id: I716e4611eee174786c1ab80ccff5fd76faa8f4ad --- .werks/4660 | 11 +++++++++++ inventory/win_os | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/4660 b/.werks/4660 new file mode 100644 index 0000000..5345fa8 --- /dev/null +++ b/.werks/4660 @@ -0,0 +1,11 @@ +Title: win_os: Fixed wrong OS information if eg. ESX is installed on Windows host +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494846640 + + diff --git a/inventory/win_os b/inventory/win_os index 58d98b2..b9631ed 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -31,6 +31,12 @@ def inv_win_os(info): node = inv_tree("software.os.") + # Some information come eg. from esx and we delete these + # because basic os is windows + for what in ["vendor", "name", "version", "type", "arch"]: + if what in node: + del node[what] + node["type"] = "Windows" node["vendor"] = "Microsoft"

7 years, 4 months

4658 FIX Fixed permissions in BI packs using rules from other packs

by Simon Betz

Module: check_mk Branch: master Commit: 28463b4498455b8796394dafaae1c5fac8f9077b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28463b4498455b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 15 11:45:01 2017 +0200 4658 FIX Fixed permissions in BI packs using rules from other packs Change-Id: I272bcc753b6d287f5f9e063bc3c2915f3aed7874 --- .werks/4658 | 13 +++++++++++++ web/plugins/wato/bi.py | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/.werks/4658 b/.werks/4658 new file mode 100644 index 0000000..193c8a9 --- /dev/null +++ b/.werks/4658 @@ -0,0 +1,13 @@ +Title: Fixed permissions in BI packs using rules from other packs +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494836173 + +If users use rules with node rules from other BI packs for which they have +no permissions, these parent rules could be damaged by editing them. Now they +get an error message and editing is not allowed any more. diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 295fa6a..b9c1c75 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1490,6 +1490,7 @@ class ModeBIEditRule(ModeBI): def page(self): + self._may_use_rules_from_packs() if self._new: cloneid = html.var("clone") if cloneid: @@ -1518,6 +1519,24 @@ class ModeBIEditRule(ModeBI): html.end_form() + def _may_use_rules_from_packs(self): + rules_without_permissions = {} + for node in self._pack["rules"][self._ruleid]["nodes"]: + node_type, node_content = node + node_name = node_content[0] + pack = self.pack_containing_rule(node_name) + if node_type == 'call' and not self.may_use_rules_in_pack(pack): + packid = (pack['id'], pack['title']) + rules_without_permissions.setdefault(packid, []) + rules_without_permissions[packid].append(node_name) + + if rules_without_permissions: + message = ", ".join([_("in BI rules %s used in pack '%s'") % \ + (", ".join([ "'%s'" % ruleid for ruleid in ruleids]), title) + for (nodeid, title), ruleids in rules_without_permissions.items()]) + raise MKAuthException(_("You have no permission for changes %s.") % message) + + def valuespec(self): elements = [ ( "id",

7 years, 4 months

4698 FIX netapp_api_volumes: Changed service description for clustermode volumes

by Andreas Boesl

Module: check_mk Branch: master Commit: be7bf548cfe0b1588cc0ef249ea7a85a6f4b1519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be7bf548cfe0b1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 15 11:31:27 2017 +0200 4698 FIX netapp_api_volumes: Changed service description for clustermode volumes The service description for clustermode volumes now always consists of the SVM name and the volume name. The old description used the node name and the volume name, which was not sufficient to uniquely identify the volume. Change-Id: Ia1543b53a2f37e8d32fdd16e31564b4b95272325 --- .werks/4698 | 13 +++++++++++++ agents/special/agent_netapp | 2 +- checks/netapp_api_volumes | 8 ++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.werks/4698 b/.werks/4698 new file mode 100644 index 0000000..1fda5ca --- /dev/null +++ b/.werks/4698 @@ -0,0 +1,13 @@ +Title: netapp_api_volumes: Changed service description for clustermode volumes +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1494840344 +Class: fix + +The service description for clustermode volumes now always consists of the SVM name and the +volume name. The old description used the node name and the volume name, which was not sufficient +to uniquely identify the volume. + diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index dabdfb9..0722baf 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -1052,7 +1052,7 @@ try: "volume-inode-attributes.files-used" : "files-used" }, extra_info = create_dict(volume_counters, custom_key = [ "instance_uuid" ]), extra_info_report = sum(map(lambda x: ["%s" % x, "nfs_%s" % x, "cifs_%s" % x, "san_%s" % x, "fcp_%s" % x, "iscsi_%s" % x], - sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency", "ops"]), [])), []) + [ "instance_name" ], + sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency", "ops"]), [])), []) + [ "instance_name", "vserver_name" ], skip_missing_config_key = True ) diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index f2f4f46..74d5709 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -37,12 +37,8 @@ def parse_netapp_api_volumes(info): volume[tokens[0]] = tokens[1] # Clustermode specific - if "node" in volume: - # There are cluster volumes and volumes which only exist on the node. - if "msid" not in volume: - name = "%s.%s" % (volume["node"], volume["name"]) - else: - name = volume["name"] + if "vserver_name" in volume: + name = "%s.%s" % (volume["vserver_name"], volume["name"]) volumes[name] = volume

7 years, 4 months

4591 Added bulk deletion operation for BI rules

by Simon Betz

Module: check_mk Branch: master Commit: 0576a876e8a2180836545ad6af1faff74f8b78b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0576a876e8a218… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 25 15:18:43 2017 +0200 4591 Added bulk deletion operation for BI rules Change-Id: Ib8d67d9853202a3554f7d04656eb62bad6be8782 --- .werks/4591 | 10 ++++++ web/plugins/wato/bi.py | 90 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 86 insertions(+), 14 deletions(-) diff --git a/.werks/4591 b/.werks/4591 new file mode 100644 index 0000000..73cd5f1 --- /dev/null +++ b/.werks/4591 @@ -0,0 +1,10 @@ +Title: Added bulk deletion operation for BI rules +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493126215 +Class: feature + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 5db13df..295fa6a 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1107,24 +1107,67 @@ class ModeBIRules(ModeBI): def action(self): self.must_be_contact_for_pack() + if html.var("_del_rule"): - ruleid = html.var("_del_rule") - aggr_refs, rule_refs, level = self.count_rule_references(ruleid) - if aggr_refs: - raise MKUserError(None, _("You cannot delete this rule: it is still used by aggregations.")) - if rule_refs: - raise MKUserError(None, _("You cannot delete this rule: it is still used by other rules.")) - c = wato_confirm(_("Confirm rule deletion"), - _("Do you really want to delete the rule with " - "the id %s?") % ruleid) + return self._delete_rule_after_confirm() + + elif html.var("_bulk_delete_bi_rules"): + return self._bulk_delete_rules_after_confirm() + + + def _delete_rule_after_confirm(self): + ruleid = html.var("_del_rule") + + self._check_delete_ruleid_permission(ruleid) + + c = wato_confirm(_("Confirm rule deletion"), + _("Do you really want to delete the rule with " + "the id %s?") % ruleid) + if c: + del self._pack["rules"][ruleid] + self._add_change("bi-delete-rule", + _("Deleted BI rule with id %s") % ruleid) + self.save_config() + + elif c == False: # not yet confirmed + return "" + + + def _bulk_delete_rules_after_confirm(self): + selected_rules = self._get_selected_rules() + for ruleid in selected_rules: + self._check_delete_ruleid_permission(ruleid) + + if selected_rules: + c = wato_confirm(_("Confirm deletion of %d rules") % \ + len(selected_rules), + _("Do you really want to delete %d rules?") % \ + len(selected_rules)) if c: - del self._pack["rules"][ruleid] - self._add_change("bi-delete-rule", _("Deleted BI rule with id %s") % ruleid) + for ruleid in selected_rules: + del self._pack["rules"][ruleid] + self._add_change("bi-delete-rule", + _("Deleted BI rule with id %s") % ruleid) self.save_config() - elif c == False: # not yet confirmed + + elif c == False: return "" - else: - return None # browser reload + + + def _check_delete_ruleid_permission(self, ruleid): + aggr_refs, rule_refs, level = self.count_rule_references(ruleid) + if aggr_refs: + raise MKUserError(None, _("You cannot delete this rule: it is still used by aggregations.")) + if rule_refs: + raise MKUserError(None, _("You cannot delete this rule: it is still used by other rules.")) + + + def _get_selected_rules(self): + selected_rules = [] + for varname in html.all_varnames_with_prefix("_c_rule_"): + if html.get_checkbox(varname): + selected_rules.append(varname.split("_c_rule_")[-1]) + return selected_rules def page(self): @@ -1138,11 +1181,20 @@ class ModeBIRules(ModeBI): render_main_menu(menu_items) return + html.begin_form("bulk_delete_form", method = "POST") + if self._view_type == "list": self.render_rules(_("Rules"), only_unused = False) else: self.render_rules(_("Unused BI Rules"), only_unused = True) + html.hidden_fields() + fieldstyle = "margin-top:10px" + + html.button("_bulk_delete_bi_rules", _("Bulk Delete"), "submit", style=fieldstyle) + + html.end_form() + def render_rules(self, title, only_unused): aggregations_that_use_rule = self.find_aggregation_rule_usages() @@ -1158,6 +1210,14 @@ class ModeBIRules(ModeBI): refs = aggr_refs + rule_refs if not only_unused or refs == 0: table.row() + + # Checkboxes + table.cell(html.render_input("_toggle_group", type_="button", + class_="checkgroup", onclick="toggle_all_rows();", + value='X'), sortable=False, css="checkbox") + + html.checkbox("_c_rule_%s" % ruleid) + table.cell(_("Actions"), css="buttons") edit_url = self.url_to_pack([("mode", "bi_edit_rule"), ("id", ruleid)]) @@ -1169,6 +1229,7 @@ class ModeBIRules(ModeBI): if rule_refs == 0: tree_url = html.makeuri([("mode", "bi_rule_tree"), ("id", ruleid)]) html.icon_button(tree_url, _("This is a top-level rule. Show rule tree"), "bitree") + if refs == 0: delete_url = html.makeactionuri_contextless([("mode", "bi_rules"), ("_del_rule", ruleid), ("pack", self._pack_id)]) html.icon_button(delete_url, _("Delete this rule"), "delete") @@ -1195,6 +1256,7 @@ class ModeBIRules(ModeBI): html.br() have_this.add(aggr_id) table.cell(_("Comment"), rule.get("comment", "")) + table.end()

7 years, 4 months

Always log Livestatus errors.

by Sven Panne

Module: check_mk Branch: master Commit: 8f2070a2c109deb6ae0f7e5eba1cfcc1b44ad7de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f2070a2c109de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 15 10:28:28 2017 +0200 Always log Livestatus errors. Change-Id: I9d39353a909db6e029a80873afe63057601e6fe5 --- livestatus/src/OutputBuffer.cc | 1 + livestatus/src/Query.cc | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 474c4ba..16aa419 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -100,6 +100,7 @@ void OutputBuffer::writeData(ostringstream &os) { } void OutputBuffer::setError(ResponseCode code, const string &message) { + Warning(_logger) << "error: " << message; // only the first error is being returned if (_error_message == "") { Informational(_logger) << "error: " << message; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index b29291a..98197d4 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -659,8 +659,7 @@ void Query::parseLocaltimeLine(char *line) { } if (full >= 48 || full <= -48) { invalidHeader( - "Invalid Localtime header: timezone difference " - "greater then 24 hours"); + "Invalid Localtime header: timezone difference greater then 24 hours"); return; } _timezone_offset = full * 1800; @@ -711,8 +710,6 @@ void Query::start(QueryRenderer &q) { bool Query::timelimitReached() { if (_time_limit >= 0 && time(nullptr) >= _time_limit_timeout) { - Informational(_logger) - << "Maximum query time of " << _time_limit << " seconds exceeded!"; _output.setError(OutputBuffer::ResponseCode::limit_exceeded, "Maximum query time of " + to_string(_time_limit) + " seconds exceeded!");

7 years, 4 months

4688 FIX Emit error message in livestatus response

by Sven Panne

Module: check_mk Branch: master Commit: faff77559ecc25d552af04b2fd85526a51d9c8ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faff77559ecc25… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 15 10:15:15 2017 +0200 4688 FIX Emit error message in livestatus response When the 'fixed16' response format is used, the Livestatus response should contain the actual error message when something goes wrong. This was broken in the 1.4 series and has been fixed now. Change-Id: Icb2af944ac25601c0626d7aa59f67f6a92ec5cc2 --- .werks/4688 | 12 ++++++++++++ livestatus/src/OutputBuffer.cc | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4688 b/.werks/4688 new file mode 100644 index 0000000..fda9acb --- /dev/null +++ b/.werks/4688 @@ -0,0 +1,12 @@ +Title: Emit error message in livestatus response +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494835970 +Class: fix + +When the 'fixed16' response format is used, the Livestatus response should +contain the actual error message when something goes wrong. This was broken +in the 1.4 series and has been fixed now. diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 673cb64..474c4ba 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -55,7 +55,9 @@ OutputBuffer::~OutputBuffer() { flush(); } void OutputBuffer::flush() { if (_response_header == ResponseHeader::fixed16) { if (_response_code != ResponseCode::ok) { - _os.str(_error_message); + _os.clear(); + _os.str(""); + _os << _error_message; } auto code = static_cast<unsigned>(_response_code); size_t size = _os.tellp();

7 years, 4 months

Slightly improved error message.

by Sven Panne

Module: check_mk Branch: master Commit: 5fdea57201bcfedc4bc07a4ba7a8c050c0d37dc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fdea57201bcfe… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 15 10:00:58 2017 +0200 Slightly improved error message. Change-Id: I6acf7f3abaae8130c9a9ba85973c6675687cef01 --- livestatus/src/Query.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index da66da9..b29291a 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -206,8 +206,8 @@ unique_ptr<Filter> Query::createFilter(Column &column, RelationalOperator relOp, try { return column.createFilter(relOp, value); } catch (const runtime_error &e) { - invalidHeader("error creating filter on table" + _table->name() + ": " + - e.what()); + invalidHeader("error creating filter on table " + _table->name() + + ": " + e.what()); return nullptr; } }

7 years, 4 months

ups_power: Fixed wrong include statement

by Lars Michelsen

Module: check_mk Branch: master Commit: 10a624db004e1d6b40af94c7f5b4027afa81ffb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a624db004e1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 12 15:56:32 2017 +0200 ups_power: Fixed wrong include statement Change-Id: Ia4ce22c099dc407f48481d428f68da0d975147b3 --- checks/ups_power | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ups_power b/checks/ups_power index 48b5158..499e130 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,5 +60,5 @@ check_info['ups_power'] = { "group" : "epower", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : ups_generic_scan_function, - "includes" : "ups_generic.include", + "includes" : [ "ups_generic.include" ], }

7 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017