Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2772 FIX Fixed possible exception in icon column when showing some actions in the column

by Lars Michelsen

Module: check_mk Branch: master Commit: 0602863aee43e20fc004f9f69e7d2100ef35fdd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0602863aee43e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 19 10:20:34 2015 +0100 #2772 FIX Fixed possible exception in icon column when showing some actions in the column When e.g. moving the reschedule action icon from the dropdown menu to the column top level, this could result in an exception when the webserver is not being restarted after this config change. This has now been fixed to work as expected. --- .werks/2772 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/views.py | 19 ++++++++++++------- web/plugins/views/painters.py | 20 ++++++++++---------- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/.werks/2772 b/.werks/2772 new file mode 100644 index 0000000..a7a0deb --- /dev/null +++ b/.werks/2772 @@ -0,0 +1,11 @@ +Title: Fixed possible exception in icon column when showing some actions in the column +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1447924751 +Class: fix + +When e.g. moving the reschedule action icon from the dropdown menu to the column top +level, this could result in an exception when the webserver is not being restarted +after this config change. This has now been fixed to work as expected. diff --git a/ChangeLog b/ChangeLog index d58adb6..f11f73c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 2447 FIX: Fixed sorting of performancedata values with units... * 2758 FIX: Fixed processing of metrics containing varnames with quotes and/or spaces * 2762 FIX: Fixed formating of check_http when using "clickable URL" option + * 2772 FIX: Fixed possible exception in icon column when showing some actions in the column... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4533379..98c582f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -808,23 +808,28 @@ def get_needed_columns(view, painters): for entry in painters: painter = entry[0] linkview_name = entry[1] - columns += painter["columns"] + + columns += get_painter_columns(painter) + if linkview_name: linkview = views.get(linkview_name) if linkview: for filt in [ visuals.get_filter(fn) for fn in visuals.get_single_info_keys(linkview) ]: columns += filt.link_columns - # The site attribute is no column. Filter it out here - #if 'site' in columns: - # columns.remove('site') - if len(entry) > 2 and entry[2]: tt = entry[2] - columns += multisite_painters[tt]["columns"] + columns += get_painter_columns(multisite_painters[tt]) return columns +def get_painter_columns(painter): + if type(lambda: None) == type(painter["columns"]): + return painter["columns"]() + else: + return painter["columns"] + + # Display options are flags that control which elements of a # view should be displayed (buttons, sorting, etc.). They can be # specified via the URL variable display_options. The function @@ -2343,7 +2348,7 @@ def group_value(row, group_painters): else: group.append(groupvalfunc(row)) else: - for c in p[0]["columns"]: + for c in get_painter_columns(p[0]): group.append(row[c]) return tuple(group) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index ce78910..e845043 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -333,21 +333,21 @@ def iconpainter_columns(what, toplevel): return cols multisite_painters["service_icons"] = { - "title": _("Service icons"), - "short": _("Icons"), + "title" : _("Service icons"), + "short" : _("Icons"), "printable" : False, # does not contain printable text - "columns": iconpainter_columns("service", toplevel=True), - "groupby" : lambda row: "", # Do not account for in grouping - "paint": lambda row: paint_icons("service", row) + "columns" : lambda: iconpainter_columns("service", toplevel=True), + "groupby" : lambda row: "", # Do not account for in grouping + "paint" : lambda row: paint_icons("service", row) } multisite_painters["host_icons"] = { - "title": _("Host icons"), - "short": _("Icons"), + "title" : _("Host icons"), + "short" : _("Icons"), "printable" : False, # does not contain printable text - "columns": iconpainter_columns("host", toplevel=True), - "groupby" : lambda row: "", # Do not account for in grouping - "paint": lambda row: paint_icons("host", row) + "columns" : lambda: iconpainter_columns("host", toplevel=True), + "groupby" : lambda row: "", # Do not account for in grouping + "paint" : lambda row: paint_icons("host", row) } # -----------------------------------------------------------------------

8 years, 7 months

#2837 FIX hitachi_hnas_temp: fixed ascii decode error, handles degree celsius now correct

by Simon Betz

