Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: ecb6676deff98656ade59ce054b15008a545b7f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb6676deff986… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 12 09:15:39 2016 +0100 Testcommit Change-Id: I053cc0e42d7f34f0bbefcff8064ce72f2b189b46 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6c7c35e..d0e2e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... * 4078 FIX: Fixed handling of hosts with non resolvable IP addresses during runtime... + Checks & Agents: * 3988 Windows agent: new global option disabled_sections... * 3989 Logwatch patterns: now able to change state of context lines...

7 years, 6 months

Testcommit 2

by Lars Michelsen

Module: check_mk Branch: master Commit: 2784f8ddb145652fd8f42ae2aa533a01012e5abe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2784f8ddb14565… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 10 15:58:34 2016 +0100 Testcommit 2 --- ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02c0acb..6c7c35e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,6 @@ * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... * 4078 FIX: Fixed handling of hosts with non resolvable IP addresses during runtime... - - Checks & Agents: * 3988 Windows agent: new global option disabled_sections... * 3989 Logwatch patterns: now able to change state of context lines...

7 years, 6 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 22e23e02d2612e26136cd39553ab103eeb60da75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22e23e02d2612e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 10 15:41:22 2016 +0100 Testcommit --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6c7c35e..02c0acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... * 4078 FIX: Fixed handling of hosts with non resolvable IP addresses during runtime... + + Checks & Agents: * 3988 Windows agent: new global option disabled_sections... * 3989 Logwatch patterns: now able to change state of context lines...

7 years, 6 months

Werk 4045 reloaded: Correcting the events counts.

by Sven Panne

