Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

3616 FIX Fix cmk -I ignoring the option --cache

by Mathias Kettner

Module: check_mk Branch: master Commit: b839005c5ce7e1e105218688d6dd7395fc46e1a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b839005c5ce7e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 12:15:25 2016 +0200 3616 FIX Fix cmk -I ignoring the option --cache When you use <tt>cmk --cache -I myhost123<tt> on the command line in order to discovery services on a specific host then the option <tt>--cache</tt> was ignored and always fresh data had been fetched from the target host. This has been fixed. --- .werks/3616 | 13 +++++++++++++ ChangeLog | 1 + modules/discovery.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3616 b/.werks/3616 new file mode 100644 index 0000000..166647b --- /dev/null +++ b/.werks/3616 @@ -0,0 +1,13 @@ +Title: Fix cmk -I ignoring the option --cache +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464776061 + +When you use <tt>cmk --cache -I myhost123<tt> on the command line in order +to discovery services on a specific host then the option <tt>--cache</tt> was ignored +and always fresh data had been fetched from the target host. This has been +fixed. diff --git a/ChangeLog b/ChangeLog index 6bf595a..2eb7e44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 3416 FIX: Avoid warning in cmc.log when rescheduling non-existing discovery check... * 3437 FIX: Improved performance of "activate changes", especially in distributed environments * 3471 FIX: Repair ignoring discovery errors when bogus %s is contained in service description... + * 3616 FIX: Fix cmk -I ignoring the option --cache... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/discovery.py b/modules/discovery.py index 1001eaa..efbd8b8 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -43,7 +43,7 @@ import cmk.tty as tty # hostnames is already prepared by the main code. If it is # empty then we use all hosts and switch to using cache files. def do_discovery(hostnames, check_types, only_new): - use_caches = False + use_caches = opt_use_cachefile if not hostnames: verbose("Discovering services on all hosts:\n") hostnames = all_active_realhosts()

8 years, 4 months

Remove bogus stderr output and replace with vverbose()

by Mathias Kettner