Module: check_mk Branch: master Commit: 1ab250c30dfa8e5c1135a32c7c38beba4a1407bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ab250c30dfa8e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 19 10:04:06 2015 +0100 #2837 FIX hitachi_hnas_temp: fixed ascii decode error, handles degree celsius now correct --- .werks/2837 | 10 ++++++++++ ChangeLog | 1 + checks/hitachi_hnas_temp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2837 b/.werks/2837 new file mode 100644 index 0000000..cb98dd5 --- /dev/null +++ b/.werks/2837 @@ -0,0 +1,10 @@ +Title: hitachi_hnas_temp: fixed ascii decode error, handles degree celsius now correct +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447923593 + + diff --git a/ChangeLog b/ChangeLog index d58adb6..1eefd51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 2794 FIX: The encoding parameter set in the agent sections was not working... * 2712 FIX: winperf_processor: this check no longer requires multiple check cycles before counters are initialized * 2796 FIX: apc_symetra_ext_temp: now supports temperatures measured in fahrenheit + * 2837 FIX: hitachi_hnas_temp: fixed ascii decode error, handles degree celsius now correct Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/hitachi_hnas_temp b/checks/hitachi_hnas_temp index afef4a1..201c984 100644 --- a/checks/hitachi_hnas_temp +++ b/checks/hitachi_hnas_temp @@ -49,7 +49,7 @@ def check_hitachi_hnas_temp(item, _no_params, info): return 3, "PNode %s Sensor %s reported unidentified status %s" % (clusternode, id, status) else: perfdata = [ ('temp', str(temp) + 'C') ] - return temp_status_map[status][1], "PNode %s Sensor %s reported status %s, temperature is %s °C" % (clusternode, id, temp_status_map[status][0], temp), perfdata + return temp_status_map[status][1], u"PNode %s Sensor %s reported status %s, temperature is %s °C" % (clusternode, id, temp_status_map[status][0], temp), perfdata return 3, "No sensor PNode %s Sensor %s found" % (clusternode, id) check_info["hitachi_hnas_temp"] = {

8 years, 7 months

#1303 multipath, solaris_multipath: Level for needed paths can now be specified in percent

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7585c365177e56c88c080281c98b02d0b719f680 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7585c365177e56… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 18 16:27:33 2015 +0100 #1303 multipath, solaris_multipath: Level for needed paths can now be specified in percent --- .werks/1303 | 9 +++++++++ ChangeLog | 1 + checks/multipath | 14 ++++++++------ checks/solaris_multipath | 5 ++++- web/plugins/wato/check_parameters.py | 11 +++++++++-- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.werks/1303 b/.werks/1303 new file mode 100644 index 0000000..4645de3 --- /dev/null +++ b/.werks/1303 @@ -0,0 +1,9 @@ +Title: multipath, solaris_multipath: Level for needed paths can now be specified in percent +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447860323 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cbb1cf3..b84c16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 2710 arbor_peakflow_sp, arbor_peakflow_sp.cpu_load, arbor_peakflow_sp.disk_usage, arbor_peakflow_sp.flows, arbor_peakflow_tms, arbor_peakflow_tms.cpu_load, arbor_peakflow_tms.disk_usage, arbor_peakflow_tms.host_fault, arbor_peakflow_tms.updates, arbor_pravail, arbor_pravail.cpu_load, arbor_pravail.disk_usage, arbor_pravail.host_fault: new checks for various arbor devices * 2711 janitza_umg: added support for umg508... * 2792 check_mk_agent.aix: now able to use wildcards in the fileinfo.cfg + * 1303 multipath, solaris_multipath: Level for needed paths can now be specified in percent * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/multipath b/checks/multipath index d39a3d4..4d509eb 100644 --- a/checks/multipath +++ b/checks/multipath @@ -281,9 +281,6 @@ def inventory_multipath(parsed): # item is UUID (e.g. '360a9800043346937686f456f59386741') or alias (e.g. 'mpath0') def check_multipath(item, target_numpaths, parsed): - if target_numpaths == None: - target_numpaths = 2 # default case: we need two paths - # Keys in parsed are the UUIDs. First assume that we are # looking for a UUID. Then fall back to aliases if item in parsed: @@ -313,14 +310,19 @@ def check_multipath(item, target_numpaths, parsed): if numbroken > 0: return (2, "%sbroken paths: %s" % (aliasinfo, ",".join(broken))) + if target_numpaths == None: + target_numpaths = 2 # default case: we need two paths + elif type(target_numpaths) == float: + target_numpaths = (target_numpaths / 100) * numpaths + info = "%spaths expected: %d, paths active: %d" % (aliasinfo, target_numpaths, numpaths) if numpaths < target_numpaths: - return (2, info) + return 2, info elif numpaths > target_numpaths: - return (1, info) + return 1, info else: - return (0, info) + return 0, info check_info["multipath"] = { 'check_function': check_multipath, diff --git a/checks/solaris_multipath b/checks/solaris_multipath index 55d8afb..424cf47 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -52,7 +52,10 @@ def check_solaris_multipath(item, params, info): state = 1 infotext += ", expected paths unknown, please redo service discovery" else: - expected = int(params) # should be int, just for legacy reasons + if type(params) == float: + expected = (params / 100) * total + else: + expected = int(params) # should be int, just for legacy reasons if operational > expected: state = 1 elif expected == operational: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 93a4384..4a124b8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6458,10 +6458,17 @@ register_check_parameters( subgroup_storage, "multipath", _("Linux and Solaris Multipath Count"), - Integer( + Alternative( help = _("This rules sets the expected number of active paths for a multipath LUN " "on Linux and Solaris hosts"), - title = _("Expected number of active paths")), + title = _("Expected number of active paths"), + elements = [ + Integer( + title = _("Expected number of active paths")), + Percentage( + title = _("Expected percentage of active paths")), + ] + ), TextAscii( title = _("Name of the MP LUN"), help = _("For Linux multipathing this is either the UUID (e.g. "

