Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

make dist: Add some debug output for issue during agent build

by Lars Michelsen

Module: check_mk Branch: master Commit: 23a321c37450b5eb01664ce4eb774e501eb56580 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23a321c37450b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 24 15:26:49 2018 +0100 make dist: Add some debug output for issue during agent build Change-Id: Id768f5c4668411a5ed99e32c1c9fd15a031453e8 --- agents/windows/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index e51f84b..a658312 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -19,6 +19,7 @@ build_version: $(check_mk_agent_SOURCES:.cc=.o) echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version check_mk_agent.rc: $(VPATH)/check_mk_agent.rc.in build_version + echo "BUILD VERSION: $$(cat $(VPATH)/build_version)" sed -e "s/%VERSION%/$(VERSION)/g" \ -e "s/%YEAR%/$$(date +%Y)/g" \ -e "s/%BUILD_VERSION%/$$(cat $(VPATH)/build_version)/g" $< > $@

6 years, 7 months

Exclude windows agent build files from dist archives

by Lars Michelsen

Module: check_mk Branch: master Commit: b26e7a68bb6482ef222196b53124af92d8bba86a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b26e7a68bb6482… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 24 15:05:10 2018 +0100 Exclude windows agent build files from dist archives Change-Id: Icfa2e13dd0d60bd7bcfffbe56ea3b5d294f0f83e --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f0acfe8..dddd782 100644 --- a/Makefile +++ b/Makefile @@ -214,6 +214,7 @@ endif --exclude .gitattributes \ --exclude $(DIST_ARCHIVE) \ --exclude enterprise/agents/plugins/{build,src} \ + --exclude enterprise/agents/windows/{build64,build} \ $$EXCLUDES \ * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) ; \ if [ -f COMMIT ]; then \

6 years, 7 months

Windows agent: fix test for dotnet_clrmemory

by Jukka Aro

