Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

5355 FIX dmraid: add timeouts to the linux agent

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ed8538e8ff37e93505a20837eafce532426ecdb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed8538e8ff37e9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 13 09:26:33 2017 +0100 5355 FIX dmraid: add timeouts to the linux agent Add timeouts to "dmraid -r" and "dmraid -s" to prevent the Check_MK agent from running into a timeout in special setups with a large amount of devices. Change-Id: I6169847813a4e13b4f35ed4e4e9a49297f7f06a4 --- .werks/5355 | 12 ++++++++++++ agents/check_mk_agent.linux | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5355 b/.werks/5355 new file mode 100644 index 0000000..5c1b8eb --- /dev/null +++ b/.werks/5355 @@ -0,0 +1,12 @@ +Title: dmraid: add timeouts to the linux agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510561310 +Class: fix + +Add timeouts to "dmraid -r" and "dmraid -s" to prevent the Check_MK +agent from running into a timeout in special setups with a large +amount of devices. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 7ce4333..6fec1cd 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -466,12 +466,12 @@ echo '<<<md>>>' cat /proc/mdstat # RAID status of Linux RAID via device mapper -if type dmraid >/dev/null && DMSTATUS=$(dmraid -r) +if type dmraid >/dev/null && DMSTATUS=$(waitmax 3 dmraid -r) then echo '<<<dmraid>>>' # Output name and status - dmraid -s | grep -e ^name -e ^status + waitmax 20 dmraid -s | grep -e ^name -e ^status # Output disk names of the RAID disks DISKS=$(echo "$DMSTATUS" | cut -f1 -d\:)

6 years, 7 months

Windows agent: optimize section Skype

by Jukka Aro