8 years, 7 months

Reworked waittriggers.

by Sven Panne

Module: check_mk Branch: master Commit: 286295204c79cf1cd877bf3d48a3931132ed1d6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=286295204c79cf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 18 11:37:08 2015 +0100 Reworked waittriggers. * Don't fiddle around with pthread directly, use condition_variable and friends. * Made the interface type-safe. * Renamed things to a more consistent schema. * Added a non-standard method to condition_variable, we don't have std::chrono. * Tiny cleanup. Nevertheless, things are still a bit dubious: The mutex used for waiting (see Query.cc) is *not* used for notifications (see module.c). This looks like a bug... --- livestatus/src/ConditionVariable.h | 12 +++- livestatus/src/Makefile.am | 2 +- livestatus/src/Mutex.h | 20 +++--- livestatus/src/Query.cc | 41 ++++------- livestatus/src/Query.h | 2 +- livestatus/src/module.c | 21 ++---- livestatus/src/waittriggers.c | 55 --------------- livestatus/src/waittriggers.cc | 132 ++++++++++++++++++++++++++++++++++++ livestatus/src/waittriggers.h | 47 +++++++------ 9 files changed, 201 insertions(+), 131 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=286295204c…

8 years, 7 months

#2796 FIX apc_symetra_ext_temp: now supports temperatures measured in fahrenheit

by Andreas Boesl