Module: check_mk Branch: master Commit: 95404b9fb290fd3d45aebabfbe7c430f9b5c277a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95404b9fb290fd… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 24 15:15:29 2018 +0100 Windows agent: fix test for dotnet_clrmemory --- agents/windows/it/test_section_dotnet_clrmemory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index a19f281..d955a48 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -35,8 +35,8 @@ def expected_output(): r'Timestamp_Sys100NS') ], repeat(r'\d+,,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'[\w\#]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'\-?\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+')) + r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' + r'\d+,\-?\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+')) def test_section_dotnet_clrmemory(testconfig, expected_output, actual_output,

6 years, 7 months

5654 SEC Fixed XSS on the site management page

by Lars Michelsen

Module: check_mk Branch: master Commit: 63eecd7c3f18a285049b9685b74c610b1e960141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63eecd7c3f18a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 24 14:58:24 2018 +0100 5654 SEC Fixed XSS on the site management page When using the WATO configuration it was possible to create a site on the distributed monitoring page which uses with javascript code in it's alias. When this site was later displayed in the site tables, the javascript code could be executed in the browsers context of the user viewing the table. The insertion of the javascript code is only possible for authenticated users with the permission to configure Check_MK sites. Change-Id: Iee73cf89af0544fda08f6aaf8884a5c9aab000c5 --- .werks/5654 | 18 ++++++++++++++++++ web/htdocs/wato.py | 24 ++++++++++++------------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.werks/5654 b/.werks/5654 new file mode 100644 index 0000000..e20ab94 --- /dev/null +++ b/.werks/5654 @@ -0,0 +1,18 @@ +Title: Fixed XSS on the site management page +Level: 1 +Component: multisite +Class: security +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516802216 + +When using the WATO configuration it was possible to create a site on +the distributed monitoring page which uses with javascript code in +it's alias. When this site was later displayed in the site tables, the +javascript code could be executed in the browsers context of the user +viewing the table. + +The insertion of the javascript code is only possible for authenticated +users with the permission to configure Check_MK sites. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4982c96..cb28caf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5619,7 +5619,7 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): if site_url: html.icon_button(site_url, _("Open this site's local web user interface"), "url", target="_blank") - table.cell(_("Site"), site.get("alias", site_id)) + table.text_cell(_("Site"), site.get("alias", site_id)) # Livestatus table.cell(_("Status"), css="narrow nobr") @@ -9865,8 +9865,8 @@ class ModeDistributedMonitoring(ModeSites): def _page_basic_settings(self, site_id, site): - table.cell(_("ID"), site_id) - table.cell(_("Alias"), site.get("alias", "")) + table.text_cell(_("ID"), site_id) + table.text_cell(_("Alias"), site.get("alias", "")) def _page_livestatus_settings(self, site_id, site): @@ -9883,27 +9883,27 @@ class ModeDistributedMonitoring(ModeSites): # Status host if site.get("status_host"): sh_site, sh_host = site["status_host"] - table.cell(_("Status host"), "%s/%s" % (sh_site, sh_host)) + table.text_cell(_("Status host"), "%s/%s" % (sh_site, sh_host)) else: - table.cell(_("Status host")) + table.text_cell(_("Status host")) # Disabled if site.get("disabled", False) == True: - table.cell(_("Disabled"), "%s" % _("yes")) + table.text_cell(_("Disabled"), "%s" % _("yes")) else: - table.cell(_("Disabled"), _("no")) + table.text_cell(_("Disabled"), _("no")) # Timeout if "timeout" in site: - table.cell(_("Timeout"), _("%d sec") % int(site["timeout"]), css="number") + table.text_cell(_("Timeout"), _("%d sec") % int(site["timeout"]), css="number") else: - table.cell(_("Timeout"), "") + table.text_cell(_("Timeout"), "") # Persist if site.get("persist", False): - table.cell(_("Pers."), "%s" % _("yes")) + table.text_cell(_("Pers."), "%s" % _("yes")) else: - table.cell(_("Pers."), _("no")) + table.text_cell(_("Pers."), _("no")) def _page_replication_configuration(self, site_id, site): @@ -9916,7 +9916,7 @@ class ModeDistributedMonitoring(ModeSites): repl += ", " + _("MKPs") else: repl = "" - table.cell(_("Replication"), repl) + table.text_cell(_("Replication"), repl) # Login-Button for Replication table.cell(_("Login"))

6 years, 7 months

Fixed larger graph legends being cut off in graph dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: 32d50e144c7d63067a220c02db045f7d2c158f7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32d50e144c7d63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 24 13:52:04 2018 +0100 Fixed larger graph legends being cut off in graph dashlets Change-Id: If656c75c748ce02777385aaafbf5bf0903e22256 --- web/htdocs/metrics.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7c5aef5..de830e9 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1750,10 +1750,11 @@ def host_service_graph_dashlet_cmk(graph_identification, custom_graph_render_opt if graph_render_options["show_legend"]: # TODO FIXME: This graph artwork is calulated twice. Once here and once in render_graphs_from_specification_html() graph_artwork = compute_graph_artwork(graph_recipe, graph_data_range, graph_render_options) - graph_render_options["size"] = ( - graph_render_options["size"][0], - graph_render_options["size"][1] - graph_legend_height_ex(graph_render_options, graph_artwork) - ) + if graph_artwork["curves"]: + graph_render_options["size"] = ( + graph_render_options["size"][0], + graph_render_options["size"][1] - graph_legend_height_ex(graph_render_options, graph_artwork) + ) html_code = render_graphs_from_definitions([graph_recipe], graph_data_range, graph_render_options, render_async=False) html.write(html_code)

6 years, 7 months

Use pycryptodomex modules instead of pycrypto/pycryptodome ones.

by Sven Panne

Module: check_mk Branch: master Commit: 76a934784973429d3a0faf8fd6178df8f556c2b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76a93478497342… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 24 13:24:05 2018 +0100 Use pycryptodomex modules instead of pycrypto/pycryptodome ones. This module name chaos is quite unfortunate, but we are forced to do this because of a change in (transitive) dependency: https://github.com/etingof/pysnmp/commit/82e594610 In detail: The current pysnmp version depends on pycryptodomex, but we use "Crypto.Foo" modules in our code. These are gone with pycryptodomex, so we 3 alternatives: * Additionally install pycrypto just for our own use: Not very attractive, because all the functionality is already there, and having 2 different libraries for basically identical purposes would be a bit obscure. * Additionally install pycryptodome (without the "x"): This has the old names, but it doesn't work when pycryptodomex is used, too. A brilliant library design and versioning strategy... :-P * Just switch to the new name. We opt for the last case. Change-Id: I527897314c476cf4cf5c6060bb19376a127c1475 --- bin/mkbackup | 6 +++--- cmk_base/data_sources/tcp.py | 2 +- doc/treasures/livedump/livedump-mail-fetch | 6 +++--- web/htdocs/valuespec.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index c33b562..b761368 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -53,9 +53,9 @@ from tarfile import TarFile, ReadError from hashlib import md5 from OpenSSL import crypto -from Crypto.Cipher import AES, PKCS1_OAEP -from Crypto.PublicKey import RSA -import Crypto.Util.number +from Cryptodome.Cipher import AES, PKCS1_OAEP +from Cryptodome.PublicKey import RSA +import Cryptodome.Util.number try: import simplejson as json diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 215d58b..5b0d02c 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -146,7 +146,7 @@ class TCPDataSource(CheckMKAgentDataSource): def _decrypt_package(self, encrypted_pkg, encryption_key): - from Crypto.Cipher import AES + from Cryptodome.Cipher import AES from hashlib import md5 unpad = lambda s : s[0:-ord(s[-1])] diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch index d681d38..92ac8a6 100755 --- a/doc/treasures/livedump/livedump-mail-fetch +++ b/doc/treasures/livedump/livedump-mail-fetch @@ -33,9 +33,9 @@ encrypt = None if encrypt: from base64 import b64decode - from Crypto import Random - from Crypto.Hash import MD5 - from Crypto.Cipher import AES + from Cryptodome import Random + from Cryptodome.Hash import MD5 + from Cryptodome.Cipher import AES M = poplib.POP3_SSL(pop_server) M.user(pop_user) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c444209..4bf8b33 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -42,7 +42,7 @@ import socket import ipaddress from lib import * import cmk.defines as defines -from Crypto.PublicKey import RSA +from Cryptodome.PublicKey import RSA try: import simplejson as json

6 years, 7 months

Windows agent: fix and clean Configurable.*

by Jukka Aro

Module: check_mk Branch: master Commit: 3be1ad466f0d915f2096ae15b698a30013ff5d7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be1ad466f0d91… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 24 13:19:06 2018 +0100 Windows agent: fix and clean Configurable.* * Declare base class destructors as virtual to ensure that derived class destructors get called for polymorphic instances. * Rely on implicitly declared and defined destructor where possible. * Manage polymorphic ConfigurableBase objects with RAII as unique_ptr's instead of raw pointers. * Remove empty source file Configurable.cc. --- agents/windows/Configurable.cc | 1 - agents/windows/Configurable.h | 12 +++++++++- agents/windows/Configuration.cc | 52 +++++++++++------------------------------ agents/windows/Configuration.h | 15 ++++++------ agents/windows/Makefile.am | 1 - agents/windows/build_version | 2 +- 6 files changed, 34 insertions(+), 49 deletions(-) diff --git a/agents/windows/Configurable.cc b/agents/windows/Configurable.cc deleted file mode 100644 index 71fd767..0000000 --- a/agents/windows/Configurable.cc +++ /dev/null @@ -1 +0,0 @@ -#include "Configurable.h" diff --git a/agents/windows/Configurable.h b/agents/windows/Configurable.h index 0db3412..2bb2fc1 100644 --- a/agents/windows/Configurable.h +++ b/agents/windows/Configurable.h @@ -13,6 +13,10 @@ class WinApiAdaptor; class ConfigurableBase { public: explicit ConfigurableBase(const WinApiAdaptor &winapi) : _winapi(winapi) {} + virtual ~ConfigurableBase() = default; + ConfigurableBase(const ConfigurableBase &) = delete; + ConfigurableBase &operator=(const ConfigurableBase &) = delete; + virtual void feed(const std::string &key, const std::string &value) = 0; virtual void output(const std::string &key, std::ostream &out) const = 0; virtual void startFile() = 0; @@ -31,7 +35,7 @@ public: config.reg(section, key, this); } - ~Configurable() {} + virtual ~Configurable() = default; ValueT *operator->() { return &_value; } @@ -75,6 +79,8 @@ public: config.reg(section, key, this); } + virtual ~ListConfigurable() = default; + ContainerT *operator->() { return &_values; } const ContainerT *operator->() const { return &_values; } @@ -156,6 +162,8 @@ public: config.reg(section, key, this); } + virtual ~KeyedListConfigurable() = default; + virtual void feed(const std::string &var, const std::string &value) override { size_t pos = var.find_first_of(" "); @@ -226,6 +234,8 @@ public: , _mapFunction(mapFunction) , _split_char(split_char) {} + virtual ~SplittingListConfigurable() = default; + virtual void feed(const std::string &key, const std::string &value) override { SuperT::clear(); diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 92286cd..73679d0 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -35,48 +35,22 @@ #define __STDC_FORMAT_MACROS -Configuration::Configuration(const Environment &env) : _environment(env) {} - -Configuration::~Configuration() {} - void Configuration::readSettings() { - for (const auto &cfg : _configurables) { - for (auto entry : cfg.second) { - entry->startFile(); + for (bool local : {false, true}) { + for (const auto &cfg : _configurables) { + for (auto &entry : cfg.second) { + entry->startFile(); + } } - } - - readConfigFile(configFileName(false, _environment)); - for (const auto &cfg : _configurables) { - for (auto entry : cfg.second) { - entry->startFile(); - } + readConfigFile(configFileName(local, _environment)); } - - readConfigFile(configFileName(true, _environment)); } void Configuration::reg(const char *section, const char *key, ConfigurableBase *cfg) { _configurables[std::pair<std::string, std::string>(section, key)].push_back( - cfg); -} - -void Configuration::deregister(const char *section, const char *key, - ConfigurableBase *cfg) { - auto map_iter = - _configurables.find(std::pair<std::string, std::string>(section, key)); - if (map_iter != _configurables.end()) { - for (auto iter = map_iter->second.begin(); - iter != map_iter->second.end(); ++iter) { - if (cfg == *iter) { - map_iter->second.erase(iter); - break; - } - } - } - // if there is nothing to deregister that is actually a usage error + std::unique_ptr<ConfigurableBase>(cfg)); } std::string Configuration::configFileName(bool local, const Environment &env) { @@ -96,25 +70,27 @@ bool Configuration::checkHostRestriction(char *patterns) { } void Configuration::outputConfigurables(std::ostream &out) { - std::map<std::string, std::map<std::string, ConfigurableBase *>> config_map; + using ConfigMap = + std::map<std::string, std::reference_wrapper<ConfigurableBase>>; + std::map<std::string, ConfigMap> config_map; for (const auto &kv : _configurables) { std::string section, key; tie(section, key) = kv.first; if (config_map.find(section) == config_map.end()) { - config_map[section] = std::map<std::string, ConfigurableBase *>(); + config_map[section] = {}; } // this serializes only the first configurable registered under that // name, // if there are multiple with different mechanisms, this may be // confusing - config_map[section][key] = kv.second[0]; + config_map[section].emplace(key, *kv.second[0]); } for (const auto &section : config_map) { out << "[" << section.first << "]\n"; for (const auto &keys : section.second) { - keys.second->output(keys.first, out); + keys.second.get().output(keys.first, out); } } } @@ -182,7 +158,7 @@ void Configuration::readConfigFile(const std::string &filename) { auto map_iter = _configurables.find( config_key(section, std::string(variable, key_len))); if (map_iter != _configurables.end()) { - for (auto cfg : map_iter->second) { + for (auto &cfg : map_iter->second) { try { cfg->feed(variable, value); found = true; diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index 3a358d3..da9e3c7 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -26,6 +26,7 @@ #define Configuration_h #include <map> +#include <memory> #include "SettingsCollector.h" class ConfigurableBase; @@ -61,22 +62,23 @@ check = DISK_C: mrpe/check_disk -w C: check = MEM mrpe/check_mem -w 10 -c 20 */ class Configuration { - typedef std::pair<std::string, std::string> ConfigKey; + 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); - ~Configuration(); + Configuration(const Environment &env) : _environment(env) {} void outputConfigurables(std::ostream &out); void readSettings(); void reg(const char *section, const char *key, ConfigurableBase *cfg); - void deregister(const char *section, const char *key, - ConfigurableBase *cfg); inline const Environment &getEnvironment() const { return _environment; } static std::string configFileName(bool local, const Environment &env); @@ -87,8 +89,7 @@ private: bool checkHostRestriction(char *patterns); private: - typedef std::pair<std::string, std::string> ConfigurableKey; - std::map<ConfigurableKey, std::vector<ConfigurableBase *>> _configurables; + ConfigurableMap _configurables; const Environment &_environment; }; diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 1ba5199..e51f84b 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -34,7 +34,6 @@ unittest: WindowsAgentTest$(EXEEXT) DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) 2>/dev/null libcheck_mk_agent_a_SOURCES = \ - Configurable.cc \ Configuration.cc \ CrashHandler.cc \ Crypto.cc \ diff --git a/agents/windows/build_version b/agents/windows/build_version index ac7e0e6..311e81e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3078 +3080

6 years, 7 months

__repr__ for PerfValue and BasicCheckResult

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ebf08b6ab057098296fc6f51a702a7181d2d66af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebf08b6ab05709… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Jan 24 12:57:54 2018 +0100 __repr__ for PerfValue and BasicCheckResult Change-Id: I07f76c821a028257f0474d34bf179a0536bf9a05 --- tests/checks/checktestlib.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 097f25e..8493b6e 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -48,6 +48,10 @@ class PerfValue(Tuploid): def tuple(self): return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) + def __repr__(self): + return "PerfValue(%s, %s, %s, %s, %s, %s)" % (self.key, self.value, self.warn, + self.crit, self.minimum, self.maximum) + class BasicCheckResult(Tuploid): """ @@ -61,7 +65,7 @@ class BasicCheckResult(Tuploid): def __init__(self, status, infotext, perfdata=None): """We perform some basic consistency checks during initialization""" - assert status in [0,1,2,3] + assert status in [0, 1, 2, 3] assert type(infotext) == str assert "\n" not in infotext self.status = status @@ -71,8 +75,11 @@ class BasicCheckResult(Tuploid): self.perfdata = [] for entry in perfdata: - assert type(entry) == tuple - self.perfdata.append(PerfValue(*entry)) + assert type(entry) in [tuple, PerfValue] + if type(entry) is tuple: + self.perfdata.append(PerfValue(*entry)) + else: + self.perfdata.append(entry) else: self.perfdata = None @@ -80,6 +87,9 @@ class BasicCheckResult(Tuploid): def tuple(self): return (self.status, self.infotext, self.perfdata) + def __repr__(self): + return 'BasicCheckResult(%s, "%s", %s)' % (self.status, self.infotext, self.perfdata) + class CheckResult(object): """

6 years, 7 months

Windows agent: remove unnecessary destructor

by Jukka Aro

Module: check_mk Branch: master Commit: 9b2a59054135f59fa86547b30e4e23e4bc6ea632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b2a59054135f5… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 24 11:59:10 2018 +0100 Windows agent: remove unnecessary destructor Default destructor will be declared and defined implicitly. Calling std::vector::clear() in destructor is redundant. --- agents/windows/SectionManager.h | 1 - agents/windows/build_version | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/windows/SectionManager.h b/agents/windows/SectionManager.h index 3b5b0d3..653bf70 100644 --- a/agents/windows/SectionManager.h +++ b/agents/windows/SectionManager.h @@ -60,7 +60,6 @@ class SectionManager { public: SectionManager(Configuration &config, OnlyFromConfigurable &only_from, Logger *logger, const WinApiAdaptor &winapi); - ~SectionManager() { _sections.clear(); } void emitConfigLoaded(); void loadDynamicSections(); diff --git a/agents/windows/build_version b/agents/windows/build_version index dc3b4b1..ac7e0e6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3076 +3078

6 years, 7 months

5556 check_bi_aggr: Active Check for BI is now able to use the password store

by Marcel Arentz

Module: check_mk Branch: master Commit: 6284d183cc70554802529ccaa5717430a02e8cf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6284d183cc7055… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jan 23 12:17:08 2018 +0100 5556 check_bi_aggr: Active Check for BI is now able to use the password store Change-Id: I3a4f052643e9ce65cc1c4e273a03c9a035cbb692 --- .werks/5556 | 10 ++++++++++ active_checks/check_bi_aggr | 2 ++ checks/check_bi_aggr | 21 +++++++++++---------- web/plugins/wato/active_checks.py | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.werks/5556 b/.werks/5556 new file mode 100644 index 0000000..10f7ccb --- /dev/null +++ b/.werks/5556 @@ -0,0 +1,10 @@ +Title: check_bi_aggr: Active Check for BI is now able to use the password store +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516706180 +Class: feature + + diff --git a/active_checks/check_bi_aggr b/active_checks/check_bi_aggr index 1657cca..5f67ee0 100755 --- a/active_checks/check_bi_aggr +++ b/active_checks/check_bi_aggr @@ -29,6 +29,8 @@ import urllib import os import time +import cmk.password_store +cmk.password_store.replace_passwords() # tell requests not to honour "http(s)_proxy" env variables proxies = { diff --git a/checks/check_bi_aggr b/checks/check_bi_aggr index 130ac78..94664c8 100644 --- a/checks/check_bi_aggr +++ b/checks/check_bi_aggr @@ -26,27 +26,28 @@ def check_bi_aggr_arguments(params): base_url, aggr_name, username, secret, opt_params = params - args = '' + args = [] - args += ' -b %s' % quote_shell_string(base_url) - args += ' -a %s' % quote_shell_string(aggr_name) - args += ' -u %s' % quote_shell_string(username) - args += ' -s %s' % quote_shell_string(secret) + args += [ '-b%s' % base_url ] + args += [ '-a%s' % aggr_name ] + args += [ '-u%s' % username ] + args += [ passwordstore_get_cmdline("-s%s", secret) ] if "auth_mode" in opt_params: - args += ' -m %s' % quote_shell_string(opt_params['auth_mode']) + args += [ '-m%s' % opt_params['auth_mode'] ] if "timeout" in opt_params: - args += ' -t %d' % opt_params['timeout'] + args += [ '-t%d' % opt_params['timeout'] ] if opt_params.get("in_downtime"): - args += ' --in-downtime %s' % opt_params['in_downtime'] + args += [ '--in-downtime=%s' % opt_params['in_downtime'] ] if opt_params.get("acknowledged"): - args += ' --acknowledged %s' % opt_params['acknowledged'] + args += [ '--acknowledged=%s' % opt_params['acknowledged'] ] if opt_params.get("track_downtimes"): - args += " -r -n '$HOSTNAME$'" + args += [ '-r' ] + args += [ '-n $HOSTNAME$' ] return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 698099c..acbc909 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1666,7 +1666,7 @@ register_rule(group, "authentication is set to \"Automation Secret\" based authentication."), allow_empty = False ), - Password( + IndividualOrStoredPassword( title = _("Password / Secret"), help = _("Valid automation secret or password for the user, depending on the chosen " "authentication mode. Be aware that this mode has to be enabled on the monitoring instance. " "Otherwise authentication will fail."),

6 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018