Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: ba7e9970ec29334044c07f88f6da4ad4657dd191 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba7e9970ec2933… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 22 15:22:50 2018 +0100 Cleaned up spaces --- cmk/man_pages.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 45c50e4..39ae319 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -221,11 +221,11 @@ catalog_titles = { # TODO: Do we need a more generic place for this? check_mk_agents = { "vms" : "VMS", - "linux" :"Linux", + "linux" : "Linux", "aix" : "AIX", - "solaris" :"Solaris", - "windows" :"Windows", - "snmp" :"SNMP", + "solaris" : "Solaris", + "windows" : "Windows", + "snmp" : "SNMP", "openvms" : "OpenVMS", "vsphere" : "vSphere" }

6 years, 9 months

Reserved 1 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: a9db27471a238a2ba21d62b4a320caa9fbf17ab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9db27471a238a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 22 14:49:56 2018 +0100 Reserved 1 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8029a14..f3ff04e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5868 +5869

6 years, 9 months

5868 FIX Fix duplicate search entries in check plugins search in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 5907b1aa4ef82ceceb6f6111bd19433a9a524102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5907b1aa4ef82c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 22 14:51:46 2018 +0100 5868 FIX Fix duplicate search entries in check plugins search in WATO Some check plugins are listed in several paths in the catalog of man pages (e.g. <tt>nfsmount</tt>). These would be listed twice in the search results of the WATO module {{Check plugins}}. This has been fixed. --- .werks/5868 | 12 ++++++++++++ web/htdocs/wato.py | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/5868 b/.werks/5868 new file mode 100644 index 0000000..b465206 --- /dev/null +++ b/.werks/5868 @@ -0,0 +1,12 @@ +Title: Fix duplicate search entries in check plugins search in WATO +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519307412 +Class: fix + +Some check plugins are listed in several paths in the catalog of man pages +(e.g. <tt>nfsmount</tt>). These would be listed twice in the search results +of the WATO module {{Check plugins}}. This has been fixed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2d81fe9..13a0cd9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15741,6 +15741,7 @@ class ModeCheckPlugins(WatoMode): def _get_manpages_after_search(self): collection = {} + handled_check_names = set([]) # searches in {"name" : "asd", "title" : "das", ...} def get_matched_entry( entry ): @@ -15767,7 +15768,16 @@ class ModeCheckPlugins(WatoMode): if these_matches: collection.setdefault( key, [] ) - collection[key] += these_matches + # avoid duplicates due to the fact that a man page can have more than + # one places in the global tree of man pages. + for match in these_matches: + name = match.get("name") + if name and name in handled_check_names: + continue # avoid duplicate + else: + collection[key].append(match) + if name: + handled_check_names.add(name) elif type(entries) == dict: for key, subentries in entries.items():

6 years, 9 months

5857 FIX Improve amount of v axis labels for smaller graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 6389b815e84653ac03fe2d92cb0f9547cdd81829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6389b815e84653… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 22 14:22:59 2018 +0100 5857 FIX Improve amount of v axis labels for smaller graphs In some cases where V axis labels should be shown, the label rendering mechanic was simply showing no graph label. Change-Id: If7a8ba70dbaff0d9549734ec31bde3e303c3c3c0 --- .werks/5857 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5857 b/.werks/5857 new file mode 100644 index 0000000..0a2bcf1 --- /dev/null +++ b/.werks/5857 @@ -0,0 +1,11 @@ +Title: Improve amount of v axis labels for smaller graphs +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1519305713 +Class: fix + +In some cases where V axis labels should be shown, the label rendering +mechanic was simply showing no graph label.

6 years, 9 months

5766 FIX Contact groups: Fixed handling of missing inventory paths

by Simon Betz

Module: check_mk Branch: master Commit: 72abc54164662cdf5552596a552504cf78a65195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72abc54164662c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 22 09:48:08 2018 +0100 5766 FIX Contact groups: Fixed handling of missing inventory paths Old configurations have not permitted inventory paths configured. Change-Id: I14bd0cb327220af8c73f669d64b2503d15a1c6e5 --- .werks/5766 | 10 ++++++++++ web/htdocs/inventory.py | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/.werks/5766 b/.werks/5766 new file mode 100644 index 0000000..d51279a --- /dev/null +++ b/.werks/5766 @@ -0,0 +1,10 @@ +Title: Contact groups: Fixed handling of missing inventory paths +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519289175 +Class: fix + +Old configurations have not permitted inventory paths configured. diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 534828f..0eeb521 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -216,6 +216,10 @@ None in case the user is allowed to see the whole tree. permitted_paths = [] for user_group in user_groups: inventory_paths = contact_groups.get(user_group, {}).get('inventory_paths') + if inventory_paths is None: + # Old configuration: no paths configured means 'allow_all' + return None + if inventory_paths == "allow_all": return None

6 years, 9 months

Windows agent: use const ref in range-based loops

by Jukka Aro

Module: check_mk Branch: master Commit: 5731df572c4ed555645b7c5291ad19d4c5b02b7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5731df572c4ed5… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 22 08:40:53 2018 +0100 Windows agent: use const ref in range-based loops --- agents/windows/Configuration.cc | 2 +- agents/windows/build_version | 2 +- agents/windows/sections/SectionFileinfo.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 01ff9c1..48431c4 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -114,7 +114,7 @@ std::vector<EntryPair> collectKeyValuePairs(const Entry &section, void feedSection(const std::string &hostname, ConfigurableMap &configurables, const Entry &section, const CSimpleIni &ini) { - for (const auto kvPair : collectKeyValuePairs(section, ini)) { + for (const auto &kvPair : collectKeyValuePairs(section, ini)) { std::string variable{kvPair.first.pItem}; // intentional copy std::transform(variable.cbegin(), variable.cend(), variable.begin(), tolower); diff --git a/agents/windows/build_version b/agents/windows/build_version index 32c211c..9a1248b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3110 +3112 diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index b111aab..082e5a9 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -77,7 +77,7 @@ void SectionFileinfo::get_directories(std::string base_path) { void SectionFileinfo::determine_filepaths_full_search( std::string base_path, std::string search_pattern) { get_directories(base_path); - for (auto entry : _temp_files) { + for (const auto &entry : _temp_files) { if (globmatch(search_pattern.c_str(), entry.c_str())) { _found_files.push_back(entry); } @@ -129,7 +129,7 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { determine_filepaths(search_pattern); bool found_file = false; - for (auto entry : _found_files) { + for (const auto &entry : _found_files) { found_file = outputFileinfo(out, entry) || found_file; }

6 years, 9 months

mkeventd_open514: Improved error message when not able to open the configured network ports

by Lars Michelsen

Module: check_mk Branch: master Commit: ed1349406ec2aa8446243d7544946a00d226f48f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed1349406ec2aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 21 16:34:57 2018 +0100 mkeventd_open514: Improved error message when not able to open the configured network ports Change-Id: I307248c12c9b362559b193985328a4c78086c7f3 --- bin/mkeventd_open514.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/mkeventd_open514.cc b/bin/mkeventd_open514.cc index c2b4f1d..65836ed 100644 --- a/bin/mkeventd_open514.cc +++ b/bin/mkeventd_open514.cc @@ -97,7 +97,8 @@ int main(int argc, char **argv) { addr.sin_addr.s_addr = 0; if (0 != bind(syslog_sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))) { - perror("Cannot bind UDP socket for syslog to port"); + perror("Cannot bind UDP socket for syslog to port " + "(Is SUID bit set on mkeventd_open514? Is \"nosuid\" not set on the filesystem?)"); exit(1); } @@ -133,7 +134,8 @@ int main(int argc, char **argv) { if (0 != bind(syslog_tcp_sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))) { - perror("Cannot bind TCP socket for syslog-tcp to port"); + perror("Cannot bind TCP socket for syslog-tcp to port " + "(Is SUID bit set on mkeventd_open514? Is \"nosuid\" not set on the filesystem?)"); exit(1); } @@ -168,7 +170,8 @@ int main(int argc, char **argv) { addr.sin_addr.s_addr = 0; if (0 != bind(snmptrap_sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))) { - perror("Cannot bind UDP socket for snmptrap to port"); + perror("Cannot bind UDP socket for snmptrap to port " + "(Is SUID bit set on mkeventd_open514? Is \"nosuid\" not set on the filesystem?)"); exit(1); }

6 years, 9 months

5856 FIX Fixed host auxiliary tag filter with service views

by Lars Michelsen

Module: check_mk Branch: master Commit: 546d67515963eb9e1d032ea31795891f063853eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=546d67515963eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 21 16:14:07 2018 +0100 5856 FIX Fixed host auxiliary tag filter with service views Change-Id: I0696e9c616ae3ee65f9c97208fcb7af28ae6a096 --- .werks/5856 | 11 +++++++++++ web/plugins/visuals/filters.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5856 b/.werks/5856 new file mode 100644 index 0000000..87e5dcd --- /dev/null +++ b/.werks/5856 @@ -0,0 +1,11 @@ +Title: Fixed host auxiliary tag filter with service views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1519225946 + + diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 6e32022..cc5c006 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1190,7 +1190,7 @@ class FilterHostAuxTags(Filter): def host_auxtags_filter(self, tag): - return "Filter: custom_variables ~ TAGS (^|[ ])%s($|[ ])" % lqencode(tag) + return "Filter: host_custom_variables ~ TAGS (^|[ ])%s($|[ ])" % lqencode(tag) def filter(self, infoname):

6 years, 9 months

Windows agent: make readConfigFile testable

by Jukka Aro

Module: check_mk Branch: master Commit: 6ef77e94a85155b72b033b130b8afcdf48e99376 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ef77e94a85155… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Feb 15 16:01:58 2018 +0100 Windows agent: make readConfigFile testable * Turn configFileName into standalone function that can be tested separately without dependencies to the internals of a Configuration instance. * Pass std::istream to readConfigFile instead of filename. * Move (static member function) configFileName out of Configuration class. * Move helper functions out of Configuration into an anonymous namespace. --- agents/windows/Configuration.cc | 67 ++++++++++++++++--------------- agents/windows/Configuration.h | 45 ++++++++++++--------- agents/windows/sections/SectionCheckMK.cc | 4 +- 3 files changed, 64 insertions(+), 52 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 44472a2..a6fd2f5 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -31,12 +31,24 @@ #include <fstream> #include <regex> #include "Configurable.h" -#include "Environment.h" #include "PerfCounter.h" #include "stringutil.h" #define __STDC_FORMAT_MACROS +namespace { + +bool checkHostRestriction(const std::string &hostname, + const std::string &input) { + const auto patterns = tokenize(input, "\\s+"); + return std::any_of(patterns.cbegin(), patterns.cend(), + [&hostname](const auto &p) { + return globmatch(p.c_str(), hostname.c_str()); + }); +} + +} // namespace + void Configuration::readSettings() { for (bool local : {false, true}) { for (const auto &cfg : _configurables) { @@ -44,8 +56,15 @@ void Configuration::readSettings() { entry->startFile(); } } - - readConfigFile(configFileName(local, _environment)); + const auto filename = configFileName(local, _environment); + try { + std::ifstream ifs(filename); + readConfigFile(ifs, _environment.hostname(), _configurables); + } catch (const ParseError &e) { + std::cerr << e.what() << " line " << e.getLineNo() << " in " + << filename << std::endl; + exit(1); + } } } @@ -55,20 +74,6 @@ void Configuration::reg(const char *section, const char *key, std::unique_ptr<ConfigurableBase>(cfg)); } -std::string Configuration::configFileName(bool local, const Environment &env) { - return std::string(env.agentDirectory()) + "\\" + "check_mk" + - (local ? "_local" : "") + ".ini"; -} - -bool Configuration::checkHostRestriction(const std::string &input) { - std::string hostname = _environment.hostname(); - const auto patterns = tokenize(input, "\\s+"); - return std::any_of(patterns.cbegin(), patterns.cend(), - [&hostname](const auto &p) { - return globmatch(p.c_str(), hostname.c_str()); - }); -} - void Configuration::outputConfigurables(std::ostream &out) { using ConfigMap = std::map<std::string, std::reference_wrapper<ConfigurableBase>>; @@ -95,9 +100,9 @@ void Configuration::outputConfigurables(std::ostream &out) { } } -void Configuration::readConfigFile(const std::string &filename) { - std::ifstream ifs(filename); - if (!ifs) { +void readConfigFile(std::istream &is, const std::string &hostname, + ConfigurableMap &configurables) { + if (!is) { return; } @@ -105,7 +110,7 @@ void Configuration::readConfigFile(const std::string &filename) { bool is_active = true; // false in sections with host restrictions std::string section; - for (unsigned lineno = 1; std::getline(ifs, line); ++lineno) { + for (unsigned lineno = 1; std::getline(is, line); ++lineno) { ltrim(line); rtrim(line); if (line.empty() || line.front() == '#' || line.front() == ';') @@ -120,9 +125,7 @@ void Configuration::readConfigFile(const std::string &filename) { // split up line at = sign const auto tokens = tokenize(line, "="); if (tokens.size() != 2) { - std::cerr << "Invalid line " << lineno << " in " << filename - << "." << std::endl; - exit(1); + throw ParseError("Invalid", lineno); } std::string variable{tokens[0]}; rtrim(variable); @@ -133,7 +136,8 @@ void Configuration::readConfigFile(const std::string &filename) { rtrim(value); // handle host restriction - if (variable == "host") is_active = checkHostRestriction(value); + if (variable == "host") + is_active = checkHostRestriction(hostname, value); // skip all other variables for non-relevant hosts else if (!is_active) @@ -146,9 +150,9 @@ void Configuration::readConfigFile(const std::string &filename) { else { bool found = false; size_t key_len = strcspn(variable.c_str(), " \n"); - auto map_iter = _configurables.find( - config_key(section, std::string(variable, 0, key_len))); - if (map_iter != _configurables.end()) { + auto map_iter = configurables.find( + ConfigKey(section, std::string(variable, 0, key_len))); + if (map_iter != configurables.end()) { for (auto &cfg : map_iter->second) { try { cfg->feed(variable, value); @@ -160,10 +164,9 @@ void Configuration::readConfigFile(const std::string &filename) { } } if (!found) { - std::cerr << "Invalid entry (" << section << ":" << variable - << ") in " << filename << " line " << lineno - << std::endl; - exit(1); + throw ParseError( + "Invalid entry (" + section + ":" + variable + ")", + lineno); } } } diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index edccb02..aff7cf6 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -27,11 +27,35 @@ #include <map> #include <memory> +#include "Environment.h" #include "SettingsCollector.h" class ConfigurableBase; class Environment; +class ParseError : public std::runtime_error { +public: + explicit ParseError(const std::string &what, unsigned lineno) + : std::runtime_error(what), _lineno(lineno) {} + + unsigned getLineNo() const { return _lineno; } + +private: + unsigned _lineno{0}; +}; + +using ConfigKey = std::pair<std::string, std::string>; +using ConfigurableMap = + std::map<ConfigKey, std::vector<std::unique_ptr<ConfigurableBase>>>; + +void readConfigFile(std::istream &is, const std::string &hostname, + ConfigurableMap &configurables); + +inline std::string configFileName(bool local, const Environment &env) { + return env.agentDirectory() + "\\" + "check_mk" + (local ? "_local" : "") + + ".ini"; +} + /* Example configuration file: [global] @@ -62,18 +86,10 @@ check = DISK_C: mrpe/check_disk -w C: check = MEM mrpe/check_mem -w 10 -c 20 */ class Configuration { - using ConfigKey = std::pair<std::string, std::string>; - using ConfigurableKey = std::pair<std::string, std::string>; - using ConfigurableMap = - std::map<ConfigurableKey, - std::vector<std::unique_ptr<ConfigurableBase>>>; - - ConfigKey config_key(const std::string &section, const std::string &key) { - return std::make_pair(section, key); - } - public: - Configuration(const Environment &env) : _environment(env) {} + explicit Configuration(const Environment &env) : _environment(env) {} + Configuration(Configuration &) = delete; + Configuration &operator=(const Configuration &) = delete; void outputConfigurables(std::ostream &out); void readSettings(); @@ -81,13 +97,6 @@ public: void reg(const char *section, const char *key, ConfigurableBase *cfg); inline const Environment &getEnvironment() const { return _environment; } - static std::string configFileName(bool local, const Environment &env); - -private: - void readConfigFile(const std::string &filename); - - bool checkHostRestriction(const std::string &input); - private: ConfigurableMap _configurables; diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index c10dab1..92ee0bd 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -56,8 +56,8 @@ std::vector<KVPair> SectionCheckMK::createInfoFields() const { {"Hostname", _env.hostname()}, {"Architecture", arch}, {"WorkingDirectory", _env.currentDirectory()}, - {"ConfigFile", Configuration::configFileName(false, _env)}, - {"LocalConfigFile", Configuration::configFileName(true, _env)}, + {"ConfigFile", configFileName(false, _env)}, + {"LocalConfigFile", configFileName(true, _env)}, {"AgentDirectory", _env.agentDirectory()}, {"PluginsDirectory", _env.pluginsDirectory()}, {"StateDirectory", _env.stateDirectory()},

6 years, 9 months

Add simpleini library as a Git archive tarball

by Jukka Aro

Module: check_mk Branch: master Commit: d494d2240d6ce6b89b90df774475561e2896f4b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d494d2240d6ce6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 21 13:01:31 2018 +0100 Add simpleini library as a Git archive tarball The library simpleini provides simple but versatile tool for parsing ini files. It also supports multiple keys within a section, a feature necessary for the Check_MK Windows agent. The tarball contains the state of the project at commit 2af65fcc504f8242752755e836709762ef7ce062. See or clone https://github.com/brofield/simpleini.git for details of the project and that particular commit. --- omd/packages/simpleini/simpleini-2af65fc.tar.gz | Bin 0 -> 55059 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/simpleini/simpleini-2af65fc.tar.gz b/omd/packages/simpleini/simpleini-2af65fc.tar.gz new file mode 100644 index 0000000..3702e49 Binary files /dev/null and b/omd/packages/simpleini/simpleini-2af65fc.tar.gz differ

6 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018