Module: check_mk Branch: master Commit: 1658b7ab1d1c74666dfb431e61bcc33f375d74f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1658b7ab1d1c74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 18 14:50:00 2015 +0100 #2796 FIX apc_symetra_ext_temp: now supports temperatures measured in fahrenheit --- .werks/2796 | 9 +++++++++ ChangeLog | 1 + checks/apc_symmetra_ext_temp | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/2796 b/.werks/2796 new file mode 100644 index 0000000..8b795d4 --- /dev/null +++ b/.werks/2796 @@ -0,0 +1,9 @@ +Title: apc_symetra_ext_temp: now supports temperatures measured in fahrenheit +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447854523 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4b1a1f6..a9da207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * 2790 FIX: check_dns: now able to configure milliseconds as expected response time... * 2794 FIX: The encoding parameter set in the agent sections was not working... * 2712 FIX: winperf_processor: this check no longer requires multiple check cycles before counters are initialized + * 2796 FIX: apc_symetra_ext_temp: now supports temperatures measured in fahrenheit Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp index d27adf5..3e07c0b 100644 --- a/checks/apc_symmetra_ext_temp +++ b/checks/apc_symmetra_ext_temp @@ -31,9 +31,10 @@ def inventory_apc_symmetra_ext_temp(info): for line in info if line[1] == "2" ] def check_apc_symmetra_ext_temp(item, params, info): - for index, status, temp in info: + for index, status, temp, temp_unit in info: if item == index: - return check_temperature(int(temp), params) + unit = temp_unit == "2" and "f" or "c" + return check_temperature(int(temp), params, dev_unit = unit) return 3, "Sensor not found in SNMP data" @@ -42,7 +43,7 @@ check_info["apc_symmetra_ext_temp"] = { 'inventory_function': inventory_apc_symmetra_ext_temp, 'service_description': 'Temperature External %s', 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.318.1.1.10.2.3.2.1', [1, 3, 4]), + 'snmp_info': ('.1.3.6.1.4.1.318.1.1.10.2.3.2.1', [1, 3, 4, 5]), 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), 'group': 'room_temperature', 'includes': [ 'temperature.include' ],

8 years, 7 months

Added condition_variable. Polished mutex stuff a bit. More error checking.

by Sven Panne

