Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Windows agent: fix unpacking of binary plugins

by Jukka Aro

Module: check_mk Branch: master Commit: fe34b546c598371e95dcd253304813b8ce42aa96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe34b546c59837… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 2 16:35:29 2018 +0100 Windows agent: fix unpacking of binary plugins Broken by #5700 in master. --- agents/windows/WritableFile.cc | 9 +++++++++ agents/windows/WritableFile.h | 8 ++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 21 +++++++++++++-------- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/agents/windows/WritableFile.cc b/agents/windows/WritableFile.cc index e8aaded..43bb7d4 100644 --- a/agents/windows/WritableFile.cc +++ b/agents/windows/WritableFile.cc @@ -59,6 +59,15 @@ WritableFile &WritableFile::operator<<(const std::string &s) { return *this; } +WritableFile &WritableFile::operator<<(const std::vector<BYTE> &s) { + DWORD written = 0; + if (!_winapi.WriteFile(_hFile.get(), s.data(), s.size(), &written, + nullptr)) { + throw FileError(_path, get_win_error_as_string(_winapi)); + } + return *this; +} + std::unordered_set<std::string> getDefaultWhitelist( const Environment &env, const WinApiAdaptor &winapi) { std::unordered_set<std::string> whitelist = { diff --git a/agents/windows/WritableFile.h b/agents/windows/WritableFile.h index 48dca6b..b251b8b 100644 --- a/agents/windows/WritableFile.h +++ b/agents/windows/WritableFile.h @@ -68,6 +68,14 @@ public: */ WritableFile &operator<<(const std::string &s); + /** + * Write given byte sequence to file. + * + * @param[in] s Byte sequence to be written + * @throw FileError If the write operation fails + */ + WritableFile &operator<<(const std::vector<BYTE> &s); + private: const std::string _path; WrappedHandle<InvalidHandleTraits> _hFile; diff --git a/agents/windows/build_version b/agents/windows/build_version index 2aeb20d..09dcc41 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3086 +3090 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 220cd6f..cf27f1b 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -110,7 +110,6 @@ using std::vector; // | Declarations of macros, structs and function prototypes | // '----------------------------------------------------------------------' - static const char RT_PROTOCOL_VERSION[2] = {'0', '0'}; #define SERVICE_NAME "Check_MK_Agent" @@ -843,7 +842,7 @@ std::string managePluginPath(const std::string &filePath, } template <typename LengthT> -std::vector<BYTE> readData(std::ifstream &ifs, +std::vector<BYTE> readData(std::ifstream &ifs, bool zeroTerminate, const std::function<void(LengthT)> &check = [](LengthT) {}) { LengthT length = 0; @@ -852,22 +851,28 @@ std::vector<BYTE> readData(std::ifstream &ifs, return {}; } check(length); - std::vector<BYTE> dataBuffer; - dataBuffer.reserve(static_cast<size_t>(length + 1)); + size_t count = length; + if (zeroTerminate) { + count += 1; + } + std::vector<BYTE> dataBuffer(count, 0); ifs.read(reinterpret_cast<char *>(dataBuffer.data()), length); if (!ifs.good()) { throw UnpackError(integrityErrorMsg); } - dataBuffer[length] = '\0'; + if (zeroTerminate) { + dataBuffer[length] = '\0'; + } + return dataBuffer; } void extractPlugin(const Environment &env, std::ifstream &ifs, WritableFile &uninstallFile) { // Read Filename - const auto filepath = readData<BYTE>(ifs); + const auto filepath = readData<BYTE>(ifs, true); if (!ifs.good()) { if (ifs.eof()) { @@ -884,7 +889,7 @@ void extractPlugin(const Environment &env, std::ifstream &ifs, "' exceeds 20 MB"); } }; - const auto content = readData<int>(ifs, checkPluginSize); + const auto content = readData<int>(ifs, false, checkPluginSize); if (!ifs.good()) { throw UnpackError(integrityErrorMsg); } @@ -895,7 +900,7 @@ void extractPlugin(const Environment &env, std::ifstream &ifs, // Write plugin WritableFile pluginFile(pluginPath, 0, CREATE_NEW, s_winapi); - pluginFile << reinterpret_cast<char const *>(content.data()); + pluginFile << content; } } // namespace