Module: check_mk Branch: master Commit: bb581eaf49f8d7f49720233e2dfb8ad99640c498 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb581eaf49f8d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 12:14:02 2016 +0200 Remove bogus stderr output and replace with vverbose() --- modules/check_mk_base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index c6159fd..ffa50fe 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -370,6 +370,7 @@ def get_host_info(hostname, ipaddress, checkname, max_cachefile_age=None, ignore # only once for each host. def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_check_interval=False, use_snmpwalk_cache=True): + info = get_cached_hostinfo(hostname) if info and info.has_key(check_type): return info[check_type] @@ -677,8 +678,8 @@ def read_cache_file(relpath, max_cache_age): if len(result) > 0: verbose("Using data from cachefile %s.\n" % cachefile) return result - elif opt_debug: - sys.stderr.write("Skipping cache file %s: Too old " + else: + vverbose("Skipping cache file %s: Too old " "(age is %d sec, allowed is %d sec)\n" % (cachefile, cachefile_age(cachefile), max_cache_age))

8 years, 4 months

added description for match type list

by Sebastian Herbord

Module: check_mk Branch: master Commit: fd1a1d461be2b8aacfb9f259e853d8fee0dcde5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd1a1d461be2b8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 1 11:55:04 2016 +0200 added description for match type list --- 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 1d9c0a6..069afdc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12594,7 +12594,7 @@ def explain_ruleset_match_type(rulespec): html.write(_("The first matching rule defines the parameter.")) elif match_type == "dict": html.write(_("Each parameter is defined by the first matching rule where that parameter is set (checked).")) - elif match_type == "all": + elif match_type in ("all", "list"): html.write(_("All matching rules will add to the resulting list.")) else: html.write(_("Unknown match type: %s") % match_type)

8 years, 4 months

Fetched Livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 1c07b25b6a258d60452a2d94a4677b6a6ae5ca4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c07b25b6a258d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 1 11:40:57 2016 +0200 Fetched Livestatus from downstream plus associated fixes. --- livestatus/src/Makefile.am | 1 + livestatus/src/StringUtils.cc | 40 +++++++++++++++++++++++++++++ livestatus/src/StringUtils.h | 35 +++++++++++++++++++++++++ livestatus/src/TableEventConsole.cc | 2 +- livestatus/src/TableEventConsoleEvents.cc | 5 ---- 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index ea5cd64..4177e9c 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -103,6 +103,7 @@ livestatus_so_SOURCES = \ Store.cc \ StringColumn.cc \ StringColumnFilter.cc \ + StringUtils.cc \ Table.cc \ TableColumns.cc \ TableCommands.cc \ diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc new file mode 100644 index 0000000..92dfe58 --- /dev/null +++ b/livestatus/src/StringUtils.cc @@ -0,0 +1,40 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 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- +// ails. 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. + +#include "StringUtils.h" +#include <algorithm> +#include <cctype> + +using std::string; +using std::transform; + +namespace mk { + +string unsafe_tolower(const string &str) { + string result = str; + transform(str.begin(), str.end(), result.begin(), ::tolower); + return result; +} + +} // namespace diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h new file mode 100644 index 0000000..1a81018 --- /dev/null +++ b/livestatus/src/StringUtils.h @@ -0,0 +1,35 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 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- +// ails. 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. + +#ifndef StringUtils_h +#define StringUtils_h + +#include "config.h" // IWYU pragma: keep +#include <string> + +namespace mk { +std::string unsafe_tolower(const std::string &str); +} // namespace + +#endif // StringUtils_h diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index de22b1c..e9dd5dc 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -266,7 +266,7 @@ bool TableEventConsole::receiveReply(int sock, Query *query) { #ifdef CMC row._host = (it == row._map.end() || _core == nullptr) ? nullptr - : _core->_world->getHost(it->second); + : _core->_world->getHostByDesignation(it->second); #else // Older Nagios headers are not const-correct... :-P row._host = it == row._map.end() diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index f5b1294..9dad91b 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -26,11 +26,6 @@ #include <string> #include "Table.h" #include "TableHosts.h" -#ifdef CMC -#include "Core.h" -#include "World.h" -using std::recursive_mutex; -#endif using std::string;

8 years, 4 months

windows agent: fixed crash when using rotated logs when there is no file matching the pattern

by Sebastian Herbord

Module: check_mk Branch: master Commit: b6c8d73662f651956a957321c64a252369aa971b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c8d73662f651… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 1 11:00:14 2016 +0200 windows agent: fixed crash when using rotated logs when there is no file matching the pattern --- agents/windows/Configuration.cc | 16 ++++++++++------ agents/windows/Makefile | 5 +++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1268224 -> 1268224 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1268224 -> 1268224 bytes agents/windows/check_mk_agent.exe | Bin 1236992 -> 1362432 bytes agents/windows/check_mk_agent.msi | Bin 2774016 -> 2900480 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1236992 -> 1362432 bytes agents/windows/install_agent-64.exe | Bin 565457 -> 565492 bytes agents/windows/install_agent.exe | Bin 559756 -> 576150 bytes 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 3c78797..18de0a8 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -544,12 +544,16 @@ bool Configuration::addNewRotatedLogfile( } BY_HANDLE_FILE_INFORMATION fileinfo; - getFileInformation(textfile->paths.front().c_str(), &fileinfo); - textfile->file_size = - to_u64(fileinfo.nFileSizeLow, fileinfo.nFileSizeHigh); - textfile->file_id = - to_u64(fileinfo.nFileIndexLow, fileinfo.nFileIndexHigh); - textfile->offset = token->from_start ? 0 : textfile->file_size; + if (textfile->paths.size() > 0) { + getFileInformation(textfile->paths.front().c_str(), &fileinfo); + textfile->file_size = + to_u64(fileinfo.nFileSizeLow, fileinfo.nFileSizeHigh); + textfile->file_id = + to_u64(fileinfo.nFileIndexLow, fileinfo.nFileIndexHigh); + textfile->offset = token->from_start ? 0 : textfile->file_size; + } else { + textfile->file_size = textfile->offset = textfile->file_id = 0; + } } _logwatch_textfiles.add(textfile); diff --git a/agents/windows/Makefile b/agents/windows/Makefile index d9c14a4..529d4c0 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,9 +28,10 @@ VERSION = 1.4.0i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags) -COPTIONS = -O2 -gdwarf-2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(GIT_REV)\" +COMMON_OPTS = -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO -DVCS_REV=\"$(GIT_REV)\" +COPTIONS = -O2 -Wformat=2 -Werror $(COMMON_OPTS) # for debug builds -#COPTIONS = -O0 -Wall -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -gdwarf-2 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +#COPTIONS = -O0 $(COMMON_OPTS) MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index 32bb421..e6a6560 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1729 +1739 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d3967ef..c880535 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 9045168..5e2d4cb 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.exe b/agents/windows/check_mk_agent.exe index 1b153d1..8a7ec03 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 cd9c482..2129407 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 bd487ea..d8833ad 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 ad52d80..c1dd3f4 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 64aeae5..c0f0c52 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016