Module: check_mk Branch: master Commit: 941f54bc6f53c5c3b62ee99e5f214a028d533b76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=941f54bc6f53c5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 18 10:19:08 2015 +0100 Added condition_variable. Polished mutex stuff a bit. More error checking. --- livestatus/src/ConditionVariable.h | 90 ++++++++++++++++++++++++++++++++++++ livestatus/src/Mutex.h | 50 +++++++++----------- 2 files changed, 113 insertions(+), 27 deletions(-) diff --git a/livestatus/src/ConditionVariable.h b/livestatus/src/ConditionVariable.h new file mode 100644 index 0000000..ef4f9f1 --- /dev/null +++ b/livestatus/src/ConditionVariable.h @@ -0,0 +1,90 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef ConditionVariable_h +#define ConditionVariable_h + +#include "config.h" // IWYU pragma: keep +#include <pthread.h> +#include <Mutex.h> + +// A more or less drop-in replacement for C++11's <condition_variable> (partial) + +namespace mk { + +enum /* class */ cv_status { no_timeout, timeout }; + +class condition_variable { +public: + typedef pthread_cond_t *native_handle_type; + + condition_variable() { check_status(pthread_cond_init(&_cond, 0)); } + ~condition_variable() { check_status(pthread_cond_destroy(&_cond)); } + void notify_one() { check_status(pthread_cond_signal(&_cond)); } + void notify_all() { check_status(pthread_cond_broadcast(&_cond)); } + void wait(unique_lock<mutex> &ul) + { + if (!ul) throw_system_error(EPERM); + check_status(pthread_cond_wait(&_cond, ul.mutex()->native_handle())); + } + + template <typename Predicate> + void wait(unique_lock<mutex> &ul, Predicate p) + { + while (!p()) wait(ul); + } + + // template<typename Rep, typename Period> + // cv_status wait_for(unique_lock<mutex>& ul, + // const chrono::duration<Rep, Period>& rtime); + + // template<typename Rep, typename Period, typename Predicate> + // bool wait_for(unique_lock<mutex>& ul, + // const chrono::duration<Rep, Period>& rtime, + // Predicate p); + + // template<typename Clock, typename Duration> + // cv_status wait_until(unique_lock<mutex>& lock, + // const chrono::time_point<Clock, Duration>& atime); + + // template<typename Clock, typename Duration, typename Predicate> + // bool wait_until(unique_lock<mutex>& ul, + // const chrono::time_point<Clock, Duration>& atime, + // Predicate p); + + native_handle_type native_handle() { return &_cond; } +private: + condition_variable(const condition_variable &); // = delete + condition_variable &operator=(const condition_variable &); // = delete + + pthread_cond_t _cond; +}; + +// void notify_all_at_thread_exit(condition_variable& cond, +// unique_lock<mutex> ul); + + +} // namespace mk + +#endif // ConditionVariable_h diff --git a/livestatus/src/Mutex.h b/livestatus/src/Mutex.h index 5085dd8..77c9632 100644 --- a/livestatus/src/Mutex.h +++ b/livestatus/src/Mutex.h @@ -44,29 +44,30 @@ inline void throw_system_error(int err) } +inline void check_status(int status) +{ + if (status != 0) throw_system_error(status); +} + + class mutex { public: typedef pthread_mutex_t *native_handle_type; - mutex() { pthread_mutex_init(native_handle(), 0); } - ~mutex() { check(pthread_mutex_destroy(native_handle())); } - void lock() { check(pthread_mutex_lock(native_handle())); } + mutex() { check_status(pthread_mutex_init(native_handle(), 0)); } + ~mutex() { check_status(pthread_mutex_destroy(native_handle())); } + void lock() { check_status(pthread_mutex_lock(native_handle())); } bool try_lock() { int status = pthread_mutex_trylock(native_handle()); - if (status != EBUSY) check(status); + if (status != EBUSY) check_status(status); return status == 0; } - void unlock() { check(pthread_mutex_unlock(native_handle())); } + void unlock() { check_status(pthread_mutex_unlock(native_handle())); } native_handle_type native_handle() { return &_mutex; } private: mutex(const mutex &); // = delete mutex &operator=(const mutex &); // = delete - static void check(int status) - { - if (status != 0) throw_system_error(status); - } - pthread_mutex_t _mutex; }; @@ -77,30 +78,25 @@ public: recursive_mutex() { pthread_mutexattr_t attr; - pthread_mutexattr_init(&attr); - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(native_handle(), &attr); - pthread_mutexattr_destroy(&attr); + check_status(pthread_mutexattr_init(&attr)); + check_status(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)); + check_status(pthread_mutex_init(native_handle(), &attr)); + check_status(pthread_mutexattr_destroy(&attr)); } - ~recursive_mutex() { check(pthread_mutex_destroy(native_handle())); } - void lock() { check(pthread_mutex_lock(native_handle())); } + ~recursive_mutex() { check_status(pthread_mutex_destroy(native_handle())); } + void lock() { check_status(pthread_mutex_lock(native_handle())); } bool try_lock() { int status = pthread_mutex_trylock(native_handle()); - if (status != EBUSY) check(status); + if (status != EBUSY) check_status(status); return status == 0; } - void unlock() { check(pthread_mutex_unlock(native_handle())); } + void unlock() { check_status(pthread_mutex_unlock(native_handle())); } native_handle_type native_handle() { return &_mutex; } private: recursive_mutex(const recursive_mutex &); // = delete; recursive_mutex &operator=(const recursive_mutex &); // = delete; - static void check(int status) - { - if (status != 0) throw_system_error(status); - } - pthread_mutex_t _mutex; }; @@ -162,12 +158,12 @@ public: } // template<typename Clock, typename Duration> - // unique_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& - // atime) + // unique_lock(mutex_type& m, + // const chrono::time_point<Clock, Duration>& atime); // template<typename Rep, typename Period> - // unique_lock(mutex_type& m, const chrono::duration<_Rep, _Period>& - // __rtime) + // unique_lock(mutex_type& m, + // const chrono::duration<Rep, Period>& rtime); ~unique_lock() {

8 years, 7 months

ClientQueue uses condition_variable now, fixing a bug with spurious wakeups.

by Sven Panne