Module: check_mk Branch: master Commit: 904fc03556bd83fdabe0e0ed4145ae498ee5b3c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=904fc03556bd83… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Nov 24 12:21:59 2017 +0100 Windows agent: optimize section Skype Build map from counter name to base number lazily when the map is actually needed. This avoids unnecessary mapping and error logprints about unavailable perf counters when section Skype is not activated. Change-Id: I1d308cf359c45276126e0293d89d7fa55de88e11 --- agents/windows/Section.h | 5 ++-- agents/windows/build_version | 2 +- agents/windows/sections/SectionPerfcounter.cc | 36 ++++++++++++++++++---- agents/windows/sections/SectionPerfcounter.h | 26 +++++++++++++--- agents/windows/sections/SectionSkype.cc | 43 ++++----------------------- agents/windows/sections/SectionSkype.h | 5 ++++ 6 files changed, 67 insertions(+), 50 deletions(-) diff --git a/agents/windows/Section.h b/agents/windows/Section.h index 38cab1f..8a5a9ad 100644 --- a/agents/windows/Section.h +++ b/agents/windows/Section.h @@ -36,18 +36,17 @@ class Environment; class Logger; -class WinApiAdaptor; class Section { friend class SectionGroup; - const std::string _outputName; - const std::string _configName; bool _show_header{true}; char _separator{' '}; bool _realtime_support{false}; protected: + const std::string _outputName; + const std::string _configName; const Environment &_env; Logger *_logger; const WinApiAdaptor &_winapi; diff --git a/agents/windows/build_version b/agents/windows/build_version index e8fdf6b..2e183e0 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3008 +3010 diff --git a/agents/windows/sections/SectionPerfcounter.cc b/agents/windows/sections/SectionPerfcounter.cc index 043050e..d488c97 100644 --- a/agents/windows/sections/SectionPerfcounter.cc +++ b/agents/windows/sections/SectionPerfcounter.cc @@ -29,13 +29,33 @@ #include "../PerfCounterCommon.h" #include "../stringutil.h" +int NameBaseNumberMap::getCounterBaseNumber(const std::string &counterName) { + // Fill name -> counter ID maps lazily when first needed. + if (_nameIdMaps.empty()) { + _nameIdMaps = {perf_name_map<char>(_winapi, false), + perf_name_map<char>(_winapi, true)}; + } + + for (const auto &nameIdMap : _nameIdMaps) { + const auto it = nameIdMap.find(counterName); + + if (it != nameIdMap.end()) { + return it->second; + } + } + Debug(_logger) << "NameBaseNumberMap::getCounterBaseNumber " + << "could not resolve counter name " << counterName; + return -1; +} + SectionPerfcounter::SectionPerfcounter(const std::string &outputName, const std::string &configName, - unsigned counterBaseNumber, - const Environment &env, Logger *logger, + const Environment &env, + NameBaseNumberMap &nameNumberMap, + Logger *logger, const WinApiAdaptor &winapi) : Section(outputName, configName, env, logger, winapi) - , _counter_base_number(counterBaseNumber) { + , _nameNumberMap(nameNumberMap) { withSeparator(','); } @@ -47,8 +67,14 @@ SectionPerfcounter *SectionPerfcounter::withToggleIfMissing() { bool SectionPerfcounter::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionPerfcounter::produceOutputInner"; try { - PerfCounterObject counter_object(_counter_base_number, _winapi, - _logger); + const int counterBaseNumber = + _nameNumberMap.getCounterBaseNumber(_outputName); + + if (counterBaseNumber < 0) { + return false; + } + + PerfCounterObject counter_object(counterBaseNumber, _winapi, _logger); std::vector<std::wstring> instance_names = counter_object.instanceNames(); std::vector<PERF_INSTANCE_DEFINITION *> instances = diff --git a/agents/windows/sections/SectionPerfcounter.h b/agents/windows/sections/SectionPerfcounter.h index 4c179de..9ac3a4f 100644 --- a/agents/windows/sections/SectionPerfcounter.h +++ b/agents/windows/sections/SectionPerfcounter.h @@ -27,20 +27,38 @@ #include <memory> #include <string> +#include <unordered_map> #include <vector> #undef CreateMutex #include "../Section.h" +class NameBaseNumberMap { +public: + NameBaseNumberMap(Logger *logger, const WinApiAdaptor &winapi) + : _logger(logger), _winapi(winapi) {} + NameBaseNumberMap(const NameBaseNumberMap &) = delete; + NameBaseNumberMap &operator=(const NameBaseNumberMap &) = delete; + + int getCounterBaseNumber(const std::string &counterName); + +private: + // Fill name -> counter ID maps lazily when first needed. + std::vector<std::unordered_map<std::string, DWORD>> _nameIdMaps; + + Logger *_logger; + const WinApiAdaptor &_winapi; +}; + class SectionPerfcounter : public Section { - const unsigned _counter_base_number; bool _toggle_if_missing{false}; time_t _disabled_until{0}; + NameBaseNumberMap &_nameNumberMap; public: SectionPerfcounter(const std::string &outputName, - const std::string &configName, - unsigned counterBaseNumber, const Environment &env, - Logger *logger, const WinApiAdaptor &winapi); + const std::string &configName, const Environment &env, + NameBaseNumberMap &nameNumberMap, Logger *logger, + const WinApiAdaptor &winapi); SectionPerfcounter *withToggleIfMissing(); diff --git a/agents/windows/sections/SectionSkype.cc b/agents/windows/sections/SectionSkype.cc index 2bf58c3..b56de9b 100644 --- a/agents/windows/sections/SectionSkype.cc +++ b/agents/windows/sections/SectionSkype.cc @@ -27,39 +27,15 @@ #include "../PerfCounterCommon.h" #include "../WinApiAdaptor.h" #include "../stringutil.h" -#include "SectionPerfcounter.h" - -namespace { - -int getCounterName( - const WinApiAdaptor &winapi, - const std::array<std::unordered_map<std::string, DWORD>, 2> &nameIdMaps, - const std::string &counterName, Logger *logger) { - for (const auto &nameIdMap : nameIdMaps) { - const auto it = nameIdMap.find(counterName); - - if (it != nameIdMap.end()) { - return it->second; - } - } - Debug(logger) << "SectionSkype::SectionSkype " - << "could not resolve counter name " << counterName; - return -1; -} - -} // namespace SectionSkype::SectionSkype(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) - : SectionGroup("skype", "skype", env, logger, winapi) { + : SectionGroup("skype", "skype", env, logger, winapi) + , _nameNumberMap(_logger, _winapi) { withToggleIfMissing(); withNestedSubtables(); withSeparator(','); - const std::array<std::unordered_map<std::string, DWORD>, 2> nameIdMaps = { - perf_name_map<char>(_winapi, false), - perf_name_map<char>(_winapi, true)}; - for (const std::string &counterName : {"LS:WEB - Address Book Web Query", "LS:WEB - Address Book File Download", @@ -91,22 +67,15 @@ SectionSkype::SectionSkype(const Environment &env, Logger *logger, "LS:XmppFederationProxy - Streams", "LS:A/V Edge - TCP Counters", "LS:A/V Edge - UDP Counters"}) { - int counterId = - getCounterName(_winapi, nameIdMaps, counterName, _logger); - if (counterId >= 0) { - withSubSection(new SectionPerfcounter( - counterName, counterName, counterId, _env, _logger, _winapi)); - } + withSubSection(new SectionPerfcounter(counterName, counterName, _env, + _nameNumberMap, _logger, _winapi)); } // TODO the version number in the counter name isn't exactly inspiring // trust, but there currently is no support for wildcards. const std::string counterName = "ASP.NET Apps v4.0.30319"; - int counterId = getCounterName(_winapi, nameIdMaps, counterName, _logger); - if (counterId >= 0) { - withDependentSubSection(new SectionPerfcounter( - counterName, counterName, counterId, _env, _logger, _winapi)); - } + withDependentSubSection(new SectionPerfcounter( + counterName, counterName, _env, _nameNumberMap, _logger, _winapi)); } bool SectionSkype::produceOutputInner(std::ostream &out) { diff --git a/agents/windows/sections/SectionSkype.h b/agents/windows/sections/SectionSkype.h index 65666e9..9b0e9c9 100644 --- a/agents/windows/sections/SectionSkype.h +++ b/agents/windows/sections/SectionSkype.h @@ -28,6 +28,7 @@ #undef CreateMutex #include "../Section.h" #include "SectionGroup.h" +#include "SectionPerfcounter.h" class SectionSkype : public SectionGroup { public: @@ -36,6 +37,10 @@ public: protected: virtual bool produceOutputInner(std::ostream &out) override; + +private: + // Use a single counter name -> base no. map. Fill lazily when first needed. + NameBaseNumberMap _nameNumberMap; }; #endif // SectionSkype_h

6 years, 7 months

Windows agent: reorder access specifiers

by Jukka Aro

Module: check_mk Branch: master Commit: 06bfafa5e364fbd7bdbec1a5b0e5883d7c6d2709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06bfafa5e364fb… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Nov 27 12:52:51 2017 +0100 Windows agent: reorder access specifiers Use order public - protected - private. Leave class-internal types, typedefs and constants at the beginning. Also clean some unnecessary stuff like redundant declarations for move semantics etc. Change-Id: I2f2f6adaeb7b78b2a8bd4270ed70ee1268fbc4ed --- agents/windows/Configurable.h | 22 ++++---- agents/windows/CrashHandler.h | 6 +- agents/windows/Crypto.h | 12 ++-- agents/windows/Environment.cc | 6 +- agents/windows/Environment.h | 2 - agents/windows/EventLog.cc | 7 ++- agents/windows/EventLog.h | 23 ++------ agents/windows/EventLogVista.cc | 83 ++++++++++++++-------------- agents/windows/EventLogVista.h | 12 ++-- agents/windows/ExternalCmd.h | 1 - agents/windows/IEventLog.h | 8 --- agents/windows/ListenSocket.h | 14 ++--- agents/windows/OutputProxy.h | 42 +++++++------- agents/windows/PerfCounter.h | 28 +++++----- agents/windows/RotatingFileHandler.h | 8 +-- agents/windows/Section.h | 35 ++++++------ agents/windows/SectionManager.h | 42 +++++++------- agents/windows/Thread.h | 21 +++---- agents/windows/build_version | 2 +- agents/windows/dynamic_func.h | 16 +++--- agents/windows/sections/SectionCheckMK.h | 16 +++--- agents/windows/sections/SectionEventlog.h | 19 +++---- agents/windows/sections/SectionFileinfo.h | 12 ++-- agents/windows/sections/SectionGroup.h | 15 ++--- agents/windows/sections/SectionLogwatch.cc | 9 +-- agents/windows/sections/SectionLogwatch.h | 14 ++--- agents/windows/sections/SectionMRPE.h | 9 ++- agents/windows/sections/SectionOHM.h | 7 ++- agents/windows/sections/SectionPS.h | 26 ++++----- agents/windows/sections/SectionPerfcounter.h | 9 +-- agents/windows/sections/SectionPluginGroup.h | 46 ++++++--------- agents/windows/sections/SectionSkype.cc | 4 +- agents/windows/sections/SectionSpool.h | 2 - agents/windows/sections/SectionUptime.h | 6 +- agents/windows/sections/SectionWMI.cc | 5 +- agents/windows/sections/SectionWMI.h | 15 +++-- agents/windows/sections/SectionWinperf.h | 4 +- agents/windows/types.h | 31 ++++------- agents/windows/win_error.cc | 10 ++-- agents/windows/wmiHelper.cc | 1 - agents/windows/wmiHelper.h | 35 ++++++------ 41 files changed, 311 insertions(+), 374 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=06bfafa5e3…

6 years, 7 months

Fix typo in checkman/storeonce_clusterinfo.cluster

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4f1b94e98cbd617424d5b7560711822521ea86ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f1b94e98cbd61… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 27 15:18:32 2017 +0100 Fix typo in checkman/storeonce_clusterinfo.cluster Change-Id: I8dbdc7ca7140d6ab6fce2e32f396a7987298a9b5 --- checkman/storeonce_clusterinfo.cluster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/storeonce_clusterinfo.cluster b/checkman/storeonce_clusterinfo.cluster index 3e840bb..3dc5610 100644 --- a/checkman/storeonce_clusterinfo.cluster +++ b/checkman/storeonce_clusterinfo.cluster @@ -1,6 +1,6 @@ title: HPE StoreOnce: Cluster Status agents: storeonce -catalog: hw/storeagehw/hpe +catalog: hw/storagehw/hpe license: GPL distribution: check_mk description:

6 years, 7 months

Removed dead code

by Lars Michelsen

Module: check_mk Branch: master Commit: ace146fe507c2d860cef5f214656f992ebec5159 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ace146fe507c2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 14:20:54 2017 +0100 Removed dead code Change-Id: I7d0b00c21e3c26cfa389e275eb43bd90344dc9fc --- web/htdocs/wato.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3a9cc60..b476969 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17161,13 +17161,6 @@ class RuleComment(TextAreaUnicode): ) html.close_div() - def render_buttons(self): - for icon, textfunc, help in self._prefix_buttons: - try: - text = textfunc() - except: - text = textfunc - def rule_option_elements(disabling=True):

