Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

#2818 FIX check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c8d497c77e1ba138f673ab7a13151511a26baac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8d497c77e1ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 17 11:15:02 2015 +0100 #2818 FIX check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern If configured, the mail loop check deleted any received mails matching the pattern "Check_MK-Mail-Loop 1450346942 269". With this fix it only deletes mails it was actually expecting. --- .werks/2818 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail_loop | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2818 b/.werks/2818 new file mode 100644 index 0000000..77cdf13 --- /dev/null +++ b/.werks/2818 @@ -0,0 +1,10 @@ +Title: check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450346972 +Class: fix + +If configured, the mail loop check deleted any received mails matching the pattern "Check_MK-Mail-Loop 1450346942 269". +With this fix it only deletes mails it was actually expecting. diff --git a/ChangeLog b/ChangeLog index 57fc82e..890a41f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -158,6 +158,7 @@ * 2868 FIX: cpu_util.include: fixed crash on some systems if per-core statistics were enabled... * 1317 FIX: fileinfo.groups: Fixed handling of $DATE pattern... * 2813 FIX: agent_netapp: fixed missing environmental sensor information and exception with snapshot volumes... + * 2818 FIX: check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index 6c635b5..acf8936 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -293,6 +293,9 @@ def fetch_mails(): ts = matches.group(1).strip() key = matches.group(2).strip() + if "%s-%s" % (ts, key) not in g_expected: + continue + # extract received time rx = msg.get('Received') if rx:

8 years, 9 months

windows agent: renamed the configuration flags for sections so they match the section name in agent output

by Sebastian Herbord

Module: check_mk Branch: master Commit: a398eb6ec8685da333a6f03300e37898258ead65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a398eb6ec8685d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 10:44:58 2015 +0100 windows agent: renamed the configuration flags for sections so they match the section name in agent output --- agents/windows/Configuration.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index f10d0d9..4f531b6 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -182,11 +182,11 @@ bool Configuration::handleGlobalConfigVariable(char *var, char *value) mask |= SECTION_SERVICES; else if (!strcmp(word, "winperf")) mask |= SECTION_WINPERF; - else if (!strcmp(word, "cpu")) + else if (!strcmp(word, "winperf_processor")) mask |= SECTION_WINPERF_CPU; - else if (!strcmp(word, "if")) + else if (!strcmp(word, "winperf_if")) mask |= SECTION_WINPERF_IF; - else if (!strcmp(word, "phydisk")) + else if (!strcmp(word, "winperf_phydisk")) mask |= SECTION_WINPERF_PHYDISK; else if (!strcmp(word, "perfcounter")) mask |= SECTION_WINPERF_CONFIG; @@ -222,11 +222,11 @@ bool Configuration::handleGlobalConfigVariable(char *var, char *value) mask |= SECTION_MRPE; else if (!strcmp(word, "fileinfo")) mask |= SECTION_FILEINFO; - else if (!strcmp(word, "cpuload")) + else if (!strcmp(word, "wmi_cpuload")) mask |= SECTION_CPU; - else if (!strcmp(word, "exchange")) + else if (!strcmp(word, "msexch")) mask |= SECTION_EXCHANGE; - else if (!strcmp(word, "dotnet")) + else if (!strcmp(word, "dotnet_clrmemory")) mask |= SECTION_DOTNET; else if (!strcmp(word, "webservices")) mask |= SECTION_WEBSERVICES;

8 years, 9 months

windows agent: fixed fragmentation of udp packages

by Sebastian Herbord