Module: check_mk Branch: master Commit: ff3d5b68a202b49f6558081ad0c78f81af4f5ca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff3d5b68a202b4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 18 11:07:07 2015 +0100 ClientQueue uses condition_variable now, fixing a bug with spurious wakeups. Made all fields private on the way. --- livestatus/src/ClientQueue.cc | 33 ++++++++++++--------------------- livestatus/src/ClientQueue.h | 12 ++++++------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/livestatus/src/ClientQueue.cc b/livestatus/src/ClientQueue.cc index 7e44ec2..ab81bac 100644 --- a/livestatus/src/ClientQueue.cc +++ b/livestatus/src/ClientQueue.cc @@ -24,52 +24,43 @@ #include "ClientQueue.h" #include <unistd.h> +#include <algorithm> using mk::lock_guard; using mk::mutex; +using mk::unique_lock; +using std::for_each; ClientQueue::ClientQueue() { - pthread_cond_init(&_signal, 0); } ClientQueue::~ClientQueue() { - for (_queue_t::iterator it = _queue.begin(); - it != _queue.end(); - ++it) - { - close(*it); - } - pthread_cond_destroy(&_signal); + for_each(_queue.begin(), _queue.end(), close); } void ClientQueue::addConnection(int fd) { { - lock_guard<mutex> lg(_lock); + lock_guard<mutex> lg(_mutex); _queue.push_back(fd); } - pthread_cond_signal(&_signal); + _cond.notify_one(); } int ClientQueue::popConnection() { - lock_guard<mutex> lg(_lock); - if (_queue.size() == 0) { - pthread_cond_wait(&_signal, _lock.native_handle()); - } - - int fd = -1; - if (_queue.size() > 0) { - fd = _queue.front(); - _queue.pop_front(); - } + unique_lock<mutex> ul(_mutex); + while (_queue.empty()) _cond.wait(ul); + int fd = _queue.front(); + _queue.pop_front(); return fd; } +// Note: What we *really* want here is the functionality of notify_all_at_thread_exit. void ClientQueue::wakeupAll() { - pthread_cond_broadcast(&_signal); + _cond.notify_all(); } diff --git a/livestatus/src/ClientQueue.h b/livestatus/src/ClientQueue.h index 0a9bea0..b8a0584 100644 --- a/livestatus/src/ClientQueue.h +++ b/livestatus/src/ClientQueue.h @@ -26,24 +26,24 @@ #define ClientQueue_h #include "config.h" // IWYU pragma: keep -#include <pthread.h> #include <deque> #include <memory> +#include "ConditionVariable.h" #include "Mutex.h" class ClientQueue { - typedef std::deque<int> _queue_t; - _queue_t _queue; public: ClientQueue(); ~ClientQueue(); void addConnection(int); int popConnection(); void wakeupAll(); - - mk::mutex _lock; - pthread_cond_t _signal; +private: + typedef std::deque<int> _queue_t; + _queue_t _queue; + mk::mutex _mutex; + mk::condition_variable _cond; }; #endif // ClientQueue_h

8 years, 7 months

#2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bf7baf5c6d9932db72f45c213bf91db46e5db50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bf7baf5c6d993… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 18 10:57:06 2015 +0100 #2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore This has been implemented for the CMC configuration generating mechanism some time ago. See werk #8294 for details. This has also been implemented for installations which use Nagios as monitoring core. --- .werks/2771 | 11 ++ ChangeLog | 1 + modules/automation.py | 15 +-- modules/check_mk.py | 350 ++++++++++++++++++++++++++++--------------------- modules/nagios.py | 42 ++---- 5 files changed, 231 insertions(+), 188 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3bf7baf5c6…

8 years, 7 months