6 years, 4 months

Windows agent: fix linkage of Check_MK version str

by Jukka Aro

Module: check_mk Branch: master Commit: 11aef693ca8862d6af49ab08d6b449b6d4a56b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11aef693ca8862… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 2 13:36:28 2018 +0100 Windows agent: fix linkage of Check_MK version str Rely on preprocessor macro, do not try to redefine it as a global variable. --- agents/windows/check_mk_agent.cc | 5 ++--- agents/windows/sections/SectionCheckMK.cc | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 564a71c..220cd6f 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -110,7 +110,6 @@ using std::vector; // | Declarations of macros, structs and function prototypes | // '----------------------------------------------------------------------' -const char *check_mk_version = CHECK_MK_VERSION; static const char RT_PROTOCOL_VERSION[2] = {'0', '0'}; @@ -503,7 +502,7 @@ void usage() { "of debug output\n" "check_mk_agent showconfig -- shows the effective " "configuration used (currently incomplete)\n", - check_mk_version, *s_config->port); + CHECK_MK_VERSION, *s_config->port); exit(1); } @@ -805,7 +804,7 @@ void output_data(OutputProxy &out, const Environment &env, bool realtime, out.flush(true); } -void show_version() { printf("Check_MK_Agent version %s\n", check_mk_version); } +void show_version() { printf("Check_MK_Agent version %s\n", CHECK_MK_VERSION); } void show_config() { s_config->parser.outputConfigurables(std::cout); } diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index a93e60e..be0c7c0 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -31,7 +31,6 @@ #include "Logger.h" #include "stringutil.h" -extern const char *check_mk_version; struct script_statistics_t { int pl_count; @@ -59,7 +58,7 @@ std::vector<KVPair> SectionCheckMK::createInfoFields() const { // common fields std::vector<KVPair> info_fields = { - {"Version", check_mk_version}, + {"Version", CHECK_MK_VERSION}, {"BuildDate", __DATE__}, {"AgentOS", "windows"}, {"Hostname", _env.hostname()},

6 years, 4 months

Fixed typo

by Marcel Arentz

