Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 1f7eaa47eb236c1c55976f0ce9b92f3a363871c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f7eaa47eb236c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 9 17:05:01 2017 +0100 Fetched livestatus from downstream. Change-Id: Iafc07c15786e766096c2201c9602444c0cdf1251 --- livestatus/src/InputBuffer.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 23a2bde..bc31eaf 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -24,11 +24,9 @@ #include "InputBuffer.h" #include <sys/select.h> -#include <sys/time.h> #include <unistd.h> #include <cctype> #include <chrono> -#include <cstdint> #include <cstring> #include <ostream> #include <ratio>

7 years, 8 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 5cd369d977b559e3edfb146e073942b322270074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cd369d977b559… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 9 16:48:44 2017 +0100 Fetched livestatus from downstream. Change-Id: I00590047b81b76a6bd444a1c97e2dbb6d70e63a5 --- livestatus/configure.ac | 2 +- livestatus/src/InputBuffer.cc | 39 +++++++++++++++------------------------ livestatus/src/module.cc | 16 ++++++++++------ 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 56c5378..f1bec81 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -97,7 +97,7 @@ AC_FUNC_REALLOC AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT -AC_CHECK_FUNCS([gettimeofday memmove select socket strcasecmp strdup strerror strtoul]) +AC_CHECK_FUNCS([memmove select socket strcasecmp strdup strerror strtoul]) AC_ARG_WITH(nagios4,AC_HELP_STRING([--with-nagios4],[enabled compilation for nagios 4]), [ CPPFLAGS="${CFLAGS} -DNAGIOS4" diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 15b9da7..23a2bde 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -36,26 +36,21 @@ #include "Logger.h" using std::chrono::milliseconds; +using std::chrono::system_clock; using std::string; -extern int g_query_timeout_msec; -extern int g_idle_timeout_msec; +extern milliseconds g_query_timeout; +extern milliseconds g_idle_timeout; namespace { const size_t initial_buffer_size = 4096; // TODO(sp): Make this configurable? const size_t maximum_buffer_size = 500 * 1024 * 1024; -bool timeout_reached(const struct timeval *start, int timeout_ms) { - if (timeout_ms == 0) { - return false; // timeout disabled - } - - struct timeval now; - gettimeofday(&now, nullptr); - int64_t elapsed = (now.tv_sec - start->tv_sec) * 1000000; - elapsed += now.tv_usec - start->tv_usec; - return elapsed / 1000 >= timeout_ms; +bool timeout_reached(const system_clock::time_point &start, + const milliseconds &timeout) { + return (timeout != milliseconds(0)) && + (system_clock::now() - start >= timeout); } } // namespace @@ -70,11 +65,9 @@ InputBuffer::InputBuffer(int fd, const bool &termination_flag, Logger *logger) // read in data enough for one complete request (and maybe more). InputBuffer::Result InputBuffer::readRequest() { - // Remember when we started waiting for a request. This - // is needed for the idle_timeout. A connection may - // not be idle longer than that value. - struct timeval start_of_idle; // Waiting for the first line - gettimeofday(&start_of_idle, nullptr); + // Remember when we started waiting for a request. This is needed for the + // idle_timeout. A connection may not be idle longer than that value. + auto start_of_idle = system_clock::now(); // Remember if we have read some part of the query. During // a query the timeout is another (short) than between @@ -107,14 +100,14 @@ InputBuffer::Result InputBuffer::readRequest() { if (rd == Result::timeout) { if (query_started) { Informational(_logger) - << "Timeout of " << g_query_timeout_msec + << "Timeout of " << g_query_timeout.count() << " ms exceeded while reading query"; return Result::timeout; } // Check if we exceeded the maximum time between two queries - if (timeout_reached(&start_of_idle, g_idle_timeout_msec)) { + if (timeout_reached(start_of_idle, g_idle_timeout)) { Informational(_logger) - << "Idle timeout of " << g_idle_timeout_msec + << "Idle timeout of " << g_idle_timeout.count() << " ms exceeded. Going to close connection."; return Result::timeout; } @@ -209,11 +202,9 @@ InputBuffer::Result InputBuffer::readRequest() { // read at least *some* data. Return IB_TIMEOUT if that // lasts more than g_query_timeout_msec msecs. InputBuffer::Result InputBuffer::readData() { - struct timeval start; - gettimeofday(&start, nullptr); - + auto start = system_clock::now(); while (!_termination_flag) { - if (timeout_reached(&start, g_query_timeout_msec)) { + if (timeout_reached(start, g_query_timeout)) { return Result::timeout; } diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 050adbe..3830d81 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -63,6 +63,9 @@ #include "waittriggers.h" using mk::unsafe_tolower; +using std::chrono::milliseconds; +using std::chrono::minutes; +using std::chrono::seconds; using std::chrono::system_clock; using std::make_unique; using std::ostream; @@ -71,7 +74,6 @@ using std::string; using std::to_string; using std::unordered_map; using std::vector; - NEB_API_VERSION(CURRENT_NEB_API_VERSION) #ifndef NAGIOS4 extern int event_broker_options; @@ -81,9 +83,11 @@ extern unsigned long event_broker_options; extern int enable_environment_macros; extern char *log_file; -int g_idle_timeout_msec = - 300 * 1000; /* maximum idle time for connection in keep alive state */ -int g_query_timeout_msec = 10 * 1000; /* maximum time for reading a query */ +// maximum idle time for connection in keep alive state +milliseconds g_idle_timeout = minutes(5); + +// maximum time for reading a query +milliseconds g_query_timeout = seconds(10); size_t g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ @@ -860,7 +864,7 @@ void livestatus_parse_arguments(const char *args_orig) { if (c < 0) { Warning(fl_logger_nagios) << "query_timeout must be >= 0"; } else { - g_query_timeout_msec = c; + g_query_timeout = milliseconds(c); if (c == 0) { Notice(fl_logger_nagios) << "disabled query timeout!"; } else { @@ -874,7 +878,7 @@ void livestatus_parse_arguments(const char *args_orig) { if (c < 0) { Warning(fl_logger_nagios) << "idle_timeout must be >= 0"; } else { - g_idle_timeout_msec = c; + g_idle_timeout = milliseconds(c); if (c == 0) { Notice(fl_logger_nagios) << "disabled idle timeout!"; } else {

7 years, 8 months

4183 FIX ibm_imm_fan: Fixed crash if fan speed is "unavailable"

by Marcel Arentz

Module: check_mk Branch: master Commit: 456f2efa8d17a7d0d3ee8c1b964dd0fd7ea7ec14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=456f2efa8d17a7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jan 3 11:11:22 2017 +0100 4183 FIX ibm_imm_fan: Fixed crash if fan speed is "unavailable" If the value for speed is "unavailable" the behaviour is now similar to "offline": The state becomes CRIT and the status detail shows the output "is unvailable". Change-Id: Ic5f1a7531a6c4b15feb76c0ab88c94f93c743d63 --- .werks/4183 | 11 +++++++++++ ChangeLog | 1 + checks/ibm_imm_fan | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4183 b/.werks/4183 new file mode 100644 index 0000000..feb888e --- /dev/null +++ b/.werks/4183 @@ -0,0 +1,11 @@ +Title: ibm_imm_fan: Fixed crash if fan speed is "unavailable" +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1483438073 +Class: fix + +If the value for speed is "unavailable" the behaviour is now similar to +"offline": The state becomes CRIT and the status detail shows the output "is unvailable". + diff --git a/ChangeLog b/ChangeLog index 5edbf5d..1794caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 4122 FIX: ibm_svc_enclosure: added support for firmware >= 7.8... * 4182 FIX: mysql_slave: fixed crash if agent output is empty... * 4176 FIX: postfix_mailq_status: fixed wrong status handling + * 4183 FIX: ibm_imm_fan: Fixed crash if fan speed is "unavailable"... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 82f2a9a..a9bf705 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -40,8 +40,8 @@ def check_ibm_imm_fan(item, params, info): for descr, speed_text in info: if descr == item: - if speed_text.lower() == "offline": - yield 2, "is offline" + if speed_text.lower() in ["offline", "unavailable"]: + yield 2, "is %s" % speed_text.lower() return # speed_text can be "34 %", or "34%", or "34 % of maximum"

7 years, 8 months

Refactoring htmllib: improved readability in render function.

by Roland Halbig

Module: check_mk Branch: master Commit: 850a50666162623a1221338663137079302204cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=850a5066616262… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 13:20:16 2017 +0100 Refactoring htmllib: improved readability in render function. Change-Id: I6841ac36212e3aeb77d7f12f5460a86c5424ee64 --- tests/web/test_htmllib_integration.py | 2 +- web/htdocs/htmllib.py | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/web/test_htmllib_integration.py b/tests/web/test_htmllib_integration.py index b1abb4c..ef4713d 100644 --- a/tests/web/test_htmllib_integration.py +++ b/tests/web/test_htmllib_integration.py @@ -285,7 +285,7 @@ def test_check_mk(): gentest(old, new, lambda x: x.popup_trigger("CONTENT", 0, what="it", data=None, url_vars=[("lol", "true")], style="height:50px;", menu_content="test_content", cssclass="class", onclose=None)) gentest(old, new, lambda x: x.popup_trigger("CONTENT", 0, what="it", data=None, url_vars=[("lol", "true")], - style="height:50px;", menu_content="test_content", cssclass="class", onclose="close();")) + style="height:50px;", menu_content="test_content '<div> TEST </div>", cssclass="class", onclose="close();")) # headers diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d0ce0f4..cf7f980 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -480,16 +480,26 @@ class HTMLGenerator(Escaper, OutputFunnel): 'cellspacing', 'cellpadding', 'border', 'allowTransparency', 'frameborder'], key for k, v in attrs.iteritems(): + if v is None: continue + k = k.rstrip('_') if not isinstance(v, list): - yield ' %s=\"%s\"' % (k.rstrip('_'), self._escape_attribute(v)) - elif k in ["class", "class_"]: - yield ' %s=\"%s\"' % (k.rstrip('_'), ' '.join(a for a in (self._escape_attribute(vi) for vi in v) if a)) - elif k == "style" or k.startswith('on'): - yield ' %s=\"%s;\"' % (k.rstrip('_'), re.sub(';+', ';', '; '.join(a for a in (self._escape_attribute(vi) for vi in v) if a))) + v = self._escape_attribute(v) else: - yield ' %s=\"%s\"' % (k.rstrip('_'), '_'.join(a for a in (self._escape_attribute(vi) for vi in v) if a)) + if k == "class": + sep = ' ' + elif k == "style" or k.startswith('on'): + sep = '; ' + else: + sep = '_' + + v = sep.join([a for a in (self._escape_attribute(vi) for vi in v) if a]) + + if sep.startswith(';'): + v = re.sub(';+', ';', v) + + yield ' %s=\"%s\"' %(k, v) # applies attribute encoding to prevent code injections. @@ -497,13 +507,10 @@ class HTMLGenerator(Escaper, OutputFunnel): """ You have to replace attributes which are also python elements such as 'class', 'id', 'for' or 'type' using a trailing underscore (e.g. 'class_' or 'id_'). """ #self.indent_level += self.indent - if not attrs: - return HTML("%s<%s%s>" % (' ' * (self.indent_level - self.indent),\ - tag_name, ' /' if close_tag else '')) - else: - return HTML("%s<%s%s%s>" % (' ' * (self.indent_level - self.indent),\ - tag_name, ''.join(self._render_attributes(**attrs)),\ - ' /' if close_tag else '')) + indent = ' ' * (self.indent_level - self.indent) + return HTML("%s<%s%s%s>" % (indent, tag_name,\ + '' if not attrs else ''.join(self._render_attributes(**attrs)),\ + '' if not close_tag else ' /')) def _render_closing_tag(self, tag_name): @@ -519,7 +526,6 @@ class HTMLGenerator(Escaper, OutputFunnel): else: tag = tag.rstrip("\n") - if isinstance(tag_content, HTML): tag += tag_content.lstrip(' ').rstrip('\n') else:

7 years, 8 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 8ca436d7297d4a6db0212c4e47192c38a6413a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca436d7297d4a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 9 15:08:55 2017 +0100 Fetched livestatus from downstream. Change-Id: I481e31f5944da25860e73950ba69f5ac29a6c008 --- livestatus/configure.ac | 2 +- livestatus/src/HostServiceState.h | 6 ++++-- livestatus/src/TableStateHistory.cc | 16 ++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 9af8614..56c5378 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -97,7 +97,7 @@ AC_FUNC_REALLOC AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT -AC_CHECK_FUNCS([bzero gettimeofday memmove regcomp select socket strcasecmp strdup strerror strtoul]) +AC_CHECK_FUNCS([gettimeofday memmove select socket strcasecmp strdup strerror strtoul]) AC_ARG_WITH(nagios4,AC_HELP_STRING([--with-nagios4],[enabled compilation for nagios 4]), [ CPPFLAGS="${CFLAGS} -DNAGIOS4" diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index bdfd35d..94f688c 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -47,16 +47,18 @@ public: time_t _duration; double _duration_part; - // Do not change order within this block! - // These durations will be bzero'd time_t _duration_state_UNMONITORED; double _duration_part_UNMONITORED; + time_t _duration_state_OK; double _duration_part_OK; + time_t _duration_state_WARNING; double _duration_part_WARNING; + time_t _duration_state_CRITICAL; double _duration_part_CRITICAL; + time_t _duration_state_UNKNOWN; double _duration_part_UNKNOWN; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ab4694b..e7f85ad 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -939,8 +939,20 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) { hs_state->_duration_part = static_cast<double>(hs_state->_duration) / static_cast<double>(_query_timeframe); - bzero(&hs_state->_duration_state_UNMONITORED, - sizeof(time_t) * 5 + sizeof(double) * 5); + hs_state->_duration_state_UNMONITORED = 0; + hs_state->_duration_part_UNMONITORED = 0; + + hs_state->_duration_state_OK = 0; + hs_state->_duration_part_OK = 0; + + hs_state->_duration_state_WARNING = 0; + hs_state->_duration_part_WARNING = 0; + + hs_state->_duration_state_CRITICAL = 0; + hs_state->_duration_part_CRITICAL = 0; + + hs_state->_duration_state_UNKNOWN = 0; + hs_state->_duration_part_UNKNOWN = 0; switch (hs_state->_state) { case -1:

7 years, 8 months

Fixed dictionary checkbox rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 75bb72a065aa05bf245a846aebc09d60df297aed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75bb72a065aa05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 13:41:02 2017 +0100 Fixed dictionary checkbox rendering Change-Id: Ib0817a0adffa33b11593574a25f25fcb0d87d1bc --- web/htdocs/valuespec.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ede2162..e9410bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3379,10 +3379,9 @@ class Dictionary(ValueSpec): visible = html.get_checkbox(vp + "_USE") if visible == None: visible = param in value - onclick = "valuespec_toggle_option(this, %r)" % div_id - checkbox_code = '<input type=checkbox name="%s" %s onclick="%s">' % ( - vp + "_USE", visible and "CHECKED" or "", onclick) - html.add_form_var(vp + "_USE") + + checkbox_code = html.render_checkbox(vp + "_USE", deflt=visible, + onclick="valuespec_toggle_option(this, %r)" % div_id) forms.section(vs.title(), checkbox=checkbox_code) else: visible = True

7 years, 8 months

Changed behaviour of "used ruleset" page to work like before recode

by Lars Michelsen

Module: check_mk Branch: master Commit: c3414e743ad87dc7ccddf7fed87850d6ee07b477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3414e743ad87d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 13:10:44 2017 +0100 Changed behaviour of "used ruleset" page to work like before recode Change-Id: I78b83a0efd286f0eada4206ab3d5e3856e0c3fb9 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index d59cf46..a1b2309 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6313,7 +6313,7 @@ class Ruleset(object): if "ruleset_deprecated" in search_options and search_options["ruleset_deprecated"] != self.is_deprecated(): return False - if "ruleset_used" in search_options and search_options["ruleset_used"] == self.is_empty_in_folder(Folder.current()): + if "ruleset_used" in search_options and search_options["ruleset_used"] == self.is_empty(): return False if "ruleset_group" in search_options \

7 years, 8 months

Disabled (not needed) context button refactoring test

by Lars Michelsen

Module: check_mk Branch: master Commit: b2ad71249ac08101e924118344e5239b22642952 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2ad71249ac081… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:57:34 2017 +0100 Disabled (not needed) context button refactoring test Change-Id: I46ecd51ea769864ad6e6cd4c260a107f5280e067 --- tests/web/test_htmllib_integration.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/web/test_htmllib_integration.py b/tests/web/test_htmllib_integration.py index c835d88..b1abb4c 100644 --- a/tests/web/test_htmllib_integration.py +++ b/tests/web/test_htmllib_integration.py @@ -212,21 +212,22 @@ def context_button_test(obj, title, url, icon=None, hot=False, id_=None, bestof= obj.end_context_buttons() -def test_context_buttons(): - - old = HTMLOrigTester() - new = HTMLCheck_MKTester() - old.plug() - new.plug() - - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me")) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico")) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True)) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id")) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!")) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112)) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112, bestof = True)) - gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112, bestof = True, id_in_best=True)) +# TODO: refactoring tests still needed? +#def test_context_buttons(): +# +# old = HTMLOrigTester() +# new = HTMLCheck_MKTester() +# old.plug() +# new.plug() +# +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me")) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico")) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True)) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id")) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!")) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112)) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112, bestof = True)) +# gentest(old, new, lambda x: context_button_test(x, "testtitle", "www.test.me", icon="ico", hot=True, id_="id", hover_title="HoverMeBaby!", fkey=112, bestof = True, id_in_best=True))