6 years, 7 months

5545 FIX Editing rules: Fixed adding date+user to rule comments

by Lars Michelsen

Module: check_mk Branch: master Commit: bdf6fbc3373095ee9bbe3f8d9d6f71730311320d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdf6fbc3373095… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 14:07:44 2017 +0100 5545 FIX Editing rules: Fixed adding date+user to rule comments When editing a rule in WATO, there is the comment field available, which can e.g. be used to write down information about the history of this rule. The icon on the right of the text area is meant to add a new history entry to the beginning of the comment. The way this text was added to existing comments was not really working as intended. It has now been changed to add a new line to the beginning, setting the cursor on this field and position it at the end of the just added line. Change-Id: Ic992f023b87be39512cc1afce155cc9874bad209 --- .werks/5545 | 18 ++++++++++++++++++ web/htdocs/js/checkmk.js | 20 ++++++++++++-------- web/htdocs/wato.py | 2 +- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.werks/5545 b/.werks/5545 new file mode 100644 index 0000000..0c09142 --- /dev/null +++ b/.werks/5545 @@ -0,0 +1,18 @@ +Title: Editing rules: Fixed adding date+user to rule comments +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1511787872 + +When editing a rule in WATO, there is the comment field available, which can e.g. +be used to write down information about the history of this rule. The icon on +the right of the text area is meant to add a new history entry to the beginning +of the comment. The way this text was added to existing comments was not really +working as intended. + +It has now been changed to add a new line to the beginning, setting the cursor +on this field and position it at the end of the just added line. diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 76e6617..64b5b8c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2267,14 +2267,18 @@ function vs_list_choice_toggle_all(varprefix) { } } -function vs_textascii_button(img, text, how) { - var oInput = img.previousElementSibling; - while (oInput.tagName == "A") - oInput = oInput.previousElementSibling; - if (oInput.tagName != "INPUT" && oInput.tagName != "TEXTAREA") - oInput = oInput.children[0]; // complain mode - oInput.value = text + oInput.value; // TODO: how - oInput.focus(); +function vs_rule_comment_prefix_date_and_user(img, text) { + var container = img.parentNode.parentNode; + var textarea = container.getElementsByTagName("textarea")[0]; + + if (!textarea) { + console.log("Failed to find textarea object"); + return; + } + + textarea.value = text + "\n" + textarea.value; + textarea.focus(); + textarea.setSelectionRange(text.length, text.length); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4628f3a..3a9cc60 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17157,7 +17157,7 @@ class RuleComment(TextAreaUnicode): html.icon_button(None, help=_("Prefix date and your name to the comment"), icon="insertdate", - onclick="vs_textascii_button(this, '%s', 'prefix');" % date_and_user + onclick="vs_rule_comment_prefix_date_and_user(this, '%s');" % date_and_user ) html.close_div()

6 years, 7 months

Moved rule comment specific button prefix feature to specific valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 2749a8b5d5578ec5775f21d795d95c4db3ab1cd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2749a8b5d5578e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 13:57:51 2017 +0100 Moved rule comment specific button prefix feature to specific valuespec Change-Id: Id7a8391dcdabbd525e931b184e971b772989ae57 --- web/htdocs/valuespec.py | 23 ----------------------- web/htdocs/wato.py | 46 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6136b18..46f0e68 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -399,7 +399,6 @@ class TextAscii(ValueSpec): self._minlen = kwargs.get('minlen', None) if type(self._regex) == str: self._regex = re.compile(self._regex) - self._prefix_buttons = kwargs.get("prefix_buttons", []) self._onkeyup = kwargs.get("onkeyup") self._autocomplete = kwargs.get("autocomplete", True) @@ -417,9 +416,6 @@ class TextAscii(ValueSpec): html.write(self._label) html.nbsp() - if self._prefix_buttons: - html.open_div(style="white-space: nowrap;") - if hidden: type_ = "password" else: @@ -438,19 +434,6 @@ class TextAscii(ValueSpec): attrs=attrs, autocomplete="off" if not self._autocomplete else None, ) - if self._prefix_buttons: - self.render_buttons() - html.close_div() - - def render_buttons(self): - html.nbsp() - for icon, textfunc, help in self._prefix_buttons: - try: - text = textfunc() - except: - text = textfunc - html.icon_button("#", help, icon, onclick="vs_textascii_button(this, '%s', 'prefix');" % text) - def value_to_text(self, value): if not value: @@ -1009,14 +992,8 @@ class TextAreaUnicode(TextUnicode): if self._monospaced: attrs["class"] = "tt" - if self._prefix_buttons: - html.open_div(style="white-space: nowrap;") - html.text_area(varprefix, value, rows=rows, cols=self._cols, attrs = attrs, try_max_width=self._try_max_width) - if self._prefix_buttons: - self.render_buttons() - html.close_div() # Overridded because we do not want to strip() here and remove '\r' diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9bfbd83..4628f3a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17137,10 +17137,40 @@ def vs_rule_options(disabling=True): ) -def rule_option_elements(disabling=True): - def date_and_user(): - return time.strftime("%F", time.localtime()) + " " + config.user.id + ": " +class RuleComment(TextAreaUnicode): + def __init__(self, **kwargs): + kwargs.setdefault("title", _("Comment")) + kwargs.setdefault("help", _("An optional comment that explains the purpose of this rule.")) + kwargs.setdefault("rows", 4) + kwargs.setdefault("cols", 80) + super(RuleComment, self).__init__(**kwargs) + + + def render_input(self, varprefix, value): + html.open_div(style="white-space: nowrap;") + + super(RuleComment, self).render_input(varprefix, value) + + date_and_user = "%s %s: " % (time.strftime("%F", time.localtime()), config.user.id) + + html.nbsp() + html.icon_button(None, + help=_("Prefix date and your name to the comment"), + icon="insertdate", + onclick="vs_textascii_button(this, '%s', 'prefix');" % date_and_user + ) + html.close_div() + + def render_buttons(self): + for icon, textfunc, help in self._prefix_buttons: + try: + text = textfunc() + except: + text = textfunc + + +def rule_option_elements(disabling=True): elements = [ ( "description", TextUnicode( @@ -17149,15 +17179,7 @@ def rule_option_elements(disabling=True): size = 80, ) ), - ( "comment", - TextAreaUnicode( - title = _("Comment"), - help = _("An optional comment that explains the purpose of this rule."), - rows = 4, - cols = 80, - prefix_buttons = [ ("insertdate", date_and_user, _("Prefix date and your name to the comment")) ] - ) - ), + ( "comment", RuleComment()), ( "docu_url", TextAscii( title = _("Documentation-URL"),