ibm_imm_temp: fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2132177e8aff83300eaf3f94628cb6d8df598ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2132177e8aff83… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 18 10:22:39 2015 +0100 ibm_imm_temp: fixed typo --- checks/ibm_imm_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ibm_imm_temp b/checks/ibm_imm_temp index c09d7c2..32efd1c 100644 --- a/checks/ibm_imm_temp +++ b/checks/ibm_imm_temp @@ -42,7 +42,7 @@ check_info["ibm_imm_temp"] = { 'inventory_function' : inventory_ibm_imm_temp, 'service_description' : 'Temperature %s', 'includes' : [ 'temperature.include' ], - 'has_perdata' : True, + 'has_perfdata' : True, 'group' : 'temperature', 'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \

8 years, 7 months

#2770 FIX Check_MK is now warning the user about deprecated but configured checkgroup parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: 989bef70ecdcf45f1e82f3daddf6f20ceedde023 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=989bef70ecdcf4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 18 10:09:30 2015 +0100 #2770 FIX Check_MK is now warning the user about deprecated but configured checkgroup parameters These messages help during migration from 1.2.6 to 1.2.8 when the check groups of checks have been changed. The message is a hint for the user to check the deprecated rulesets and migrate the rules to the new ones. --- .werks/2770 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 34 ++++++++++++++++++++++++++++------ modules/nagios.py | 2 ++ 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.werks/2770 b/.werks/2770 new file mode 100644 index 0000000..56cb12b --- /dev/null +++ b/.werks/2770 @@ -0,0 +1,11 @@ +Title: Check_MK is now warning the user about deprecated but configured checkgroup parameters +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1447836914 +Class: fix + +These messages help during migration from 1.2.6 to 1.2.8 when the check groups of checks +have been changed. The message is a hint for the user to check the deprecated rulesets +and migrate the rules to the new ones. diff --git a/ChangeLog b/ChangeLog index 87617b0..cbb1cf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 2756 FIX: SNMP: Generalized error handling of emtpy info for SNMP checks... * 2759 FIX: Allowing Emails to contain special characters like umlauts... * 2764 FIX: Fixed broken SNMP checks in case SNMP check interval is configured for clusters... + * 2770 FIX: Check_MK is now warning the user about deprecated but configured checkgroup parameters... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index 9d3639b..da7231e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -380,20 +380,25 @@ def load_checks(): # Now convert check_info to new format. convert_check_info() - verify_checkgroups() + verify_checkgroup_members() -# This function validates the checks which are members of checkgroups to have either -# all or none an item. Mixed checkgroups lead to strange exceptions when processing -# the check parameters. So it is much better to catch these errors in a central place -# with a clear error message. -def verify_checkgroups(): +def checks_by_checkgroup(): groups = {} for check_type, check in check_info.items(): group_name = check["group"] if group_name: groups.setdefault(group_name, []) groups[group_name].append((check_type, check)) + return groups + + +# This function validates the checks which are members of checkgroups to have either +# all or none an item. Mixed checkgroups lead to strange exceptions when processing +# the check parameters. So it is much better to catch these errors in a central place +# with a clear error message. +def verify_checkgroup_members(): + groups = checks_by_checkgroup() for group_name, checks in groups.items(): with_item, without_item = [], [] @@ -4840,6 +4845,7 @@ def compute_check_parameters(host, checktype, item, params): params = entry return params + def get_checkgroup_parameters(host, checktype, item): checkgroup = check_info[checktype]["group"] if not checkgroup: @@ -4854,6 +4860,22 @@ def get_checkgroup_parameters(host, checktype, item): return service_extra_conf(host, item, rules) +# Verify that the user has no deprecated check groups configured. +def verify_non_deprecated_checkgroups(): + groups = checks_by_checkgroup() + + for checkgroup, rules in checkgroup_parameters.items(): + if checkgroup not in groups: + raise MKGeneralException( + "Found configured rules of deprecated check group \"%s\". These rules are not used " + "by any check. Maybe this check group has been renamed during an update, " + "in this case you will have to migrate your configuration to the new ruleset manually. " + "Please check out the release notes of the involved versions. " + "You may use the page \"Deprecated rules\" in WATO to view your rules and move them to " + "the new rulesets." % checkgroup) + + + def output_profile(): if g_profile: g_profile.dump_stats(g_profile_path) diff --git a/modules/nagios.py b/modules/nagios.py index fa45388..a032a64 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -79,6 +79,8 @@ def create_nagios_config(outfile = sys.stdout, hostnames = None): if summary_service_notification_periods != []: raise MKGeneralException("summary_service_notification_periods is not longer supported. Please use extra_summary_service_conf['notification_period'] instead.") + verify_non_deprecated_checkgroups() + # Map service_period to _SERVICE_PERIOD. This field das not exist in Nagios/Icinga. # The CMC has this field natively. if "service_period" in extra_host_conf:

8 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015