Module: check_mk Branch: master Commit: 14dc7b6d53f6f8fc07e70dab9003f495405ba234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14dc7b6d53f6f8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 10:49:24 2015 +0100 windows agent: fixed fragmentation of udp packages --- agents/windows/OutputProxy.cc | 3 ++- agents/windows/OutputProxy.h | 7 +------ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 886784 -> 886784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 886784 -> 886784 bytes agents/windows/check_mk_agent.cc | 7 ++----- agents/windows/check_mk_agent.exe | Bin 808448 -> 807936 bytes agents/windows/check_mk_agent.msi | Bin 1954304 -> 1953792 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 808448 -> 807936 bytes agents/windows/install_agent-64.exe | Bin 406153 -> 406134 bytes agents/windows/install_agent.exe | Bin 396979 -> 396856 bytes 11 files changed, 6 insertions(+), 13 deletions(-) diff --git a/agents/windows/OutputProxy.cc b/agents/windows/OutputProxy.cc index 963f191..673c9cd 100644 --- a/agents/windows/OutputProxy.cc +++ b/agents/windows/OutputProxy.cc @@ -177,9 +177,10 @@ bool BufferedSocketProxy::flushInt() EncryptingBufferedSocketProxy::EncryptingBufferedSocketProxy(SOCKET socket, const std::string &passphrase, size_t buffer_size, size_t collect_size) - : BufferedSocketProxy(socket, buffer_size) + : BufferedSocketProxy(socket, buffer_size, collect_size) , _crypto(passphrase) { + _blockSize = _crypto.blockSize(); _plain.resize(_blockSize * 8); diff --git a/agents/windows/OutputProxy.h b/agents/windows/OutputProxy.h index 4f2a2da..9715595 100644 --- a/agents/windows/OutputProxy.h +++ b/agents/windows/OutputProxy.h @@ -66,7 +66,7 @@ protected: std::vector<char> &buffer() { return _buffer; } size_t length() const { return _length; } -private: +public: static const size_t DEFAULT_BUFFER_SIZE = 16384L; static const size_t DEFAULT_COLLECT_SIZE = 1300L; @@ -99,11 +99,6 @@ class EncryptingBufferedSocketProxy : public BufferedSocketProxy { Crypto _crypto; -private: - - static const size_t DEFAULT_BUFFER_SIZE = 16384L; - static const size_t DEFAULT_COLLECT_SIZE = 1300L; - std::vector<char> _plain; size_t _blockSize; size_t _written; diff --git a/agents/windows/build_version b/agents/windows/build_version index e3c00fd..3680448 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1042 +1062 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d638b86..bc13614 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index f1783a4..e677972 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 0e81382..1e6d0bb 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -100,9 +100,6 @@ static const char RT_PROTOCOL_VERSION[2] = { '0', '0' }; // Limits for static global arrays #define MAX_EVENTLOGS 128 -// Default buffer size for reading performance counters -#define DEFAULT_BUFFER_SIZE 40960L - // Maximum heap buffer for a single local/plugin script // This buffer contains the check output #define HEAP_BUFFER_DEFAULT 16384L @@ -3145,6 +3142,7 @@ DWORD WINAPI realtime_check_func(void *data_in) // windows. :( static const size_t TARGET_DATAGRAM_SIZE = 65507L - 1000L; EncryptingBufferedSocketProxy out(INVALID_SOCKET, g_config->passphrase(), + BufferedSocketProxy::DEFAULT_BUFFER_SIZE, TARGET_DATAGRAM_SIZE); timeval before; gettimeofday(&before, 0); @@ -3219,8 +3217,7 @@ DWORD WINAPI realtime_check_func(void *data_in) // these writes are unencrypted! out.writeBinary(RT_PROTOCOL_VERSION, 2); out.writeBinary(timestamp, 10); - output_data(out, data->env, g_config->realtimeSections(), true); - data->new_request = true; + output_data(out, data->env, g_config->realtimeSections(), false); } } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c6776a6..c6df031 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 3845bca..f3de733 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index d6fa563..fedb333 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 31c305e..e598c58 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index bcfe2f4..565b4a9 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 9 months

0-terminate copy. Improved naming.

by Sven Panne

Module: check_mk Branch: master Commit: 624f6baaa4af9df377e6b735cdf42dde586025d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624f6baaa4af9d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 17 10:35:00 2015 +0100 0-terminate copy. Improved naming. --- livestatus/src/Query.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 86e9b85..4f824c8 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -79,8 +79,9 @@ Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : while (input->moreLines()) { string line = input->nextLine(); - vector<char> hurz(line.begin(), line.end()); - char *buffer = &hurz[0]; + vector<char> line_copy(line.begin(), line.end()); + line_copy.push_back(0); + char *buffer = &line_copy[0]; rstrip(buffer); if (g_debug_level > 0) logger(LG_INFO, "Query: %s", buffer);

8 years, 9 months

ValueSpec FileUpload: new validation options

by Mathias Kettner

Module: check_mk Branch: master Commit: fbf38005bcd28446ecf33c6f437dc52d9194a3e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbf38005bcd284… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 10:08:17 2015 +0100 ValueSpec FileUpload: new validation options --- web/htdocs/valuespec.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 82532a8..91d7faf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3249,6 +3249,9 @@ class FileUpload(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._allow_empty = kwargs.get('allow_empty', True) + self._allowed_extensions = kwargs.get('allowed_extensions') + self._allow_empty_content= kwargs.get('allow_empty_content', True) + def canonical_value(self): if self._allow_empty: @@ -3256,18 +3259,38 @@ class FileUpload(ValueSpec): else: return '' + def validate_value(self, value, varprefix): - if not self._allow_empty and (value == None or value[0] == ''): + file_name, mime_type, content = value + + if not self._allow_empty and (value == None or file_name == ''): raise MKUserError(varprefix, _('Please select a file.')) + + if not self._allow_empty_content and len(content) == 0: + raise MKUserError(varprefix, _('The selected file is empty. Please select a non-empty file.') +) + if self._allowed_extensions != None: + matched = False + for extension in self._allowed_extensions: + if file_name.endswith(extension): + matched = True + break + if not matched: + raise MKUserError(varprefix, _("Invalid file name extension. Allowed are: %s") + % ", ".join(self._allowed_extensions)) + self.custom_validate(value, varprefix) + def render_input(self, varprefix, value): html.upload_file(varprefix) + def from_html_vars(self, varprefix): # returns a triple of (filename, mime-type, content) return html.uploaded_file(varprefix) + class IconSelector(ValueSpec): _categories = [ ('logos', _('Logos')),

8 years, 9 months

local automation can now pass transparent stdin data

by Mathias Kettner

Module: check_mk Branch: master Commit: f1eadda73a0a657eb60fbc3783de8885db679c7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1eadda73a0a65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 10:08:57 2015 +0100 local automation can now pass transparent stdin data --- web/htdocs/watolib.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b9eb853..3c5afe2 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3805,7 +3805,7 @@ def check_mk_automation(siteid, command, args=[], indata=""): return check_mk_remote_automation(siteid, command, args, indata) -def check_mk_local_automation(command, args=[], indata=""): +def check_mk_local_automation(command, args=[], indata="", stdin_data=None): # Gather the command to use for executing --automation calls to check_mk # - First try to use the check_mk_automation option from the defaults # - When not set try to detect the command for OMD or non OMD installations @@ -3866,7 +3866,10 @@ def check_mk_local_automation(command, args=[], indata=""): raise MKGeneralException("Cannot execute <tt>%s</tt>: %s<br><br>%s" % (commandargs[0], e, sudo_msg)) else: raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) - p.stdin.write(repr(indata)) + if stdin_data != None: + p.stdin.write(stdin_data) + else: + p.stdin.write(repr(indata)) p.stdin.close() outdata = p.stdout.read() exitcode = p.wait()

8 years, 9 months

New automation for installing MKPs

by Mathias Kettner

Module: check_mk Branch: master Commit: c23f8336c1c620a0a7b9d13c173215317c653b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c23f8336c1c620… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 10:09:14 2015 +0100 New automation for installing MKPs --- modules/automation.py | 18 ++++++++++++++++++ modules/check_mk.py | 19 +++++++++++++++++++ modules/packaging.py | 38 +++++++++++++++++++++++++++++++++----- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 29036e2..5e588a5 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -48,6 +48,8 @@ def do_automation(cmd, args): result = automation_get_package_info(args) elif cmd == "get-package": result = automation_get_package(args) + elif cmd == "install-package": + result = automation_install_package(args) elif cmd == "remove-package": result = automation_remove_package(args) elif cmd == "notification-get-bulks": @@ -1173,14 +1175,17 @@ def automation_notification_replay(args): nr = args[0] return notification_replay_backlog(int(nr)) + def automation_notification_analyse(args): nr = args[0] return notification_analyse_backlog(int(nr)) + def automation_get_bulks(args): only_ripe = args[0] == "1" return find_bulks(only_ripe) + def automation_active_check(args): hostname, plugin, item = args item = item.decode("utf-8") @@ -1263,6 +1268,7 @@ def execute_check_plugin(commandline): def automation_update_dns_cache(): return do_update_dns_cache() + def automation_bake_agents(): if "do_bake_agents" in globals(): return do_bake_agents() @@ -1316,6 +1322,18 @@ def automation_get_package(args): return package, output_file.content() +def automation_install_package(args): + load_module("packaging") + file_content = sys.stdin.read() + input_file = fake_file(file_content) + try: + return install_package(file_object=input_file) + except Exception, e: + if opt_debug: + raise + raise MKAutomationError("Cannot install package: %s" % e) + + def automation_remove_package(args): load_module("packaging") package_name = args[0] diff --git a/modules/check_mk.py b/modules/check_mk.py index 821aa99..bc96596 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2851,6 +2851,7 @@ class fake_file: return len(self._content) def read(self, size): + size = min(size, len(self._content) - self._pointer) new_end = self._pointer + size data = self._content[self._pointer:new_end] self._pointer = new_end @@ -2862,6 +2863,24 @@ class fake_file: def content(self): return self._content + def tell(self): + return self._pointer + + def seek(self, offset, whence=0): + if whence == 0: + new_pointer = offset + elif whence == 1: + new_pointer = self._pointer + offset + elif whence == 2: + new_pointer = self.size() - offset + else: + raise IOError("Invalid value for whence") + + if new_pointer < 0: + raise IOError("Invalid seek") + + self._pointer = new_pointer + def do_backup(tarname): import tarfile diff --git a/modules/packaging.py b/modules/packaging.py index 0f262b9..a219bc1 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -76,6 +76,7 @@ Available commands are: Package files are located in %s. """ % pac_dir) + def do_packaging(args): if len(args) == 0: packaging_usage() @@ -108,6 +109,7 @@ def do_packaging(args): (", ".join(allc[:-1]), allc[-1])) sys.exit(1) + def package_list(args): if len(args) > 0: for name in args: @@ -123,24 +125,28 @@ def package_list(args): for pacname in all_package_names(): sys.stdout.write("%s\n" % pacname) + def package_info(args): if len(args) == 0: raise PackageException("Usage: check_mk -P show NAME|PACKAGE.mkp") for name in args: show_package_info(name) + def show_package_contents(name): show_package(name, False) + def show_package_info(name): show_package(name, True) + def show_package(name, show_info = False): try: if name.endswith(pac_ext): tar = tarfile.open(name, "r:gz") info = tar.extractfile("info") - package = eval(info.read()) + package = parse_package_info(info.read()) else: package = read_package_info(name) if not package: @@ -214,6 +220,7 @@ def package_create(args): verbose("New package %s created with %d files.\n" % (pacname, num_files)) verbose("Please edit package details in %s%s%s\n" % (tty_bold, pac_dir + pacname, tty_normal)) + def package_find(_no_args): first = True for part, title, perm, dir in package_parts: @@ -231,6 +238,7 @@ def package_find(_no_args): if first: verbose("No unpackaged files found.\n") + def package_release(args): if len(args) != 1: raise PackageException("Usage: check_mk -P release NAME") @@ -250,6 +258,7 @@ def package_release(args): for f in filenames: verbose(" %s\n" % f) + def package_pack(args): if len(args) != 1: raise PackageException("Usage: check_mk -P pack NAME") @@ -344,8 +353,12 @@ def package_install(args): if not os.path.exists(path): raise PackageException("No such file %s." % path) - tar = tarfile.open(path, "r:gz") - package = eval(tar.extractfile("info").read()) + return install_package(file_name = path) + + +def install_package(file_name=None, file_object=None): + tar = tarfile.open(name=file_name, fileobj=file_object, mode="r:gz") + package = parse_package_info(tar.extractfile("info").read()) pacname = package["name"] old_package = read_package_info(pacname) if old_package: @@ -372,6 +385,7 @@ def package_install(args): elif os.path.exists(path): raise PackageException("File conflict: %s already existing." % path) + # Now install files, but only unpack files explicitely listed for part, title, perm, dir in package_parts: filenames = package["files"].get(part, []) @@ -419,6 +433,8 @@ def package_install(args): # Last but not least install package file file(pac_dir + pacname, "w").write(pprint.pformat(package)) + return package + def files_in_dir(part, dir, prefix = ""): if not os.path.exists(dir): @@ -463,7 +479,7 @@ def package_part_info(): def unpackaged_files_in_dir(part, dir): - all = files_in_dir(part, dir) + all = files_in_dir(part, dir) packed = packaged_files_in_dir(part) return [ f for f in all if f not in packed ] @@ -479,7 +495,7 @@ def packaged_files_in_dir(part): def read_package_info(pacname): try: - package = eval(file(pac_dir + pacname).read()) + package = parse_package_info(file(pac_dir + pacname).read()) package["name"] = pacname # do not trust package content num_files = sum([len(fl) for fl in package["files"].values() ]) package["num_files"] = num_files @@ -499,3 +515,15 @@ def all_package_names(): all = [ p for p in os.listdir(pac_dir) if p not in [ '.', '..' ] ] all.sort() return all + + +def parse_package_info(python_string): + try: + # ast.literal_eval does not execute any code, just reads in passive + # data structures, so it is safe. But: not available on all supported + # Python versions + import ast + except: + return eval(python_string) + + return ast.literal_eval(python_string)

8 years, 9 months

Various const-correctness fixes and associated changes/fixes.

by Sven Panne

Module: check_mk Branch: master Commit: e40a965783c86e64ad2b695e6b0323c036d04b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e40a965783c86e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 17 09:16:56 2015 +0100 Various const-correctness fixes and associated changes/fixes. This might fix various segfaults, but there is much more to do in this area. Some notes: * We should never use C-style casts, only C++-style casts, the former contain almost no information what the cast is actually doing. * Older Nagios headers seem to have bugs regarding const-correctness, so we sometimes have to const_cast. :-P --- livestatus/src/AttributelistColumn.cc | 2 +- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/LogCache.cc | 2 +- livestatus/src/LogEntry.cc | 13 +++++++------ livestatus/src/LogEntry.h | 8 ++++---- livestatus/src/Logfile.cc | 2 +- livestatus/src/OutputBuffer.cc | 2 +- livestatus/src/Query.cc | 5 ++++- livestatus/src/TableServices.cc | 5 +++-- livestatus/src/strutil.cc | 10 +++------- livestatus/src/strutil.h | 22 +++++++++------------- 11 files changed, 35 insertions(+), 38 deletions(-) diff --git a/livestatus/src/AttributelistColumn.cc b/livestatus/src/AttributelistColumn.cc index c176b34..31f1bc1 100644 --- a/livestatus/src/AttributelistColumn.cc +++ b/livestatus/src/AttributelistColumn.cc @@ -115,7 +115,7 @@ Filter *AttributelistColumn::createFilter(int opid, char *value) else { char *scan = value; char *t; - while ((t = next_token(&scan))) { + while ((t = next_token(&scan, ','))) { unsigned i = 0; while (al_entries[i].name) { if (!strcmp(t, al_entries[i].name)) { diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index abd5165..a996ae2 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -79,7 +79,7 @@ char *HostFileColumn::getBlob(void *data, int *size) } lseek(fd, 0, SEEK_SET); - char *buffer = (char *)malloc(*size); + char *buffer = static_cast<char *>(malloc(*size)); if (!buffer) { close(fd); return 0; diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 68f3189..6ca5d0a 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -147,7 +147,7 @@ void LogCache::updateLogfileIndex() struct dirent *ent, *result; int len = offsetof(struct dirent, d_name) + pathconf(log_archive_path, _PC_NAME_MAX) + 1; - ent = (struct dirent *)malloc(len); + ent = static_cast<struct dirent *>(malloc(len)); while (0 == readdir_r(dir, ent, &result) && result != 0) { diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index bc6ba13..c1ecae7 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -303,7 +303,7 @@ bool LogEntry::handleNotificationEntry() if ((svc && _state == 4) || (!svc && _state == 3)) { - char *swap = _state_type; + const char *swap = _state_type; _state_type = _command_name; _command_name = swap; if (svc) @@ -401,12 +401,12 @@ bool LogEntry::handleProgrammEntry() } -int LogEntry::serviceStateToInt(char *s) +int LogEntry::serviceStateToInt(const char *s) { if (!s) return 3; // can happen at garbled log line - char *last = s + strlen(s) - 1; + const char *last = s + strlen(s) - 1; if (*last == ')') last--; @@ -422,12 +422,12 @@ int LogEntry::serviceStateToInt(char *s) } -int LogEntry::hostStateToInt(char *s) +int LogEntry::hostStateToInt(const char *s) { if (!s) return 2; // can happen at garbled log line - char *last = s + strlen(s) - 1; + const char *last = s + strlen(s) - 1; if (*last == ')') // handle CUSTOM (UP) and DOWNTIMESTOPPED (DOWN) last--; @@ -458,7 +458,8 @@ unsigned LogEntry::updateReferences() updated++; } if (_command_name) { - _command = find_command(_command_name); + // Older Nagios headers are not const-correct... :-P + _command = find_command(const_cast<char *>(_command_name)); updated++; } return updated; diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 99a6459..88df07e 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -78,10 +78,10 @@ struct LogEntry char *_text; // points into msg char *_host_name; // points into msg or is 0 char *_svc_desc; // points into msg or is 0 - char *_command_name; + const char *_command_name; char *_contact_name; int _state; - char *_state_type; + const char *_state_type; int _attempt; char *_check_output; char *_comment; @@ -94,8 +94,8 @@ struct LogEntry LogEntry(unsigned lineno, char *line); ~LogEntry(); unsigned updateReferences(); - static int serviceStateToInt(char *s); - static int hostStateToInt(char *s); + static int serviceStateToInt(const char *s); + static int hostStateToInt(const char *s); private: bool handleStatusEntry(); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 5ac21f9..6520312 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -307,7 +307,7 @@ char *Logfile::readIntoBuffer(int *size) *size = o; lseek(fd, 0, SEEK_SET); - char *buffer = (char *)malloc(*size + 2); // add space for binary 0 at beginning and end + char *buffer = static_cast<char *>(malloc(*size + 2)); // add space for binary 0 at beginning and end if (!buffer) { logger(LOG_WARNING, "Cannot malloc buffer for reading %s: %s", _path, strerror(errno)); close(fd); diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 3bd5f88..2c3da84 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -41,7 +41,7 @@ OutputBuffer::OutputBuffer() : _max_size(INITIAL_OUTPUT_BUFFER_SIZE) { - _buffer = (char *)malloc(_max_size); + _buffer = static_cast<char *>(malloc(_max_size)); _end = _buffer + _max_size; reset(); } diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 6c05e35..86e9b85 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -31,6 +31,7 @@ #include <sys/time.h> #include <syslog.h> #include <utility> +#include <vector> #include "Aggregator.h" #include "Column.h" #include "Filter.h" @@ -53,6 +54,7 @@ extern unsigned long g_max_response_size; extern int g_data_encoding; using std::string; +using std::vector; Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : _output(output), @@ -77,7 +79,8 @@ Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : while (input->moreLines()) { string line = input->nextLine(); - char *buffer = (char *)line.c_str(); + vector<char> hurz(line.begin(), line.end()); + char *buffer = &hurz[0]; rstrip(buffer); if (g_debug_level > 0) logger(LG_INFO, "Query: %s", buffer); diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index b43d4b6..3fe7745 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -131,9 +131,10 @@ void TableServices::answerQuery(Query *query) // do we know the host? - char *host_name = (char *)query->findIndexFilter("host_name"); + const char *host_name = static_cast<const char*>(query->findIndexFilter("host_name")); if (host_name) { - host *host = find_host(host_name); + // Older Nagios headers are not const-correct... :-P + host *host = find_host(const_cast<char*>(host_name)); if (host) { servicesmember *mem = host->services; while (mem) { diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index fedb373..1f09f1e 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -86,15 +86,11 @@ char *next_token(char **c, char delim) /* same as next_token() but returns "" instead of 0 if no tokens has been found */ -char *save_next_token(char **c, char delim) +const char *save_next_token(char **c, char delim) { - if (!*c) return (char *)""; - + if (!*c) return ""; char *result = next_token(c, delim); - if (result == 0) - return (char *)""; - else - return result; + return result ? result : ""; } diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index c632063..a5203f9 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -25,25 +25,21 @@ #ifndef strutil_h #define strutil_h -#include "config.h" // IWYU pragma: keep +#include "config.h" // IWYU pragma: keep #ifdef __cplusplus extern "C" { #endif - char *rstrip(char *); - char *lstrip(char *); - int ends_with(const char *a, const char *b); -#ifdef __cplusplus - char *next_token(char **c, char delim = ','); - char *save_next_token(char **c, char delim = ','); -#else - char *next_token(char **c, char delim); - char *save_next_token(char **c, char delim); -#endif - char *next_field(char **line); + +char *rstrip(char *); +char *lstrip(char *); +int ends_with(const char *a, const char *b); +char *next_token(char **c, char delim); +const char *save_next_token(char **c, char delim); +char *next_field(char **line); + #ifdef __cplusplus } #endif #endif // strutil_h -

8 years, 9 months

winperf_processor is now usable with real-time checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a546b9abfba911f1b9a3b93633899b9a33e6638 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a546b9abfba91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 17 09:36:47 2015 +0100 winperf_processor is now usable with real-time checks --- checks/winperf_processor | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/winperf_processor b/checks/winperf_processor index 75152e4..b2bd2dd 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -133,6 +133,7 @@ check_info["winperf_processor.util"] = { 'inventory_function': inventory_winperf_util, 'service_description': 'CPU utilization', 'has_perfdata': True, + 'handle_real_time_checks': True, 'group': 'cpu_utilization_os', 'includes': [ "cpu_util.include" ], }

8 years, 9 months

windows agent: the target packet size for the socket buffers is now configurable

by Sebastian Herbord

Module: check_mk Branch: master Commit: b66752185b1f7d844fed519679473fc9a597705d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b66752185b1f7d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 09:19:18 2015 +0100 windows agent: the target packet size for the socket buffers is now configurable --- agents/windows/OutputProxy.cc | 10 ++++++---- agents/windows/OutputProxy.h | 13 +++++++++---- agents/windows/check_mk_agent.cc | 7 ++++++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/agents/windows/OutputProxy.cc b/agents/windows/OutputProxy.cc index a87d20e..963f191 100644 --- a/agents/windows/OutputProxy.cc +++ b/agents/windows/OutputProxy.cc @@ -55,8 +55,9 @@ void FileOutputProxy::flush() { } -BufferedSocketProxy::BufferedSocketProxy(SOCKET socket, size_t buffer_size) +BufferedSocketProxy::BufferedSocketProxy(SOCKET socket, size_t buffer_size, size_t collect_size) : _socket(socket) + , _collect_size(collect_size) { _buffer.resize(buffer_size); } @@ -92,7 +93,7 @@ void BufferedSocketProxy::output(const char *format, ...) // We do not send out the data immediately // This would lead to many small tcp packages - if (_length > MIN_OUTPUT_SIZE) { + if (_length > _collect_size) { flushInt(); } } @@ -104,7 +105,7 @@ void BufferedSocketProxy::writeBinary(const char *buffer, size_t size) memcpy(&_buffer[0] + _length, buffer, size); _length += size; - if (_length > MIN_OUTPUT_SIZE) { + if (_length > _collect_size) { flushInt(); } } @@ -175,7 +176,7 @@ bool BufferedSocketProxy::flushInt() EncryptingBufferedSocketProxy::EncryptingBufferedSocketProxy(SOCKET socket, - const std::string &passphrase, size_t buffer_size) + const std::string &passphrase, size_t buffer_size, size_t collect_size) : BufferedSocketProxy(socket, buffer_size) , _crypto(passphrase) { @@ -187,6 +188,7 @@ EncryptingBufferedSocketProxy::EncryptingBufferedSocketProxy(SOCKET socket, void EncryptingBufferedSocketProxy::output(const char *format, ...) { + va_list ap; va_start(ap, format); diff --git a/agents/windows/OutputProxy.h b/agents/windows/OutputProxy.h index 47251ca..4f2a2da 100644 --- a/agents/windows/OutputProxy.h +++ b/agents/windows/OutputProxy.h @@ -59,6 +59,7 @@ class BufferedSocketProxy : public OutputProxy { SOCKET _socket; std::vector<char> _buffer; size_t _length { 0 }; + size_t _collect_size; protected: @@ -67,12 +68,13 @@ protected: private: - static const size_t DEFAULT_BUFFER_SIZE = 16384L; - static const size_t MIN_OUTPUT_SIZE = 1300L; // MTU for Ethernet is 1500 bytes + static const size_t DEFAULT_BUFFER_SIZE = 16384L; + static const size_t DEFAULT_COLLECT_SIZE = 1300L; public: - BufferedSocketProxy(SOCKET socket, size_t buffer_size = DEFAULT_BUFFER_SIZE); + BufferedSocketProxy(SOCKET socket, size_t buffer_size = DEFAULT_BUFFER_SIZE, + size_t collect_size = DEFAULT_COLLECT_SIZE); void setSocket(SOCKET socket); @@ -100,6 +102,8 @@ class EncryptingBufferedSocketProxy : public BufferedSocketProxy { private: static const size_t DEFAULT_BUFFER_SIZE = 16384L; + static const size_t DEFAULT_COLLECT_SIZE = 1300L; + std::vector<char> _plain; size_t _blockSize; size_t _written; @@ -107,7 +111,8 @@ private: public: EncryptingBufferedSocketProxy(SOCKET socket, const std::string &passphrase, - size_t buffer_size = DEFAULT_BUFFER_SIZE); + size_t buffer_size = DEFAULT_BUFFER_SIZE, + size_t collect_size = DEFAULT_COLLECT_SIZE); virtual void output(const char *format, ...) override; // writeBinary is NOT overridden so calls to it are not encrypted! diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 6d773d0..5fca2d5 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3139,7 +3139,12 @@ DWORD WINAPI realtime_check_func(void *data_in) std::string current_ip; SOCKET current_socket = INVALID_SOCKET; - EncryptingBufferedSocketProxy out(INVALID_SOCKET, g_config->passphrase()); + // maximum udp datagram size - 1000 + // this has no effect, my datagrams still get split at 1500bytes by + // windows. :( + static const size_t TARGET_DATAGRAM_SIZE = 65507L - 1000L; + EncryptingBufferedSocketProxy out(INVALID_SOCKET, g_config->passphrase(), + TARGET_DATAGRAM_SIZE); time_t before = time(NULL); while (!data->terminate) { // wait for 1 second minus the time the last iteration took

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015