Module: check_mk Branch: master Commit: 83e7052ca70e816d2790c94da93a03874917b1a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83e7052ca70e81… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Feb 2 13:41:38 2018 +0100 Fixed typo Change-Id: I87449ed5dfffe50f632f1e8ed3a78a7963d20b34 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dd36d82..59734a6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3420,7 +3420,7 @@ class ModeDiscovery(WatoMode): "to be monitored.")), (self.SERVICE_IGNORED, True, _("Disabled services"), _("These services are being discovered but have been disabled by creating a rule " - "in the rule set Disabled services oder Disabled checks.")), + "in the rule set Disabled services or Disabled checks.")), ("active", False, _("Active checks"), _("These services do not use the Check_MK agent or Check_MK-SNMP engine but actively " "call classical check plugins. They have been added by a rule in the section "

6 years, 4 months

Remove obscure cmk -> lib link by renaming lib.

by Sven Panne

Module: check_mk Branch: master Commit: d9daa7e9f63503d381c61049764b28f3140edb86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9daa7e9f63503… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 2 08:59:40 2018 +0100 Remove obscure cmk -> lib link by renaming lib. A quick grep showed that we import modules only via cmk.foo (not lib.foo), so this should work. If not, our CI will hopefully tell us, and we'll fix that. As it stands, the symbolic link confuses a few tools and most humans. Change-Id: Id770395021aac56576b6b62200d5efb7e4f8739e --- cmk | 1 - {lib => cmk}/.f12 | 0 {lib => cmk}/__init__.py | 0 {lib => cmk}/cpu_tracking.py | 0 {lib => cmk}/crash_reporting.py | 0 {lib => cmk}/daemon.py | 0 {lib => cmk}/debug.py | 0 {lib => cmk}/defines.py | 0 {lib => cmk}/event_console.py | 0 {lib => cmk}/exceptions.py | 0 {lib => cmk}/log.py | 0 {lib => cmk}/man_pages.py | 0 {lib => cmk}/password_store.py | 0 {lib => cmk}/paths.py | 0 {lib => cmk}/profile.py | 0 {lib => cmk}/regex.py | 0 {lib => cmk}/render.py | 0 {lib => cmk}/schedule.py | 0 {lib => cmk}/store.py | 0 {lib => cmk}/structured_data.py | 0 {lib => cmk}/translations.py | 0 {lib => cmk}/tty.py | 0 {lib => cmk}/werks.py | 0 23 files changed, 1 deletion(-) diff --git a/cmk b/cmk deleted file mode 120000 index 7951405..0000000 --- a/cmk +++ /dev/null @@ -1 +0,0 @@ -lib \ No newline at end of file diff --git a/lib/.f12 b/cmk/.f12 similarity index 100% rename from lib/.f12 rename to cmk/.f12 diff --git a/lib/__init__.py b/cmk/__init__.py similarity index 100% rename from lib/__init__.py rename to cmk/__init__.py diff --git a/lib/cpu_tracking.py b/cmk/cpu_tracking.py similarity index 100% rename from lib/cpu_tracking.py rename to cmk/cpu_tracking.py diff --git a/lib/crash_reporting.py b/cmk/crash_reporting.py similarity index 100% rename from lib/crash_reporting.py rename to cmk/crash_reporting.py diff --git a/lib/daemon.py b/cmk/daemon.py similarity index 100% rename from lib/daemon.py rename to cmk/daemon.py diff --git a/lib/debug.py b/cmk/debug.py similarity index 100% rename from lib/debug.py rename to cmk/debug.py diff --git a/lib/defines.py b/cmk/defines.py similarity index 100% rename from lib/defines.py rename to cmk/defines.py diff --git a/lib/event_console.py b/cmk/event_console.py similarity index 100% rename from lib/event_console.py rename to cmk/event_console.py diff --git a/lib/exceptions.py b/cmk/exceptions.py similarity index 100% rename from lib/exceptions.py rename to cmk/exceptions.py diff --git a/lib/log.py b/cmk/log.py similarity index 100% rename from lib/log.py rename to cmk/log.py diff --git a/lib/man_pages.py b/cmk/man_pages.py similarity index 100% rename from lib/man_pages.py rename to cmk/man_pages.py diff --git a/lib/password_store.py b/cmk/password_store.py similarity index 100% rename from lib/password_store.py rename to cmk/password_store.py diff --git a/lib/paths.py b/cmk/paths.py similarity index 100% rename from lib/paths.py rename to cmk/paths.py diff --git a/lib/profile.py b/cmk/profile.py similarity index 100% rename from lib/profile.py rename to cmk/profile.py diff --git a/lib/regex.py b/cmk/regex.py similarity index 100% rename from lib/regex.py rename to cmk/regex.py diff --git a/lib/render.py b/cmk/render.py similarity index 100% rename from lib/render.py rename to cmk/render.py diff --git a/lib/schedule.py b/cmk/schedule.py similarity index 100% rename from lib/schedule.py rename to cmk/schedule.py diff --git a/lib/store.py b/cmk/store.py similarity index 100% rename from lib/store.py rename to cmk/store.py diff --git a/lib/structured_data.py b/cmk/structured_data.py similarity index 100% rename from lib/structured_data.py rename to cmk/structured_data.py diff --git a/lib/translations.py b/cmk/translations.py similarity index 100% rename from lib/translations.py rename to cmk/translations.py diff --git a/lib/tty.py b/cmk/tty.py similarity index 100% rename from lib/tty.py rename to cmk/tty.py diff --git a/lib/werks.py b/cmk/werks.py similarity index 100% rename from lib/werks.py rename to cmk/werks.py

6 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 70870125f085af73bcce6e06309310251f9916e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70870125f085af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 1 21:23:26 2018 +0100 Reserved 20 Werk IDS Change-Id: I8432bc132b18e1d65b30a96c1a61e66e71dca25f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 028dd10..aff5b11 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5718 +5738

6 years, 4 months

5497 statgrab_net: collect net stats for local zones if dlstat exists

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7adf2422cbb0f032e577087ac4ec9f0086caae1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7adf2422cbb0f0… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 25 15:13:05 2018 +0100 5497 statgrab_net: collect net stats for local zones if dlstat exists Previously, only the net stats of the global zone were delivered by the check_mk_agent of solaris. Now the net stats of local zones are delivered as well if dlstat is available. Change-Id: Ic9ea035921ca68be9a45aefc842ea67296ebed02 --- .werks/5497 | 12 ++++++++++++ agents/check_mk_agent.solaris | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5497 b/.werks/5497 new file mode 100644 index 0000000..d524906 --- /dev/null +++ b/.werks/5497 @@ -0,0 +1,12 @@ +Title: statgrab_net: collect net stats for local zones if dlstat exists +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517496765 +Class: feature + +Previously, only the net stats of the global zone were delivered by the +check_mk_agent of solaris. Now the net stats of local zones are delivered +as well if dlstat is available. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 937826e..a829bbc 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -250,8 +250,8 @@ then statgrab_vars="const. cpu. disk. general. mem. page. swap. user." statgrab_sections="cpu disk page" - # Only collect net stats in global zone. - if [ "$zonename" == "global" ] + # Collect net stats in the global zone and in local zones if dlstat is present. + if [ "$zonename" == "global" ] || type dlstat &>/dev/null then statgrab_vars="$statgrab_vars net." statgrab_sections="$statgrab_sections net"

6 years, 4 months

5495 fileinfo: Make out of relevant time of day more present and remove state markers

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4395f1d8703cbb0fb217877aba205dbbdaf13ea8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4395f1d8703cbb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 31 15:03:16 2018 +0100 5495 fileinfo: Make out of relevant time of day more present and remove state markers Previously, the information that a service was out of the relevant time of day was displayed at the end of the plugin output where it can be missed easily. Now the information is displayed at the beginning of the plugin output. Furthermore, the subresults of a service do not show {WARN} and {CRIT} markers anymore since this yields the impression that the check should not be {OK}. Additional information about violations are still shown, e.g. if the age of a file is older than a configured level. Change-Id: I5b6d068943b1acbe12b6c5915ed4b864aa80bf2b --- .werks/5495 | 17 +++++++++++++++ checks/fileinfo | 64 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 51 insertions(+), 30 deletions(-) diff --git a/.werks/5495 b/.werks/5495 new file mode 100644 index 0000000..6c79341 --- /dev/null +++ b/.werks/5495 @@ -0,0 +1,17 @@ +Title: fileinfo: Make out of relevant time of day more present and remove state markers +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517406458 +Class: feature + +Previously, the information that a service was out of the relevant time of day +was displayed at the end of the plugin output where it can be missed easily. +Now the information is displayed at the beginning of the plugin output. + +Furthermore, the subresults of a service do not show {WARN} and {CRIT} markers +anymore since this yields the impression that the check should not be {OK}. +Additional information about violations are still shown, e.g. if the age +of a file is older than a configured level. diff --git a/checks/fileinfo b/checks/fileinfo index 4362018..cba70c1 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -47,7 +47,7 @@ def fileinfo_groups_get_group_name(group_patterns, filename, reftime): found_these_groups = {} for group_name, pattern in group_patterns: if type(pattern) == str: # support old format - pattern = ( pattern, '' ) + pattern = (pattern, '') inclusion, exclusion = pattern inclusion_is_regex = False @@ -70,27 +70,27 @@ def fileinfo_groups_get_group_name(group_patterns, filename, reftime): incl_match = regex(inclusion).match(filename) if incl_match: num_perc_s = group_name.count("%s") - matches = [ g and g or "" for g in incl_match.groups() ] + matches = [g and g or "" for g in incl_match.groups()] else: - incl_match = fnmatch.fnmatch( filename, inclusion ) + incl_match = fnmatch.fnmatch(filename, inclusion) if exclusion_is_regex: excl_match = regex(exclusion).match(filename) else: - excl_match = fnmatch.fnmatch( filename, exclusion ) + excl_match = fnmatch.fnmatch(filename, exclusion) if len(matches) < num_perc_s: raise MKGeneralException("Invalid entry in inventory_fileinfo_groups: " - "group name '%s' contains %d times '%%s', but regular expression " - "'%s' contains only %d subexpression(s)." % \ - (group_name, num_perc_s, inclusion, len(matches))) + "group name '%s' contains %d times '%%s', but regular expression " + "'%s' contains only %d subexpression(s)." % + (group_name, num_perc_s, inclusion, len(matches))) this_group_name = None if incl_match and not excl_match: if matches: for nr, group in enumerate(matches): inclusion = instantiate_regex_pattern_once(inclusion, group) - group_name = group_name.replace("%%%d" % (nr+1), group) + group_name = group_name.replace("%%%d" % (nr + 1), group) this_group_name = group_name % tuple(matches[:num_perc_s]) this_pattern = ("~%s" % inclusion, exclusion) @@ -121,38 +121,38 @@ def inventory_fileinfo_common(info, case): line[0], reftime)) if not found_groups and case == 'single' and line[1] != 'missing': - inventory.append((line[0], {})); + inventory.append((line[0], {})) elif found_groups and case == 'group': for group_name, patterns in found_groups.items(): - inventory.append((group_name, {"group_patterns" : patterns})) + inventory.append((group_name, {"group_patterns": patterns})) return inventory def fileinfo_process_date(pattern, reftime): - for what, the_time in [ ("DATE", reftime), ("YESTERDAY", reftime - 86400) ]: + for what, the_time in [("DATE", reftime), ("YESTERDAY", reftime - 86400)]: the_regex = '((?:/|[A-Za-z]).*)\$%s:((?:%%\w.?){1,})\$(.*)' % what disect = re.match(the_regex, pattern) if disect: prefix = disect.group(1) datepattern = time.strftime(disect.group(2),time.localtime(the_time)) postfix = disect.group(3) - pattern = prefix+datepattern+postfix + pattern = prefix + datepattern + postfix return pattern return pattern def fileinfo_check_timeranges(params): ranges = params.get("timeofday") - if ranges == None: - return None # no ranges defined + if ranges is None: + return "" now = time.localtime() for range_spec in ranges: if fileinfo_in_timerange(now, *range_spec): - return None - return " (out of relevant time of day)" + return "" + return "Out of relevant time of day" def fileinfo_in_timerange(now, range_from, range_to): @@ -167,7 +167,7 @@ def check_fileinfo(item, params, info): return (3, "no information sent by agent") outof_range_txt = fileinfo_check_timeranges(params) - in_timerange = outof_range_txt == None + in_timerange = outof_range_txt == "" reftime = None check_definition = False state_missing = params.get("state_missing", 3) @@ -185,10 +185,14 @@ def check_fileinfo(item, params, info): check_definition = [ ("Size", "size", size, get_filesize_human_readable), - ("Age", "age", age, get_age_human_readable) ] + ("Age", "age", age, get_age_human_readable) + ] - if check_definition == False: - return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") + if check_definition is False: + state = state_missing if in_timerange else 0 + infotext = ("File not found" if not outof_range_txt else + "File not found - %s" % outof_range_txt) + return state, infotext return fileinfo_check_function(check_definition, params, outof_range_txt) @@ -240,8 +244,8 @@ def check_fileinfo_groups(item, params, info): if line[0].endswith("No such file or directory"): continue - if type(pattern) == str: # support old format - pattern = ( pattern, '' ) + if type(pattern) == str: # support old format + pattern = (pattern, '') inclusion, exclusion = pattern inclusion_is_regex = False @@ -268,18 +272,18 @@ def check_fileinfo_groups(item, params, info): else: excl_match = fnmatch.fnmatch(line[0], exclusion) - if str(line[1]) not in [ 'missing', '' ] and \ + if str(line[1]) not in ['missing', ''] and \ incl_match and not excl_match: size = int(line[1]) size_all += size - if size_smallest == None: + if size_smallest is None: size_smallest = size else: size_smallest = min(size_smallest, size) size_largest = max(size_largest, size) age = reftime - int(line[2]) - if age_oldest == None: # very first match + if age_oldest is None: # very first match age_oldest = age age_newest = age else: @@ -287,7 +291,7 @@ def check_fileinfo_groups(item, params, info): age_newest = min(age_newest, age) count_all += 1 - if age_oldest == None: + if age_oldest is None: age_oldest = 0 # Start Checking @@ -303,9 +307,9 @@ def check_fileinfo_groups(item, params, info): size_smallest, get_filesize_human_readable)) if size_largest != 0: check_definition.append(("Largest size", "size_largest", - size_largest, get_filesize_human_readable)) + size_largest, get_filesize_human_readable)) if date_inclusion: - check_definition.append(("Date pattern", "date pattern", date_inclusion, str )) + check_definition.append(("Date pattern", "date pattern", date_inclusion, str)) return fileinfo_check_function(check_definition, params, outof_range_txt) @@ -316,7 +320,7 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): perfdata = [] for what_title, what, val, verbfunc in check_definition: infos.append("%s: %s" % (what_title, verbfunc(val))) - if type(val) in [long, int]: # because strings go into infos but not into perfdata + if type(val) in [long, int]: # because strings go into infos but not into perfdata warn, crit = "", "" for how, comp, cfunc in [ ("min", "<", lambda a, b: a < b), @@ -336,7 +340,7 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): infotext = ", ".join(infos) if outof_range_txt: state = 0 - infotext += outof_range_txt + infotext = outof_range_txt + ', ' + infotext.replace('(!)', '').replace('(!!)', '') return (state, infotext, perfdata)

6 years, 4 months

5669 FIX Always fetch host/authorization-related info from EC when needed

by Sven Panne

Module: check_mk Branch: master Commit: cfb3667edc5b53fe6baa652fd1a03eb47e450e9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfb3667edc5b53… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 1 14:33:02 2018 +0100 5669 FIX Always fetch host/authorization-related info from EC when needed To correctly show host-related information and to handle EC-related authorization, Livestatus needs to retrieve enough information from the EC. This was broken by an optimization in the master branch quite some time ago (Oct 2017), so v1.5.0i1 and v1.5.0i2 showed some strange behaviour in this area. This is fixed again now. Change-Id: I7473bc783c583d190a8413a031bf5d520c793986 --- .werks/5669 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5669 b/.werks/5669 new file mode 100644 index 0000000..6c61986 --- /dev/null +++ b/.werks/5669 @@ -0,0 +1,14 @@ +Title: Always fetch host/authorization-related info from EC when needed +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517491383 +Class: fix + +To correctly show host-related information and to handle EC-related +authorization, Livestatus needs to retrieve enough information from the EC. +This was broken by an optimization in the master branch quite some time ago +(Oct 2017), so v1.5.0i1 and v1.5.0i2 showed some strange behaviour in this +area. This is fixed again now.

6 years, 4 months

Windows agent: wrap FILE pointer with RAII

by Jukka Aro

Module: check_mk Branch: master Commit: dcee878fb080931a0bbeaeeaa378bb9465dc2c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcee878fb08093… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 1 14:09:13 2018 +0100 Windows agent: wrap FILE pointer with RAII --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a4e26ee..2aeb20d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3084 +3086 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 802f138..564a71c 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -154,9 +154,6 @@ public: UnpackError(const std::string &what) : std::runtime_error(what) {} }; -bool do_file = false; -static FILE *fileout; - class MillisecondsFormatter : public Formatter { void format(ostream &os, const LogRecord &record) override { auto tp = record.getTimePoint(); @@ -510,21 +507,37 @@ void usage() { exit(1); } +void outputFileBase(const Environment &env, FILE *file) { + FileOutputProxy dummy(file); + output_data(dummy, env, false, *s_config->section_flush); +} + void do_debug(const Environment &env) { Logger *logger = Logger::getLogger("winagent"); const auto saveLevel = logger->getLevel(); logger->setLevel(LogLevel::notice); - FileOutputProxy dummy(do_file ? fileout : stdout); + outputFileBase(env, stdout); - output_data(dummy, env, false, *s_config->section_flush); logger->setLevel(saveLevel); } void do_test(const Environment &env) { - FileOutputProxy dummy(do_file ? fileout : stdout); Notice(Logger::getLogger("winagent")) << "Started in test mode."; - output_data(dummy, env, false, *s_config->section_flush); + outputFileBase(env, stdout); +} + +void do_file(const Environment &env, const char *filename) { + auto closeFile = [](FILE *f) { fclose(f); }; + std::unique_ptr<FILE, decltype(closeFile)> file(fopen(filename, "w"), + closeFile); + + if (!file) { + std::cerr << "Cannot open " << filename << " for writing." << std::endl; + exit(1); + } + + outputFileBase(env, file.get()); } bool ctrl_handler(DWORD fdwCtrlType) { @@ -994,14 +1007,7 @@ void RunImmediate(const char *mode, int argc, char **argv) { fprintf(stderr, "Please specify the name of an output file.\n"); exit(1); } - fileout = fopen(argv[0], "w"); - if (!fileout) { - fprintf(stderr, "Cannot open %s for writing.\n", argv[2]); - exit(1); - } - do_file = true; - do_test(env); - fclose(fileout); + do_file(env, argv[0]); } else if (!strcmp(mode, "adhoc") || !strcmp(mode, "service")) do_adhoc(env); else if (!strcmp(mode, "install"))

6 years, 4 months

Avoid exception for non-existent columns.

by Sven Panne

Module: check_mk Branch: master Commit: 26c5243209c0555956334e57374a68b9d228b3a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26c5243209c055… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 1 13:47:53 2018 +0100 Avoid exception for non-existent columns. Change-Id: I271a11d832304d02028fcd5593a82142fe5abe57 --- livestatus/src/TableEventConsole.cc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 140af75..7b13eae 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -70,15 +70,20 @@ private: // Initially we consider all columns used in the query... auto all = _query->allColumns(); // ... then we add some special columns which we might need irrespective - // of the actual query (see receiveReply, isAuthorizedForEvent, and - // isAuthorizedForEventViaContactGroups below)... - for (const auto &name : {"event_host", // - "event_contact_groups_precedence", // - "event_contact_groups"}) { - if (auto col = _table.column(name)) { + // of the actual query... + static std::unordered_set<std::string> special_columns{ + // see receiveReply + "event_host", + // see isAuthorizedForEvent + "event_contact_groups_precedence", + // see isAuthorizedForEventViaContactGroups + "event_contact_groups"}; + _table.any_column([&](const auto &col) { + if (special_columns.find(col->name()) != special_columns.end()) { all.insert(col); } - } + return false; + }); // .. and then we ignore all host-related columns, they are implicitly // joined later via ECRow._host later. for (const auto &c : all) {

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018