7 years, 8 months

Cleaned up some issues found by the linter

by Lars Michelsen

Module: check_mk Branch: master Commit: b6eceeaf9ea5a35940968ac90ae08dcd86cf058a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6eceeaf9ea5a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 12:47:07 2017 +0100 Cleaned up some issues found by the linter Change-Id: Ia5785b41f31e0d12a23f3b7a936d13e895b58961 --- web/plugins/perfometer/check_mk.py | 12 ++++++------ web/plugins/views/availability.py | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index ec05414..3a2b08e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -257,14 +257,14 @@ def perfometer_temperature_multi(row, check_command, perf_data): display_color = "#60f020" for sensor, value, uom, warn, crit, min, max in perf_data: - value=saveint(value) + value = saveint(value) if value > display_value: - display_value=value + display_value = value - if display_value > saveint(warn): - display_color = "#FFC840" - if display_value > saveint(crit): - display_color = "#FF0000" + if display_value > saveint(warn): + display_color = "#FFC840" + if display_value > saveint(crit): + display_color = "#FF0000" display_string = "%s °C" % display_value return display_string, perfometer_linear(display_value, display_color) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index fce5a1e..b2c2c50 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -397,12 +397,14 @@ def render_availability_table(group_title, availability_table, what, avoptions): searchable = False, limit = None, omit_headers = "omit_headers" in avoptions["labelling"]) + show_urls, show_timeline = False, False for row in av_table["rows"]: table.row() # Column with icons timeline_url = None if row["urls"]: + show_urls = True table.cell("", css="buttons") for image, tooltip, url in row["urls"]: html.icon_button(url, tooltip, image) @@ -414,6 +416,7 @@ def render_availability_table(group_title, availability_table, what, avoptions): table.cell(title, '<a href="%s">%s</a>' % (url, name)) if "timeline" in row: + show_timeline = True table.cell(_("Timeline"), css="timeline") html.open_a(href=timeline_url) render_timeline_bar(row["timeline"], "inline") @@ -425,12 +428,12 @@ def render_availability_table(group_title, availability_table, what, avoptions): if "summary" in av_table: table.row(css="summary") - if row["urls"]: + if show_urls: table.cell("", "") # Empty cell in URLs column table.cell("", _("Summary"), css="heading") for x in range(1, len(av_table["object_titles"])): table.cell("", "") # empty cells, of more object titles than one - if "timeline" in row: + if show_timeline: table.cell("", "") for (title, help), (text, css) in zip(av_table["cell_titles"], av_table["summary"]):