6 years, 7 months

Suffix filenames for check tests with _check, as to avoid collision with other tests (eg. checks/ test_mkbackup.py and bin/test_mkbackup.py)

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7a51ebd1ffd188c9c691a5ac090dbcad7d3b27b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a51ebd1ffd188… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 27 13:53:14 2017 +0100 Suffix filenames for check tests with _check, as to avoid collision with other tests (eg. checks/test_mkbackup.py and bin/test_mkbackup.py) Change-Id: Ia6abd24b5a4a1fa91464c688e88f0fd727c7b41d --- tests/checks/{test_df.py => test_df_check.py} | 0 tests/checks/{test_uptime.py => test_uptime_check.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/checks/test_df.py b/tests/checks/test_df_check.py similarity index 100% rename from tests/checks/test_df.py rename to tests/checks/test_df_check.py diff --git a/tests/checks/test_uptime.py b/tests/checks/test_uptime_check.py similarity index 100% rename from tests/checks/test_uptime.py rename to tests/checks/test_uptime_check.py

6 years, 7 months

Fixed host rename in current history file after recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: c8eb40ada4ec944ddcc35f15f85aef8c1840b10b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8eb40ada4ec94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:52:56 2017 +0100 Fixed host rename in current history file after recent change Change-Id: I30b1f1850c3d67b95c91fd7aeee74778b228b740 --- cmk_base/automations/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 8e2099e..90e358e 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -431,7 +431,7 @@ class AutomationRenameHosts(Automation): def _rename_host_in_remaining_core_history_files(self, oldname, newname): """Perform the rename operation in all history archive files that have not been handled yet""" finished_file_paths = self._finished_history_files[(oldname, newname)] - all_file_paths = set(self._get_core_history_files(only_archive=True)) + all_file_paths = set(self._get_core_history_files(only_archive=False)) todo_file_paths = list(all_file_paths.difference(finished_file_paths)) return self._rename_host_in_core_history_files(todo_file_paths, oldname, newname)

6 years, 7 months

Refactored LDAP connection edit dialog to WatoMode structure

by Lars Michelsen

Module: check_mk Branch: master Commit: 93596006c4125991456032418923f68a8443a10e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93596006c41259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:17:51 2017 +0100 Refactored LDAP connection edit dialog to WatoMode structure Change-Id: I75f342ae9a62d86c774ef53bc4043b4d2230f578 --- web/htdocs/userdb.py | 2 +- web/htdocs/wato.py | 1131 +++++++++++++++++++++++++------------------------- 2 files changed, 575 insertions(+), 558 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=93596006c4…

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017