Module: check_mk Branch: master Commit: d2a8a2bf1f6232dc290917b07d061ae69d32a71b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2a8a2bf1f6232… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 9 15:51:21 2016 +0100 Werk 4045 reloaded: Correcting the events counts. --- web/plugins/sidebar/shipped.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7c8ffbe..387485f 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -608,18 +608,22 @@ def get_tactical_overview_data(extra_filter_headers): extra_filter_headers event_query = ( + # "Events" column "GET eventconsoleevents\n" - "Stats: event_phase != \n" - ) - - event_problems_query = ( - "GET eventconsoleevents\n" + "Stats: event_phase = open\n" "Stats: event_phase = ack\n" + "StatsOr: 2\n" + # "Problems" column "Stats: event_phase = open\n" - "Filter: event_state != 0\n" + "Stats: event_phase = ack\n" + "StatsOr: 2\n" + "Stats: event_state != 0\n" + "StatsAnd: 2\n" + # "Unhandled" column + "Stats: event_phase = open\n" + "Stats: event_state != 0\n" + "StatsAnd: 2\n" ) - # TODO: We should rather use Stats: event_state != 0\nStatsAnd: 2 here. But that - # segfaults the CMC currently ;-) try: hstdata = sites.live().query_summed_stats(host_query) @@ -633,7 +637,7 @@ def get_tactical_overview_data(extra_filter_headers): if notdata is None: notdata = [0] - event_data = tactical_overview_get_event_data(event_query, event_problems_query) + event_data = sites.live().query_summed_stats(event_query) except livestatus.MKLivestatusNotFoundError: return None, None, None, None @@ -641,11 +645,6 @@ def get_tactical_overview_data(extra_filter_headers): return hstdata, svcdata, notdata, event_data -def tactical_overview_get_event_data(event_query, event_problems_query): - return sites.live().query_summed_stats(event_query) + \ - sites.live().query_summed_stats(event_problems_query) - - def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): if extra_url_variables is None: extra_url_variables = []

7 years, 7 months

Unbreak build

by Sven Panne

Module: check_mk Branch: master Commit: b09ae47bd84ac7679d0b929592889ec6849af311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b09ae47bd84ac7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 9 16:01:17 2016 +0100 Unbreak build --- livestatus/src/OffsetPerfdataColumn.cc | 8 ++++++-- livestatus/src/OffsetPerfdataColumn.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/livestatus/src/OffsetPerfdataColumn.cc b/livestatus/src/OffsetPerfdataColumn.cc index 6578efb..b8b4eab 100644 --- a/livestatus/src/OffsetPerfdataColumn.cc +++ b/livestatus/src/OffsetPerfdataColumn.cc @@ -25,6 +25,10 @@ #include "OffsetPerfdataColumn.h" #include "PerfdataAggregator.h" -Aggregator *OffsetPerfdataColumn::createAggregator(StatsOperation operation) { - return new PerfdataAggregator(operation, this); +using std::make_unique; +using std::unique_ptr; + +unique_ptr<Aggregator> OffsetPerfdataColumn::createAggregator( + StatsOperation operation) { + return make_unique<PerfdataAggregator>(operation, this); } diff --git a/livestatus/src/OffsetPerfdataColumn.h b/livestatus/src/OffsetPerfdataColumn.h index d67060e..27b3ddf 100644 --- a/livestatus/src/OffsetPerfdataColumn.h +++ b/livestatus/src/OffsetPerfdataColumn.h @@ -26,6 +26,7 @@ #define OffsetPerfdataColumn_h #include "config.h" // IWYU pragma: keep +#include <memory> #include <string> #include "Aggregator.h" #include "OffsetStringColumn.h"

7 years, 7 months

htmllib: rerefactoring HTML class.

by Roland Halbig

Module: check_mk Branch: master Commit: b221e6b0057ae107a9746413338142ac57cc9c5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b221e6b0057ae1… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Dec 9 09:29:23 2016 +0100 htmllib: rerefactoring HTML class. --- tests/web/test_html.py | 61 +++++++++++++++++++++++---- tests/web/tools.py | 5 ++- web/htdocs/htmllib.py | 110 +++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 145 insertions(+), 31 deletions(-) diff --git a/tests/web/test_html.py b/tests/web/test_html.py index fd4276b..07c30ec 100644 --- a/tests/web/test_html.py +++ b/tests/web/test_html.py @@ -1,4 +1,5 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # call using # > py.test -s -k test_HTML_generator.py @@ -11,14 +12,27 @@ sys.path.insert(0, "%s/web/htdocs" % cmk_path()) import re # internal imports +import json +import htmllib from htmllib import HTML +try: + import simplejson as json +except ImportError: + import json +# Monkey patch in order to make the HTML class below json-serializable without changing the default json calls. +def _default(self, obj): + return getattr(obj.__class__, "to_json", _default.default)(obj) +_default.default = json.JSONEncoder().default # Save unmodified default. +json.JSONEncoder.default = _default # replacement + + def test_class_HTML(): - a = "One" + a = "Oneüლ,ᔑ•ﺪ͟͠•ᔐ.ლ" b = "two" c = "Three" d = unicode('u') @@ -28,15 +42,30 @@ def test_class_HTML(): C = HTML(c) D = HTML(d) + assert HTML(None) == HTML(u"%s" % None) assert HTML() == HTML('') + assert str(A) == a, str(A) + assert "%s" % A == a, "%s" % A + assert json.loads(json.dumps(A)) == A + assert repr(A) == 'HTML(\"%s\")' % A + assert len(B) == len(b) + assert unicode(B) == unicode(b) + + + assert (A + B) == (a + b) assert HTML().join([A, B]) == A + B assert HTML().join([a, b]) == a + b + assert HTML("jo").join([A, B]) == A + "jo" + B + assert HTML("jo").join([a, b]) == a + "jo" + b assert ''.join(map(str, [A, B])) == A + B + assert isinstance(A, HTML), type(A) - assert isinstance(A, unicode), type(A) + # assert isinstance(A, unicode), type(A) assert not isinstance(A, str), type(A) + assert isinstance(unicode(A), unicode), unicode(A) + assert isinstance(str(A), str), str(A) assert isinstance(A + B, HTML), type(A + B) assert isinstance(HTML('').join([A, B]), HTML) assert isinstance(HTML().join([A, B]), HTML) @@ -50,11 +79,17 @@ def test_class_HTML(): # "<div></br><input/></div>" A += B - assert isinstance(A, HTML), A - a += b + assert isinstance(A, HTML), A assert A == a, A + assert a in A, A + assert A.count(a) == 1 + assert A.index(a) == 0 + + assert isinstance(A[1:3], HTML) + assert A[1:3] == a[1:3], A[1:3] + assert A == a assert ("%s" % A) == a @@ -71,7 +106,7 @@ def test_class_HTML(): assert A != B assert isinstance(HTML(HTML(A)), HTML) - assert isinstance("%s" % HTML(HTML(A)), unicode) + assert isinstance("%s" % HTML(HTML(A)), str) assert isinstance(A, HTML) A += (" JO PICASSO! ") @@ -79,13 +114,21 @@ def test_class_HTML(): assert isinstance(A + "TEST" , HTML) - assert isinstance("TEST%s" % A, unicode) + assert isinstance("TEST%s" % A, str) assert "test" + C == "test" + c assert D == d assert "%s" % D == "%s" % d - assert isinstance("%s" % D, unicode) - - assert repr(D) == "HTML(%s)" % repr(d) + assert isinstance(u"%s" % D, unicode) + assert isinstance("%s" % D, str) + + E = A + B + e = "%s" % E + assert E.lstrip(E[0]) == e.lstrip(e[0]) + assert E == e + assert E.rstrip(E[0]) == e.rstrip(e[0]) + assert E == e + assert E.strip(E[0]) == e.strip(e[0]) + assert E == e diff --git a/tests/web/tools.py b/tests/web/tools.py index bd65676..7440266 100644 --- a/tests/web/tools.py +++ b/tests/web/tools.py @@ -48,7 +48,7 @@ def timeit(method): def prettify(html_text): - txt = bs(html_text, 'html5lib').prettify() + txt = bs("%s" % html_text, 'html5lib').prettify() return re.sub('\n{2,}', '\n', re.sub('>', '>\n', txt)) @@ -126,6 +126,9 @@ def compare_soup(html1, html2): def compare_html(html1, html2): + html1 = "%s" % html1 + html2 = "%s" % html2 + # compare tags opening_1 = re.findall(r'<[^<]*>', html1) opening_2 = re.findall(r'<[^<]*>', html2) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 97467d1..ff50d36 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -69,11 +69,17 @@ try: except ImportError: import json +# Monkey patch in order to make the HTML class below json-serializable without changing the default json calls. +def _default(self, obj): + return getattr(obj.__class__, "to_json", _default.default)(obj) +_default.default = json.JSONEncoder().default # Save unmodified default. +json.JSONEncoder.default = _default # replacement + + from cmk.exceptions import MKGeneralException, MKException from lib import MKUserError - # Information about uri class InvalidUserInput(Exception): def __init__(self, varname, text): @@ -145,34 +151,57 @@ class Escaper(object): # | |_| |_| |_| |_| |_|_____| | # | | # +----------------------------------------------------------------------+ -# | This is a simple class which wraps a string provided by the caller | -# | to make html.attrencode() know that this string should not be | -# | encoded, html.attrencode() will then return the unmodified value. | +# | This is a simple class which wraps a unicode string provided by | +# | the caller to make html.attrencode() know that this string should | +# | not be escaped. | # | | -# | This way we can implement encodings while still allowing HTML code | -# | processing for some special cases. This is useful when one needs | -# | to print out HTML tables in messages or help texts. | +# | This way we can implement encodings while still allowing HTML code. | +# | This is useful when one needs to print out HTML tables in messages | +# | or help texts. | # | | -# | The class now implements all relevant string comparison methods. | -# | The HTMLGenerator render_tag() function returns a HTML object. | +# | The HTML class is implemented as an immutable type. | +# | Every instance of the class is a unicode string. | +# | Only utf-8 compatible encodings are supported. | # '----------------------------------------------------------------------' -class HTML(unicode, Escaper): - def __new__(self, value = ''): +class HTML(object): + + + def __init__(self, value = u''): + super(HTML, self).__init__() + self.value = self._ensure_unicode(value) + + + def __unicode__(self): + return self.value + + + def _ensure_unicode(self, thing, encoding_index=0): try: - return unicode.__new__(self, value) - except UnicodeDecodeError as e: - return unicode.__new__(self, value.decode('utf-8')) + return unicode(thing) + except UnicodeDecodeError: + return thing.decode("utf-8") + + + def __bytebatzen__(self): + return self.value.encode("utf-8") + + + def __str__(self): + return self.__bytebatzen__() def __repr__(self): - return "HTML(%s)" % repr("%s" % self) + return ("HTML(\"%s\")" % self.value).encode("utf-8") + + + def to_json(self): + return self.value def __add__(self, other): - return HTML(unicode.__add__(self, other)) - #TODO: return HTML(unicode.__add__(self, self._escape_text(other))) + return HTML(self.value + self._ensure_unicode(other)) def __iadd__(self, other): @@ -180,13 +209,52 @@ class HTML(unicode, Escaper): def __radd__(self, other): - return HTML("%s%s" % (other, self)) - #TODO: return HTML("%s%s" % (self._escape_text(other), self)) + return HTML(self._ensure_unicode(other) + self.value) def join(self, iterable): - return HTML(''.join(iterable)) - #TODO: return HTML(''.join(map(lambda x: self._escape_text(x), iterable))) + return HTML(self.value.join(map(self._ensure_unicode, iterable))) + + + def __eq__(self, other): + return self.value == self._ensure_unicode(other) + + + def __ne__(self, other): + return self.value != self._ensure_unicode(other) + + + def __len__(self): + return len(self.value) + + + def __getitem__(self, index): + return HTML(self.value[index]) + + + def __contains__(self, item): + return self._ensure_unicode(item) in self.value + + + def count(self, item): + return self.value.count(self._ensure_unicode(item)) + + + def index(self, item): + return self.value.index(self._ensure_unicode(item)) + + + def lstrip(self, stripstr): + return HTML(self.value.lstrip(self._ensure_unicode(stripstr))) + + + def rstrip(self, stripstr): + return HTML(self.value.rstrip(self._ensure_unicode(stripstr))) + + + def strip(self, stripstr): + return HTML(self.value.strip(self._ensure_unicode(stripstr))) + __builtin__.HTML = HTML

7 years, 7 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ddff72bf29c7167c2aefa50fd47b732c5b90e242 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddff72bf29c716… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 9 15:25:05 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Column.cc | 3 +- livestatus/src/Column.h | 4 +- livestatus/src/DoubleColumn.cc | 7 ++- livestatus/src/DoubleColumn.h | 4 +- livestatus/src/IntColumn.cc | 6 ++- livestatus/src/IntColumn.h | 4 +- livestatus/src/OffsetPerfdataColumn.h | 3 +- livestatus/src/Query.cc | 93 +++++++++++------------------------ livestatus/src/Query.h | 13 ++--- livestatus/src/StatsColumn.cc | 11 +++-- livestatus/src/StatsColumn.h | 2 +- livestatus/src/TimeColumn.cc | 6 ++- livestatus/src/TimeColumn.h | 4 +- 13 files changed, 69 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ddff72bf29…

7 years, 7 months

Ruleset views: Cleaned up deprecated "only_local" handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 66c869cbb89d6b9f321b94f5acbd15e67db00a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c869cbb89d6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 8 15:46:57 2016 +0100 Ruleset views: Cleaned up deprecated "only_local" handling --- web/htdocs/wato.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5a5e4c9..f2dccaa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11918,8 +11918,6 @@ def change_host_tags_in_rules(folder, operations, mode): def mode_ruleeditor(phase): only_host = html.var("host", "") - # CLEANUP: remove only_local and its control paths - only_local = "" # html.var("local") if phase == "title": if only_host: @@ -11959,7 +11957,7 @@ def mode_ruleeditor(phase): menu = [] for groupname in groupnames: url = folder_preserving_link([("mode", "rulesets"), ("group", groupname), - ("host", only_host), ("local", only_local)]) + ("host", only_host)]) if groupname == "static": # these have moved into their own WATO module continue else: @@ -12045,7 +12043,6 @@ def mode_rulesets(phase, group=None): title, help = g_rulegroups.get(group, (group, None)) only_host = html.var("host", "") - only_local = "" # html.var("local") if phase == "title": if only_host: @@ -12094,7 +12091,7 @@ def mode_rulesets(phase, group=None): if help: html.help(help) - if only_local and not only_host: + if not only_host: all_rulesets = {} rs = load_rulesets(Folder.current()) for varname, rules in rs.items(): @@ -12149,7 +12146,7 @@ def mode_rulesets(phase, group=None): # handle only_used rules = all_rulesets.get(varname, []) num_rules = len(rules) - if num_rules == 0 and (only_used or only_local or only_ineffective): + if num_rules == 0 and (only_used or only_ineffective): continue # handle search @@ -12170,17 +12167,6 @@ def mode_rulesets(phase, group=None): # Handle case where a host is specified rulespec = g_rulespecs[varname] this_host = False - if only_host: - num_local_rules = 0 - for f, rule in rules: - value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) - if only_host and only_host in host_list: - num_local_rules += 1 - else: - num_local_rules = len([ f for (f,r) in rules if f.is_current_folder() ]) - - if only_local and num_local_rules == 0: - continue if group != 'static' and (only_used or search != None): titlename = g_rulegroups[groupname.split("/")[0]][0]

7 years, 7 months

4099 FIX msexch_rpcclientaccess: Previously nonfunctional WATO rule and default parameters now work

by Konstantin Büttner

Module: check_mk Branch: master Commit: 66bbd6ea8422a87fa75613ae9ea829c998a0de90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bbd6ea8422a8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 9 10:17:18 2016 +0100 4099 FIX msexch_rpcclientaccess: Previously nonfunctional WATO rule and default parameters now work Should you previously have configured rules, these parameters were not passed to the check. All previously configured rules will still not work, you will have to create new rules. --- .werks/4099 | 11 +++++++++++ ChangeLog | 2 ++ checks/msexch_rpcclientaccess | 8 ++------ web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.werks/4099 b/.werks/4099 new file mode 100644 index 0000000..b3026e6 --- /dev/null +++ b/.werks/4099 @@ -0,0 +1,11 @@ +Title: msexch_rpcclientaccess: Previously nonfunctional WATO rule and default parameters now work +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.4.0i3 +Date: 1481273934 + +Should you previously have configured rules, these parameters were not passed to the check. +All previously configured rules will still not work, you will have to create new rules. diff --git a/ChangeLog b/ChangeLog index 11b5b93..6c7c35e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ * 3998 FIX: agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed... NOTE: Please refer to the migration notes! * 4126 FIX: apache_status: Handle https requests lo localhost in case of certificate mismatch... + * 4099 FIX: msexch_rpcclientaccess: Previously nonfunctional WATO rule and default parameters now work... + NOTE: Please refer to the migration notes! Multisite: * 4070 Added a painter for the service check period diff --git a/checks/msexch_rpcclientaccess b/checks/msexch_rpcclientaccess index ebdcea4..4db5c84 100644 --- a/checks/msexch_rpcclientaccess +++ b/checks/msexch_rpcclientaccess @@ -28,12 +28,8 @@ # source for these defaults: # https://blogs.technet.microsoft.com/samdrey/2015/01/26/exchange-2013-perfor… factory_settings['msexch_rpcclientaccess_defaultlevels'] = { - 'latency': { - 'upper': (200.0, 250.0) - }, - 'requests': { - 'upper': (30, 40) - } + 'latency': (200.0, 250.0), + 'requests': (30, 40), } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9b259ec..71b6dcc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5581,7 +5581,7 @@ register_check_parameters( ], optional_keys=[] ), - None, + FixedValue("", title=""), match_type = 'dict' )

7 years, 7 months

3999 FIX Added core restart note to bulk host rename page

by Andreas Boesl

Module: check_mk Branch: master Commit: 36e7ffb2ba102e0faa6d7c2935a5fae0a047ebeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36e7ffb2ba102e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 9 09:52:34 2016 +0100 3999 FIX Added core restart note to bulk host rename page --- .werks/3999 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3999 b/.werks/3999 new file mode 100644 index 0000000..c76bbf7 --- /dev/null +++ b/.werks/3999 @@ -0,0 +1,9 @@ +Title: Added core restart note to bulk host rename page +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1481273485 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ad6f571..11b5b93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 4131 FIX: Fixed broken WATO site login when using password containing special characters... * 4133 FIX: Do not suppress site specific global issues during WATO activation * 4134 FIX: Unified ineffective rulesets view with other ruleset list views + * 3999 FIX: Added core restart note to bulk host rename page Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6dca3c..5a5e4c9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1511,7 +1511,7 @@ def mode_bulk_rename_host(phase): return None, warning - message = _("<b>Do you really want to rename to following hosts?</b>") + message = _("<b>Do you really want to rename to following hosts? This involves a restart of the monitoring core!</b>") message += "<table>" for folder, host_name, target_name in renamings: message += u"<tr><td>%s</td><td> → %s</td></tr>" % (host_name, target_name)

7 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016