7 years, 8 months

4202 FIX Availability now avoids pending states for times before new hosts or services were added

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d1bb26249e89bb660f04edabacb882a192de481 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d1bb26249e89b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 11:55:34 2017 +0100 4202 FIX Availability now avoids pending states for times before new hosts or services were added When computing the availability of a BI aggregation for a time range during which new hosts or services were added to the monitoring the state of these objects would be displayed as (PEND) before point of time they were added. But this is not correct. These objects where not pending but simply not yet existing and thus not contained in the aggregation tree at all at that time. When computing a BI state it is a big difference if something is pending or simply not existing. One pending node can make the total tree state also (PEND). While this is correct in the current monitoring it breaks the availability computation. BI availability has now been fixed so that unmonitored hosts and services are correctly being removed from the tree in the according time ranges and the real state at that time is reconstructed. That way bogus (PEND) phases of BI aggregations are being avoided. Change-Id: I6772fdcb562b67738044bc22aa3cd2a09add6873 --- .werks/4202 | 23 +++++++++++++++++++++++ ChangeLog | 3 +++ web/htdocs/availability.py | 14 ++++++++++---- web/htdocs/bi.py | 14 +++++++++----- 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/.werks/4202 b/.werks/4202 new file mode 100644 index 0000000..b9246e3 --- /dev/null +++ b/.werks/4202 @@ -0,0 +1,23 @@ +Title: Availability now avoids pending states for times before new hosts or services were added +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i4 +Date: 1483958830 +Class: fix + +When computing the availability of a BI aggregation for a time range during +which new hosts or services were added to the monitoring the state of these +objects would be displayed as (PEND) before point of time they were added. But +this is not correct. These objects where not pending but simply not yet +existing and thus not contained in the aggregation tree at all at that time. + +When computing a BI state it is a big difference if something is pending +or simply not existing. One pending node can make the total tree state also +(PEND). While this is correct in the current monitoring it breaks the +availability computation. + +BI availability has now been fixed so that unmonitored hosts and services +are correctly being removed from the tree in the according time ranges and +the real state at that time is reconstructed. That way bogus (PEND) phases +of BI aggregations are being avoided. diff --git a/ChangeLog b/ChangeLog index 24d2ca0..5edbf5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,9 @@ Notifications: * 4197 FIX: Fix sending notification to global fallback email address + BI: + * 4202 FIX: Availability now avoids pending states for times before new hosts or services were added... + Reporting & Availability: * 3652 FIX: Unbreak PDF exports... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 3094d34..67f51bc 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1681,13 +1681,16 @@ def compute_bi_tree_state(tree, status): for site_host_service, state_output in status.items(): site_host = site_host_service[:2] service = site_host_service[2] + state = state_output[0] + if state == -1: + state = None # Means: consider this object as missing if service: services_by_host.setdefault(site_host, []).append(( service, # service description - state_output[0], # state + state, 1, # has_been_checked state_output[1], # output - state_output[0], # hard state (we use the soft state here) + state, # hard state (we use the soft state here) 1, # attempt 1, # max_attempts (not relevant) state_output[2], # in_downtime @@ -1699,9 +1702,12 @@ def compute_bi_tree_state(tree, status): status_info = {} for site_host, state_output in hosts.items(): + state = state_output[0] + if state == -1: + state = None # Means: consider this object as missing status_info[site_host] = [ - state_output[0], - state_output[0], # host hard state + state, + state, # host hard state state_output[1], state_output[2], # in_downtime False, # acknowledged diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 74a987d..80fcaa0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2463,6 +2463,8 @@ def execute_rule_node(node, status_info, aggregation_options): one_assumption = False for n in node["nodes"]: result = execute_node(n, status_info, aggregation_options) # state, assumed_state, node [, subtrees] + if result[0]["state"] == None: # Omit this node (used in availability for unmonitored things) + continue subtrees.append(result) # Assume items in downtime as CRIT when computing downtime state @@ -2486,10 +2488,12 @@ def execute_rule_node(node, status_info, aggregation_options): # no assumption, take real state into assumption array assumed_states.append(node_states[-1]) - state = func(*([node_states] + funcargs)) - - # Compute downtime state - downtime_state = func(*([downtime_states] + funcargs)) + if len(node_states) == 0: + state = { "state": None, "output" : _("Not yet monitored") } + downtime_state = state + else: + state = func(*([node_states] + funcargs)) + downtime_state = func(*([downtime_states] + funcargs)) if aggregation_options["downtime_aggr_warn"]: state["in_downtime"] = downtime_state["state"] >= 1 @@ -3018,7 +3022,7 @@ def aggr_render_node(tree, title, show_host, mousecode=None, img_class=None): _("This element is currently not in its service period.")) + title h = '<span class="content state state%d%s">%s</span>\n' \ - % (effective_state["state"], addclass, render_bi_state(effective_state["state"])) + % (effective_state["state"] if effective_state["state"] != None else -1, addclass, render_bi_state(effective_state["state"])) if mousecode: if img_class: h += '<img src="images/tree_black_closed.png" class="treeangle %s"%s>' % \

7 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017