Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6007 FIX etherbox.temp: Fixed another UnicodeDecodeError

by Simon Betz

Module: check_mk Branch: master Commit: 9efb07f2b5be0aecf9bc533c643f6f26ef9152af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9efb07f2b5be0a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 08:54:54 2018 +0200 6007 FIX etherbox.temp: Fixed another UnicodeDecodeError Change-Id: Ifc92cd4d75ef57a50f23e535026a30cadd9cbf60 --- .werks/6007 | 10 ++++++++++ checks/etherbox | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6007 b/.werks/6007 new file mode 100644 index 0000000..63fb3f0 --- /dev/null +++ b/.werks/6007 @@ -0,0 +1,10 @@ +Title: etherbox.temp: Fixed another UnicodeDecodeError +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525848865 +Class: fix + + diff --git a/checks/etherbox b/checks/etherbox index 61591e0..1721f98 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -103,7 +103,7 @@ def check_etherbox_temp(item, params, info): uom = { "0": "c", "1": "f", "2": "k" }[info[0][0][0]] temp = int(value) / 10.0 state, infotext, perfdata = check_temperature(temp, params, "etherbox_temp_%s" % item, uom) - return state, "[%s] %s" % (name, infotext), perfdata + return state, "[%s] %s" % (name, infotext.decode("utf8")), perfdata check_info["etherbox.temp"] = {

6 years, 4 months

6006 FIX pvecm_nodes, pvecm_status: Now supports Proxmox VE Cluster versions greater equal 3

by Simon Betz

Module: check_mk Branch: master Commit: b2a575d6404db4c98ec5ffe99d96336c8470a12c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a575d6404db4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 08:32:42 2018 +0200 6006 FIX pvecm_nodes, pvecm_status: Now supports Proxmox VE Cluster versions greater equal 3 Change-Id: Ie081ab8430b64bc44e32f126706cc7ee8db73d9a --- .werks/6006 | 10 +++++++ checks/pvecm_nodes | 82 ++++++++++++++++++++++++++++++++++++++++++----------- checks/pvecm_status | 27 +++++++++++------- 3 files changed, 92 insertions(+), 27 deletions(-) diff --git a/.werks/6006 b/.werks/6006 new file mode 100644 index 0000000..62d6730 --- /dev/null +++ b/.werks/6006 @@ -0,0 +1,10 @@ +Title: pvecm_nodes, pvecm_status: Now supports Proxmox VE Cluster versions greater equal 3 +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525847478 +Class: fix + + diff --git a/checks/pvecm_nodes b/checks/pvecm_nodes index de0af76..21f6b98 100644 --- a/checks/pvecm_nodes +++ b/checks/pvecm_nodes @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. +# Version 2 # healthy if all nodes are reachable (at discovery) # <<<pvecm_nodes>>> # Node Sts Inc Joined Name @@ -56,34 +57,81 @@ # 6 M 36032 BAR-host003 # 7 M 35960 2016-01-20 13:17:24 BAR-host001 +# Version >2 +# <<<pvecm_nodes>>> +# +# Membership information +# ~~~~~~~~~~~~~~~~~~~~~~ +# Nodeid Votes Name +# 1 1 hp1 (local) +# 2 1 hp2 +# 3 1 hp3 +# 4 1 hp4 + + +def parse_pvecm_nodes(info): + parsed = {} + header = None + for line in info: + if line == ["Node", "Sts", "Inc", "Joined", "Name"]: + header = ["node_id", "status", "joined", "name"] + parse_func = _parse_version_eq_2 + continue + + elif line == ["Nodeid", "Votes", "Name"]: + header = ["node_id", "votes", "name"] + parse_func = _parse_version_gt_2 + continue + + if header is None: + continue + + k, v = parse_func(line, header) + parsed.setdefault(k, v) + return parsed + -def inventory_pvecm_nodes(info): - for line in info[1:]: - yield (line[-1], None) +def _parse_version_eq_2(line, header): + if len(line) == 6: + data = dict(zip(header[:3], line[:2] + [" ".join(line[3:5])])) + else: + data = dict(zip(["node_id", "status"], line[:2])) + return line[-1], data -def check_pvecm_nodes(item, _no_params, info): +def _parse_version_gt_2(line, header): + return " ".join(line[2:]), dict(zip(header[:2], line[:2])) + + +def inventory_pvecm_nodes(parsed): + for name in parsed: + yield name, None + + +def check_pvecm_nodes(item, _no_params, parsed): + if item not in parsed: + return 2, "Node is missing" + map_states = { "m" : (0, "member of the cluster"), "x" : (1, "not a member of the cluster"), "d" : (2, "known to the cluster but disallowed access to it"), } - for line in info[1:]: - if item == line[-1]: - state, state_readable = map_states[line[1].lower()] - infotext = "Status: %s" % state_readable - if len(line) >= 6: - infotext += ", Joined: %s (%s)" % (line[4], line[3]) - - else: - infotext += ", Joined: missing" - - return state, infotext - - return 2, "Node is missing" + data = parsed[item] + infotexts = ["ID: %s" % data["node_id"]] + state = 0 + if "status" in data: + state, state_readable = map_states[data["status"].lower()] + infotexts.append("Status: %s" % state_readable) + if "joined" in data: + infotexts.append("Joined: %s" % data["joined"]) + if "votes" in data: + infotexts.append("Votes: %s" % data["votes"]) + return state, ", ".join(infotexts) check_info['pvecm_nodes'] = { + 'parse_function' : parse_pvecm_nodes, 'inventory_function' : inventory_pvecm_nodes, 'check_function' : check_pvecm_nodes, 'service_description' : 'PVE Node %s', diff --git a/checks/pvecm_status b/checks/pvecm_status index 7c87fb3..6728630 100644 --- a/checks/pvecm_status +++ b/checks/pvecm_status @@ -71,27 +71,33 @@ # Node addresses: nnn.mmm.ooo.ppp -def inventory_pvecm_status(info): - return [(None, None)] - - -def check_pvecm_status(_no_item, _no_params, info): +def parse_pvecm_status(info): parsed = {} for line in info: - if len(line) != 2: + if len(line) < 2: continue - what, value = line + k = line[0].strip().lower() + if k == "date": + v = ":".join(line[1:]).strip() + else: + v = " ".join(line[1:]).strip() + parsed.setdefault(k, v) + return parsed + + +def inventory_pvecm_status(parsed): + if parsed: + return [(None, None)] - parsed[what.lower()] = value.strip().lower() +def check_pvecm_status(_no_item, _no_params, parsed): if "cman_tool" in parsed and \ "cannot open connection to cman" in parsed["cman_tool"]: yield 2, "Cluster management tool: %s" % parsed["cman_tool"] else: name = parsed.get("cluster name", - parsed.get("quorum provider", - "unknown")) + parsed.get("quorum provider", "unknown")) yield 0, "Name: %s, Nodes: %s" % \ (name, parsed["nodes"]) @@ -107,6 +113,7 @@ def check_pvecm_status(_no_item, _no_params, info): check_info['pvecm_status'] = { + 'parse_function' : parse_pvecm_status, 'inventory_function' : inventory_pvecm_status, 'check_function' : check_pvecm_status, 'service_description' : 'PVE Cluster State',

6 years, 4 months

Deobfuscation: Replace some globals()-Kung-Fu by a plain old if cascade.

by Sven Panne

Module: check_mk Branch: master Commit: af405b98711d60aa54121926df275f1b59d99981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af405b98711d60… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 08:19:36 2018 +0200 Deobfuscation: Replace some globals()-Kung-Fu by a plain old if cascade. Readers of the code (including mypy) will be grateful for this... Change-Id: I0b00b90270f1db27c87ff432881b74eeb5d7f53d --- cmk/ec/main.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 082f7ca..0522cf9 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3131,33 +3131,26 @@ class Queries(object): break self._buffer += data request, self._buffer = parts - - request_lines = request.decode("utf-8").splitlines() - - cls = Query.get_query_class(request_lines) - return cls(self._status_server, request_lines) + return Query.make(self._status_server, request.decode("utf-8").splitlines()) class Query(object): - _allowed_methods = set(["GET", "REPLICATE", "COMMAND"]) _allowed_formats = set(["python", "plain", "json"]) _allowed_headers = set(["OutputFormat", "Filter", "Columns", "Limit"]) - @classmethod - def get_query_class(cls, raw_query): + @staticmethod + def make(status_server, raw_query): parts = raw_query[0].split(None, 1) if len(parts) != 2: raise MKClientError("Invalid query. Need GET/COMMAND plus argument(s)") - method = parts[0] - - if method not in cls._allowed_methods: - raise MKClientError("Invalid method %s (allowed are %s) " % - (method, ", ".join(cls._allowed_methods))) - - # TODO: This is pure maintenance horror! Never ever calculate the name - # of a class in user code... - return globals()["Query%s" % method] + if method == "GET": + return QueryGET(status_server, raw_query) + if method == "REPLICATE": + return QueryREPLICATE(status_server, raw_query) + if method == "COMMAND": + return QueryCOMMAND(status_server, raw_query) + raise MKClientError("Invalid method %s (allowed are GET, REPLICATE, COMMAND)" % method) def __init__(self, status_server, raw_query): super(Query, self).__init__()

6 years, 4 months

Cleanup of checkmk.js

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 101c9ec7da3251b5509e20c5135c0eb8b450cd93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=101c9ec7da3251… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue May 8 18:39:55 2018 +0200 Cleanup of checkmk.js Change-Id: I0bd2c511f166231cbf182e19d8bd0c9a75c13e66 --- web/htdocs/js/checkmk.js | 137 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=101c9ec7da…

6 years, 4 months

hp_procurve_cpu: Fixed invalid parameter format

by Simon Betz

Module: check_mk Branch: master Commit: 9e1c391036684b5495bae9ee6f380a277c666848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e1c391036684b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 18:09:11 2018 +0200 hp_procurve_cpu: Fixed invalid parameter format Change-Id: I49b0e334e41b77482b72a86bd7307206791ca441 --- .werks/6005 | 10 ++++++++++ checks/hp_procurve_cpu | 24 +++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.werks/6005 b/.werks/6005 new file mode 100644 index 0000000..8e1ea4a --- /dev/null +++ b/.werks/6005 @@ -0,0 +1,10 @@ +Title: hp_procurve_cpu: Fixed invalid parameter format +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525795585 +Class: fix + + diff --git a/checks/hp_procurve_cpu b/checks/hp_procurve_cpu index 9a45fef..92ae0e4 100644 --- a/checks/hp_procurve_cpu +++ b/checks/hp_procurve_cpu @@ -35,23 +35,25 @@ def inventory_hp_procurve_cpu(info): if len(info) == 1 and int(info[0][0]) >= 0 <= 100: return [ (None, 'hp_procurve_cpu_default_levels') ] + def check_hp_procurve_cpu(item, params, info): + if not isinstance(params, tuple): + params = (None, None) + if len(info) == 1: cpu_util = int(info[0][0]) if cpu_util >= 0 and cpu_util <= 100: - status = 0 - output = '' - if cpu_util >= params[1]: + infotext = "Usage: %s%%" % cpu_util + warn, crit = params + if crit is not None and cpu_util >= crit: status = 2 - output = ' (Above %d%%)' % params[1] - elif cpu_util >= params[0]: + elif warn is not None and cpu_util >= warn: status = 1 - output = ' (Above %d%%)' % params[0] - - return (status, 'CPU utilization is %d%% %s' % (cpu_util, output), - [('util', '%d%%' % cpu_util, params[0], params[1], 0, 100)]) - - return (3, "Invalid information in snmp data") + else: + status = 0 + if status: + infotext += " (warn/crit at %s/%s)" % (warn, crit) + return status, infotext, [('util', '%d%%' % cpu_util, warn, crit, 0, 100)]

6 years, 4 months

6004 FIX dell_compellent_folder: Fixed forgotten include file '

by Simon Betz

size_trend.include' Message-ID: <5af1bb95.As5p6epncs3qB2xJ%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: 467f6ece0949eb975e8d914b2bead7590d8e2d2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=467f6ece0949eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 16:57:32 2018 +0200 6004 FIX dell_compellent_folder: Fixed forgotten include file 'size_trend.include' Change-Id: I9ab9beabdd3cdb42d6925336478fc335c558fd77 --- .werks/6004 | 10 ++++++++++ checks/dell_compellent_folder | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6004 b/.werks/6004 new file mode 100644 index 0000000..ec70681 --- /dev/null +++ b/.werks/6004 @@ -0,0 +1,10 @@ +Title: dell_compellent_folder: Fixed forgotten include file 'size_trend.include' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525791344 +Class: fix + + diff --git a/checks/dell_compellent_folder b/checks/dell_compellent_folder index f95ca49..0ec378f 100644 --- a/checks/dell_compellent_folder +++ b/checks/dell_compellent_folder @@ -52,5 +52,5 @@ check_info['dell_compellent_folder'] = { 9, # DELL-STORAGE-SC-MIB::scDiskFolderSUSpareSpace ]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.4.1.674.11000.2000.500.1.2.1.0"), - 'includes' : [ 'df.include' ], + 'includes' : [ 'df.include', 'size_trend.include' ], }

6 years, 4 months

6003 FIX HW/SW inventory: Fixed TypeError if any inventory hooks are executed

by Simon Betz

Module: check_mk Branch: master Commit: fe75e536f5fc020a6a542388ca17e6034b1ce07c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe75e536f5fc02… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 16:40:40 2018 +0200 6003 FIX HW/SW inventory: Fixed TypeError if any inventory hooks are executed Change-Id: I1e6cce66e33a10e9839b145d24b7ddf5aaed78f1 --- .werks/6003 | 10 ++++++++++ cmk_base/inventory.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6003 b/.werks/6003 new file mode 100644 index 0000000..6ff1c2c --- /dev/null +++ b/.werks/6003 @@ -0,0 +1,10 @@ +Title: HW/SW inventory: Fixed TypeError if any inventory hooks are executed +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525790394 +Class: fix + + diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 89dbcb0..0561e03 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -351,7 +351,7 @@ def _run_inventory_export_hooks(hostname, inventory_tree): for hookname, ruleset in config.inv_exports.items(): entries = rulesets.host_extra_conf(hostname, ruleset) if entries: - hooks.append(hookname, entries[0]) + hooks.append((hookname, entries[0])) if not hooks: return

6 years, 4 months

Fix check precaching issue by using pyc format and logic 1:1

by Lars Michelsen

Module: check_mk Branch: master Commit: 332e9439a4bac69a6fd728a7c80e4b305564ddd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=332e9439a4bac6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 8 16:04:07 2018 +0200 Fix check precaching issue by using pyc format and logic 1:1 Change-Id: I1861d11542e1285dec6e90cc81c2de84946e1637 --- cmk_base/checks.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 38bedb3..6ba089c 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -29,6 +29,8 @@ import math import copy import ast import marshal +import py_compile +import struct from collections import OrderedDict import cmk.paths @@ -383,21 +385,39 @@ def load_precompiled_plugin(path, check_context): console.vverbose("Precompile %s to %s\n" % (path, precompiled_path)) _precompile_plugin(path, precompiled_path) - exec(marshal.load(open(precompiled_path)), check_context) + exec(marshal.loads(open(precompiled_path, "rb").read()[8:]), check_context) def _is_plugin_precompiled(path, precompiled_path): - return os.path.exists(precompiled_path) \ - and os.stat(path).st_mtime < os.stat(precompiled_path).st_mtime + if not os.path.exists(precompiled_path): + return False + + # Check precompiled file header + f = open(precompiled_path, "rb") + + file_magic = f.read(4) + if file_magic != py_compile.MAGIC: + return False + + try: + origin_file_mtime = struct.unpack("I", f.read(4))[0] + except struct.error, e: + return False + + if long(os.stat(path).st_mtime) > origin_file_mtime: + return False + + return True def _precompile_plugin(path, precompiled_path): code = compile(open(path).read(), path, "exec") + plugin_mtime = os.stat(path).st_mtime if not os.path.exists(os.path.dirname(precompiled_path)): os.makedirs(os.path.dirname(precompiled_path)) - store.save_file(precompiled_path, marshal.dumps(code)) + py_compile.compile(path, precompiled_path, doraise=True) def _precompiled_plugin_path(path):

6 years, 4 months

More IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: c1872183d938c750fa4c574f9363154df99f22c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1872183d938c7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 8 08:52:04 2018 +0200 More IWYU fixes. Change-Id: I9d6e88ae9ef015908fd08010a7af485ff9a732c5 --- livestatus/src/AndingFilter.cc | 1 + livestatus/src/AndingFilter.h | 2 +- livestatus/src/ColumnFilter.h | 2 +- livestatus/src/OringFilter.cc | 1 + livestatus/src/OringFilter.h | 2 +- livestatus/src/RegExp.cc | 3 +++ livestatus/src/ServiceGroupMembersColumn.cc | 1 + livestatus/src/ServiceListColumn.cc | 1 + livestatus/src/StatsColumn.cc | 2 +- livestatus/src/TableColumns.cc | 1 + livestatus/src/TableCommands.cc | 1 + livestatus/src/TableComments.cc | 1 + livestatus/src/TableDowntimes.cc | 1 + livestatus/src/module.cc | 1 + 14 files changed, 16 insertions(+), 4 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 2b7726b..ff1e988 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" +#include <algorithm> #include <iterator> #include <memory> #include <ostream> diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index 6bc1cc1..426dcac 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -26,7 +26,6 @@ #define AndingFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <bitset> #include <chrono> #include <cstdint> @@ -35,6 +34,7 @@ #include <memory> #include <optional> #include <string> +#include <utility> #include "Filter.h" #include "contact_fwd.h" class Column; diff --git a/livestatus/src/ColumnFilter.h b/livestatus/src/ColumnFilter.h index fb6bf8f..b6871ae 100644 --- a/livestatus/src/ColumnFilter.h +++ b/livestatus/src/ColumnFilter.h @@ -26,11 +26,11 @@ #define ColumnFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <functional> #include <memory> #include <ostream> #include <string> +#include <utility> #include "Column.h" #include "Filter.h" #include "opids.h" diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index 492a48d..5d5eb00 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "OringFilter.h" +#include <algorithm> #include <iterator> #include <memory> #include <ostream> diff --git a/livestatus/src/OringFilter.h b/livestatus/src/OringFilter.h index 35ae845..3987dc2 100644 --- a/livestatus/src/OringFilter.h +++ b/livestatus/src/OringFilter.h @@ -26,7 +26,6 @@ #define OringFilter_h #include "config.h" // IWYU pragma: keep -#include <algorithm> #include <bitset> #include <chrono> #include <cstdint> @@ -35,6 +34,7 @@ #include <memory> #include <optional> #include <string> +#include <utility> #include "Filter.h" #include "contact_fwd.h" class Column; diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 3d6be85..71840d7 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -68,7 +68,10 @@ private: // ----------------------------------------------------------------------------- // standard <regex> implementation // ----------------------------------------------------------------------------- +#include <map> #include <regex> +#include <sstream> +#include <vector> class RegExp::Impl { public: Impl(const std::string &str, Case c, Syntax s) diff --git a/livestatus/src/ServiceGroupMembersColumn.cc b/livestatus/src/ServiceGroupMembersColumn.cc index 8e1e47a..e91e230 100644 --- a/livestatus/src/ServiceGroupMembersColumn.cc +++ b/livestatus/src/ServiceGroupMembersColumn.cc @@ -33,6 +33,7 @@ #include "Row.h" #ifdef CMC +#include <unordered_set> #include "Host.h" #include "LogEntry.h" #include "Service.h" diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index 11a680c..d4d9ae8 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -31,6 +31,7 @@ #ifdef CMC #include <cstdint> #include <memory> +#include <unordered_set> #include "Host.h" #include "LogEntry.h" #include "Service.h" diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index 669c765..71766e3 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -23,9 +23,9 @@ // Boston, MA 02110-1301 USA. #include "StatsColumn.h" -#include <algorithm> #include <ostream> #include <stdexcept> +#include <utility> #include "Aggregator.h" #include "AndingFilter.h" #include "Column.h" diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 502cb84..7a9cab0 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableColumns.h" +#include <map> #include <memory> #include "Column.h" #include "ColumnsColumn.h" diff --git a/livestatus/src/TableCommands.cc b/livestatus/src/TableCommands.cc index 9d0961c..9337a67 100644 --- a/livestatus/src/TableCommands.cc +++ b/livestatus/src/TableCommands.cc @@ -24,6 +24,7 @@ #include "TableCommands.h" #include <memory> +#include <vector> #include "Column.h" #include "MonitoringCore.h" #include "OffsetSStringColumn.h" diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index 86b0ea7..9fc3a64 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -27,6 +27,7 @@ #include <utility> #include "Column.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "MonitoringCore.h" #include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 7bdc5ca..9f86ed6 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -27,6 +27,7 @@ #include <utility> #include "Column.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "MonitoringCore.h" #include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 2ec373d..9085ad4 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -50,6 +50,7 @@ #include "ChronoUtils.h" #include "ClientQueue.h" #include "DowntimeOrComment.h" +#include "DowntimesOrComments.h" #include "InputBuffer.h" #include "LogEntry.h" // IWYU pragma: keep #include "Logger.h"

6 years, 4 months

5924 Windows: Use WMI for process monitoring by default

by Jukka Aro

Module: check_mk Branch: master Commit: 1e6329ceb36f0205e80597bfd020744230af85a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e6329ceb36f02… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue May 8 15:08:04 2018 +0200 5924 Windows: Use WMI for process monitoring by default The option use_wmi has been available as an 'experimental' feature for the section ps of the Windows agent since release 1.2.7i3. The default setting has still been to use the 'native' WinAPI for obtaining process information. As the native way seems to fail to obtain information about all desired processes at times and the WMI option seems to be working without significant problems, the default value of the option is now changed to 'yes'. --- .werks/5924 | 18 ++++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionPS.cc | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/5924 b/.werks/5924 new file mode 100644 index 0000000..e2705e6 --- /dev/null +++ b/.werks/5924 @@ -0,0 +1,18 @@ +Title: Windows: Use WMI for process monitoring by default +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525784407 +Class: feature + +The option use_wmi has been available as an 'experimental' feature +for the section ps of the Windows agent since release 1.2.7i3. The +default setting has still been to use the 'native' WinAPI for obtaining +process information. As the native way seems to fail to obtain +information about all desired processes at times and the WMI option +seems to be working without significant problems, the default value of +the option is now changed to 'yes'. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 0080ae0..b912429 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3252 +3254 diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 352aacb..2b07008 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -51,7 +51,7 @@ SectionPS::SectionPS(Configuration &config, Logger *logger, : Section( "ps", config.getEnvironment(), logger, winapi, std::make_unique<SectionHeader<'\t', SectionBrackets>>("ps", logger)) - , _use_wmi(config, "ps", "use_wmi", false, winapi) + , _use_wmi(config, "ps", "use_wmi", true, winapi) , _full_commandline(config, "ps", "full_path", false, winapi) {} SectionPS::process_entry_t SectionPS::getProcessPerfdata() {

6 years, 4 months

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018