Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

Nuke SharedMutex.h, we don't need it anymore.

by Sven Panne

Module: check_mk Branch: master Commit: db81d32641a52aee61e134304173486e1b8de5cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db81d32641a52a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 7 11:31:52 2016 +0100 Nuke SharedMutex.h, we don't need it anymore. --- livestatus/src/mk/SharedMutex.h | 178 --------------------------------------- 1 file changed, 178 deletions(-) diff --git a/livestatus/src/mk/SharedMutex.h b/livestatus/src/mk/SharedMutex.h deleted file mode 100644 index ca16e35..0000000 --- a/livestatus/src/mk/SharedMutex.h +++ /dev/null @@ -1,178 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | 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 mk_SharedMutex_h -#define mk_SharedMutex_h - -#include "config.h" // IWYU pragma: keep -#include <pthread.h> -#include <string.h> -#include <mutex> -#include <system_error> - -// A more or less drop-in replacement for C++14's <shared_mutex> (partial) - -namespace mk { - -inline void throw_system_error(int err) { - throw std::system_error(std::error_code(err, std::generic_category())); -} - -inline void check_status(int status) { - if (status != 0) throw_system_error(status); -} - -// Note: This is not in the standard, but close enough to shared_mutex for our -// purposes. -class rw_mutex { -public: - typedef pthread_rwlock_t *native_handle_type; - rw_mutex() { check_status(pthread_rwlock_init(&_mutex, 0)); } - ~rw_mutex() { check_status(pthread_rwlock_destroy(&_mutex)); } - void lock() { check_status(pthread_rwlock_wrlock(&_mutex)); } - bool try_lock() { - int status = pthread_rwlock_trywrlock(&_mutex); - if (status != EBUSY) check_status(status); - return status == 0; - } - void unlock() { check_status(pthread_rwlock_unlock(&_mutex)); } - void lock_shared() { check_status(pthread_rwlock_rdlock(&_mutex)); } - bool try_lock_shared() { - int status = pthread_rwlock_tryrdlock(&_mutex); - if (status != EBUSY) check_status(status); - return status == 0; - } - void unlock_shared() { check_status(pthread_rwlock_unlock(&_mutex)); } - native_handle_type native_handle() { return &_mutex; } - -private: - rw_mutex(const rw_mutex &); // = delete - rw_mutex &operator=(const rw_mutex &); // = delete - - pthread_rwlock_t _mutex; -}; - -template <typename Mutex> -class shared_lock { -public: - typedef Mutex mutex_type; - - shared_lock() : _mutex(0), _owns_lock(false) {} - explicit shared_lock(mutex_type &m) - : _mutex(addressOf(m)), _owns_lock(false) { - lock(); - _owns_lock = true; - } - - shared_lock(mutex_type &m, std::defer_lock_t) - : _mutex(addressOf(m)), _owns_lock(false) {} - - shared_lock(mutex_type &m, std::try_to_lock_t) - : _mutex(addressOf(m)), _owns_lock(_mutex->try_lock_shared()) {} - - shared_lock(mutex_type &m, std::adopt_lock_t) - : _mutex(addressOf(m)), _owns_lock(true) {} - - // template<typename Clock, typename Duration> - // shared_lock(mutex_type& m, - // const chrono::time_point<Clock, Duration>& atime); - - // template<typename Rep, typename Period> - // shared_lock(mutex_type& m, - // const chrono::duration<Rep, Period>& rtime); - - ~shared_lock() { - if (_owns_lock) unlock(); - } - - // shared_lock(shared_lock&& other) - // shared_lock& operator=(shared_lock&& other) - - void lock() { - if (!_mutex) throw_system_error(EPERM); - if (_owns_lock) throw_system_error(EDEADLK); - _mutex->lock_shared(); - _owns_lock = true; - } - - bool try_lock() { - if (!_mutex) throw_system_error(EPERM); - if (_owns_lock) throw_system_error(EDEADLK); - _owns_lock = _mutex->try_lock_shared(); - return _owns_lock; - } - - // template<typename Clock, typename Duration> - // bool try_lock_until(const chrono::time_point<Clock, Duration>& atime) - - // template<typename Rep, typename Period> - // bool try_lock_for(const chrono::duration<Rep, Period>& rtime) - - void unlock() { - if (!_owns_lock) throw_system_error(EPERM); - if (_mutex) { - _mutex->unlock_shared(); - _owns_lock = false; - } - } - - void swap(shared_lock &other) { - std::swap(_mutex, other._mutex); - std::swap(_owns_lock, other._owns_lock); - } - - mutex_type *release() { - mutex_type *ret = _mutex; - _mutex = 0; - _owns_lock = false; - return ret; - } - - bool owns_lock() const { return _owns_lock; } - operator bool() const { return owns_lock(); } // explicit - mutex_type *mutex() const { return _mutex; } - -private: - shared_lock(const shared_lock &); // = delete; - shared_lock &operator=(const shared_lock &); // = delete; - - mutex_type *_mutex; - bool _owns_lock; - - // basically std::addressof from C++11's <memory> - template <typename T> - inline T *addressOf(T &x) { - return reinterpret_cast<T *>( - &const_cast<char &>(reinterpret_cast<const volatile char &>(x))); - } -}; - -template <typename Mutex> -void swap(shared_lock<Mutex> &x, shared_lock<Mutex> &y) { - x.swap(y); -} - -} // namespace mk - -#endif // mk_SharedMutex_h

8 years, 6 months

3258: dell_idrac_disks: fixed disk and component status handling

by Simon Betz

Module: check_mk Branch: master Commit: 9f1c963d2c9741c18d137af370f776402ebac838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f1c963d2c9741… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 7 11:22:40 2016 +0100 3258: dell_idrac_disks: fixed disk and component status handling --- .werks/3258 | 10 ++++ ChangeLog | 1 + checks/dell_idrac_disks | 140 ++++++++++++++++++++++------------------------- 3 files changed, 75 insertions(+), 76 deletions(-) diff --git a/.werks/3258 b/.werks/3258 new file mode 100644 index 0000000..c09fdba --- /dev/null +++ b/.werks/3258 @@ -0,0 +1,10 @@ +Title: dell_idrac_disks: fixed disk and component status handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457345843 + + diff --git a/ChangeLog b/ChangeLog index f468ae3..3df0ae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 3254 FIX: haproxy: fixed wrong type handling * 3255 FIX: apc_inrow_temp: fixed wrong discovery handling of available sensors * 3256 FIX: blade_bx_powerfan: fixed wrong levels handling and minor cleanup + * 3258 FIX: dell_idrac_disks: fixed disk and component status handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/dell_idrac_disks b/checks/dell_idrac_disks index 25cf09b..27879f1 100644 --- a/checks/dell_idrac_disks +++ b/checks/dell_idrac_disks @@ -24,86 +24,75 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.2.1 Physical Disk 0:1:0 --> IDRAC-MIB::physicalDiskName.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.2.2 Physical Disk 0:1:1 --> IDRAC-MIB::physicalDiskName.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.4.1 8 --> IDRAC-MIB::physicalDiskState.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.4.2 8 --> IDRAC-MIB::physicalDiskState.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.11.1 1144064 --> IDRAC-MIB::physicalDiskCapacityInMB.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.11.2 1144064 --> IDRAC-MIB::physicalDiskCapacityInMB.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.22.1 1 --> IDRAC-MIB::physicalDiskSpareState.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.22.2 1 --> IDRAC-MIB::physicalDiskSpareState.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.24.1 3 --> IDRAC-MIB::physicalDiskComponentStatus.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.24.2 3 --> IDRAC-MIB::physicalDiskComponentStatus.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.31.1 0 --> IDRAC-MIB::physicalDiskSmartAlertIndication.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.31.2 0 --> IDRAC-MIB::physicalDiskSmartAlertIndication.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.1 Disk 0 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.1 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.2 Disk 1 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.2 + + def inventory_dell_idrac_disks(info): inventory = [] for line in info: inventory.append(( line[0], None )) return inventory + def check_dell_idrac_disks(item, _no_params, info): - diskStates = { - 1 : "unknown", - 2 : "ready", - 3 : "online", - 4 : "foreign", - 5 : "offline", - 6 : "blocked", - 7 : "failed", - 8 : "non-raid", - 9 : "removed", + map_states = { + "disk_states" : { + "1" : (1, "unknown"), + "2" : (0, "ready"), + "3" : (0, "online"), + "4" : (1, "foreign"), + "5" : (2, "offline"), + "6" : (2, "blocked"), + "7" : (2, "failed"), + "8" : (0, "non-raid"), + "9" : (0, "removed"), + }, + "component_states" : { + "1" : (0, "other"), + "2" : (1, "unknown"), + "3" : (0, "OK"), + "4" : (0, "non-critical"), + "5" : (2, "critical"), + "6" : (1, "non-recoverable"), + }, } - - componentStates = { - 1 : "Other", - 2 : "Unknown", - 3 : "OK", - 4 : "Non-critical", - 5 : "Critical", - 6 : "Non-recoverable" + map_spare_state_info = { + "1" : "not a spare", + "2" : "dedicated hotspare", + "3" : "global hotspare", } + for disk_name, disk_state, capacity_MB, spare_state, \ + component_state, smart_alert, display_name in info: + if disk_name == item: + yield 0, "[%s] Size: %s" % \ + (display_name, get_bytes_human_readable(int(capacity_MB) * 1024 * 1024)) - sparestates = { - 1 : "not a Spare", - 2 : "dedicated Hotspare", - 3 : "global Hotspare", - } - for diskname, diskState, capacityMB, spareState, componentState, smartAlert, displayName in info: - if diskname == item: - state = 0 - infotexts = [] + for what, what_key, what_text in [ + (disk_state, "disk_states", "Disk state"), + (component_state, "component_states", "Component state")]: + state, state_readable = map_states[what_key][what] + yield state, "%s: %s" % (what_text, state_readable) - # Component State - componentState = int(componentState) - infotext = "State: " + componentStates[componentState] - if componentState in [ 5, 6 ]: - state = 2 - infotexts.append(infotext+"(!!)") - elif componentState in [ 1, 2, 4 ]: - state = max(state, 1) - infotexts.append(infotext+"(!)") + if smart_alert != "0": + yield 2, "Smart alert on disk" - # Smart Alert - if smartAlert != '0': - infotexts.append("Smart Alert on Disk(!!)") + if spare_state != "1": + yield 0, map_spare_state_info[spare_state] - # Disk State - diskState = int(diskState) - infotext = "Disk State: " + diskStates[diskState] - label = "" - show = False - if diskState in [ 1, 5, 6, 7, 9 ]: - state = 2 - label = "(!!)" - show = True - elif diskState in [ 4, 8 ]: - state = max(state, 1) - label = "(!)" - show = True - if show: - infotexts.append(infotext+label) - - spareState = int(spareState) - if spareState != 1: - infotexts.append('Spare State: ' + sparestates[spareState] ) - - # Capacity - infotexts.append("Size: " + get_bytes_human_readable(int(capacityMB) * 1024 * 1024 )) - - # Display Name - infotexts.append(displayName) - - return state, ", ".join(infotexts) - return 3, "Disk not found in SNMP Output" check_info["dell_idrac_disks"] = { "check_function" : check_dell_idrac_disks, @@ -111,13 +100,12 @@ check_info["dell_idrac_disks"] = { "service_description" : "Disk %s", "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", "snmp_info" : (".1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1", [ - 2, # physicalDiskName - 4, # physicalDiskState - 11, # physicalDiskCapacityInMB - 22, # physicalDiskSpareState - 24, # physicalDiskComponentStatus - 31, # physicalDiskSmartAlertIndication - 55, # physicalDiskDisplayName - ]), + "2", # physicalDiskName + "4", # physicalDiskState + "11", # physicalDiskCapacityInMB + "22", # physicalDiskSpareState + "24", # physicalDiskComponentStatus + "31", # physicalDiskSmartAlertIndication + "55", # physicalDiskDisplayName + ]), } -

8 years, 6 months

Tweak SharedMutex for C++14, will probably die soon anyway.

by Sven Panne

Module: check_mk Branch: master Commit: b02e20067bce96cde593db23a451d236cd5dd092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b02e20067bce96… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 7 10:56:47 2016 +0100 Tweak SharedMutex for C++14, will probably die soon anyway. --- livestatus/src/mk/SharedMutex.h | 86 ++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/livestatus/src/mk/SharedMutex.h b/livestatus/src/mk/SharedMutex.h index 8cfd1ce..ca16e35 100644 --- a/livestatus/src/mk/SharedMutex.h +++ b/livestatus/src/mk/SharedMutex.h @@ -25,45 +25,54 @@ #ifndef mk_SharedMutex_h #define mk_SharedMutex_h -#include "config.h" // IWYU pragma: keep +#include "config.h" // IWYU pragma: keep #include <pthread.h> -#include "Mutex.h" +#include <string.h> +#include <mutex> +#include <system_error> // A more or less drop-in replacement for C++14's <shared_mutex> (partial) namespace mk { -// Note: This is not in the standard, but close enough to shared_mutex for our purposes. +inline void throw_system_error(int err) { + throw std::system_error(std::error_code(err, std::generic_category())); +} + +inline void check_status(int status) { + if (status != 0) throw_system_error(status); +} + +// Note: This is not in the standard, but close enough to shared_mutex for our +// purposes. class rw_mutex { public: typedef pthread_rwlock_t *native_handle_type; rw_mutex() { check_status(pthread_rwlock_init(&_mutex, 0)); } ~rw_mutex() { check_status(pthread_rwlock_destroy(&_mutex)); } void lock() { check_status(pthread_rwlock_wrlock(&_mutex)); } - bool try_lock() - { + bool try_lock() { int status = pthread_rwlock_trywrlock(&_mutex); if (status != EBUSY) check_status(status); return status == 0; } void unlock() { check_status(pthread_rwlock_unlock(&_mutex)); } void lock_shared() { check_status(pthread_rwlock_rdlock(&_mutex)); } - bool try_lock_shared() - { + bool try_lock_shared() { int status = pthread_rwlock_tryrdlock(&_mutex); if (status != EBUSY) check_status(status); return status == 0; } void unlock_shared() { check_status(pthread_rwlock_unlock(&_mutex)); } native_handle_type native_handle() { return &_mutex; } + private: - rw_mutex(const rw_mutex &); // = delete - rw_mutex &operator=(const rw_mutex &); // = delete + rw_mutex(const rw_mutex &); // = delete + rw_mutex &operator=(const rw_mutex &); // = delete pthread_rwlock_t _mutex; }; - template <typename Mutex> class shared_lock { public: @@ -71,26 +80,19 @@ public: shared_lock() : _mutex(0), _owns_lock(false) {} explicit shared_lock(mutex_type &m) - : _mutex(addressOf(m)), _owns_lock(false) - { + : _mutex(addressOf(m)), _owns_lock(false) { lock(); _owns_lock = true; } - shared_lock(mutex_type &m, defer_lock_t) - : _mutex(addressOf(m)), _owns_lock(false) - { - } + shared_lock(mutex_type &m, std::defer_lock_t) + : _mutex(addressOf(m)), _owns_lock(false) {} - shared_lock(mutex_type &m, try_to_lock_t) - : _mutex(addressOf(m)), _owns_lock(_mutex->try_lock_shared()) - { - } + shared_lock(mutex_type &m, std::try_to_lock_t) + : _mutex(addressOf(m)), _owns_lock(_mutex->try_lock_shared()) {} - shared_lock(mutex_type &m, adopt_lock_t) - : _mutex(addressOf(m)), _owns_lock(true) - { - } + shared_lock(mutex_type &m, std::adopt_lock_t) + : _mutex(addressOf(m)), _owns_lock(true) {} // template<typename Clock, typename Duration> // shared_lock(mutex_type& m, @@ -100,24 +102,21 @@ public: // shared_lock(mutex_type& m, // const chrono::duration<Rep, Period>& rtime); - ~shared_lock() - { + ~shared_lock() { if (_owns_lock) unlock(); } // shared_lock(shared_lock&& other) // shared_lock& operator=(shared_lock&& other) - void lock() - { + void lock() { if (!_mutex) throw_system_error(EPERM); if (_owns_lock) throw_system_error(EDEADLK); _mutex->lock_shared(); _owns_lock = true; } - bool try_lock() - { + bool try_lock() { if (!_mutex) throw_system_error(EPERM); if (_owns_lock) throw_system_error(EDEADLK); _owns_lock = _mutex->try_lock_shared(); @@ -130,8 +129,7 @@ public: // template<typename Rep, typename Period> // bool try_lock_for(const chrono::duration<Rep, Period>& rtime) - void unlock() - { + void unlock() { if (!_owns_lock) throw_system_error(EPERM); if (_mutex) { _mutex->unlock_shared(); @@ -139,14 +137,12 @@ public: } } - void swap(shared_lock &other) - { + void swap(shared_lock &other) { std::swap(_mutex, other._mutex); std::swap(_owns_lock, other._owns_lock); } - mutex_type *release() - { + mutex_type *release() { mutex_type *ret = _mutex; _mutex = 0; _owns_lock = false; @@ -154,31 +150,29 @@ public: } bool owns_lock() const { return _owns_lock; } - operator bool() const { return owns_lock(); } // explicit + operator bool() const { return owns_lock(); } // explicit mutex_type *mutex() const { return _mutex; } + private: - shared_lock(const shared_lock &); // = delete; - shared_lock &operator=(const shared_lock &); // = delete; + shared_lock(const shared_lock &); // = delete; + shared_lock &operator=(const shared_lock &); // = delete; mutex_type *_mutex; bool _owns_lock; // basically std::addressof from C++11's <memory> template <typename T> - inline T *addressOf(T &x) - { + inline T *addressOf(T &x) { return reinterpret_cast<T *>( &const_cast<char &>(reinterpret_cast<const volatile char &>(x))); } }; - template <typename Mutex> -void swap(shared_lock<Mutex> &x, shared_lock<Mutex> &y) -{ +void swap(shared_lock<Mutex> &x, shared_lock<Mutex> &y) { x.swap(y); } -} // namespace mk +} // namespace mk -#endif // mk_SharedMutex_h +#endif // mk_SharedMutex_h

8 years, 6 months

Use chrono/condition_variable/mutex from the standard library.

by Sven Panne

Module: check_mk Branch: master Commit: 9822f91b537576f8edefe8735d303bc2181935ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9822f91b537576… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 7 09:54:40 2016 +0100 Use chrono/condition_variable/mutex from the standard library. --- livestatus/src/ClientQueue.cc | 6 +- livestatus/src/ClientQueue.h | 8 +- livestatus/src/LogCache.h | 4 +- livestatus/src/Query.cc | 13 +- livestatus/src/Store.cc | 4 +- livestatus/src/Store.h | 4 +- livestatus/src/TableLog.cc | 6 +- livestatus/src/TableStateHistory.cc | 6 +- livestatus/src/TimeperiodsCache.cc | 4 +- livestatus/src/TimeperiodsCache.h | 4 +- livestatus/src/mk/ConditionVariable.h | 100 ------------- livestatus/src/mk/Mutex.h | 249 --------------------------------- livestatus/src/waittriggers.cc | 19 +-- livestatus/src/waittriggers.h | 2 +- 14 files changed, 36 insertions(+), 393 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9822f91b53…

8 years, 6 months

update manpage

by Simon Betz

Module: check_mk Branch: master Commit: dbbd896c5c85a013f712201fa418d9a7ff78ff86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbbd896c5c85a0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 7 09:57:12 2016 +0100 update manpage --- checkman/varnish | 3 --- 1 file changed, 3 deletions(-) diff --git a/checkman/varnish b/checkman/varnish index 73be2c2..9590256 100644 --- a/checkman/varnish +++ b/checkman/varnish @@ -7,8 +7,5 @@ description: This check monitors the uptime of Varnish Server provided by 'varnishstat -1'. The Linux Agent needs to be installed. - This check can go WARN or CRIT when the uptime is below or above certain - configured levels. - inventory: One service is created.

8 years, 6 months

moved mongodb_locks to different wato subgroup

by Andreas Boesl

Module: check_mk Branch: master Commit: 51c4980a537b6cb477ed162c58f79b7a8cf7999a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51c4980a537b6c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 7 09:40:08 2016 +0100 moved mongodb_locks to different wato subgroup --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9c2ba0c..df089e5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1407,7 +1407,7 @@ register_check_parameters( register_check_parameters( - subgroup_applications, + subgroup_storage, "mongodb_locks", _("MongoDB Locks"), Dictionary(

8 years, 6 months

3264 FIX Fix display of values in graphs that are < 1.0

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b700737fdf4140b1c05f43e3269854487940575 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b700737fdf414… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 4 17:46:42 2016 +0100 3264 FIX Fix display of values in graphs that are < 1.0 --- .werks/3264 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3264 b/.werks/3264 new file mode 100644 index 0000000..a69e02a --- /dev/null +++ b/.werks/3264 @@ -0,0 +1,10 @@ +Title: Fix display of values in graphs that are < 1.0 +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457109954 + + diff --git a/ChangeLog b/ChangeLog index 2d0b64d..f468ae3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 3248 FIX: Avoid broken list of context filters and case of a BI error * 3251 FIX: Fix sorting of entries in Views sidebar element * 3230 FIX: Slightly improved popup menu positioning... + * 3264 FIX: Fix display of values in graphs that are < 1.0 WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index b99acab..cfcb124 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -596,7 +596,7 @@ def calculate_physical_precision(v, precision): places_before_comma = exponent + 1 places_after_comma = precision - places_before_comma - return scale_symbols[scale], places_after_comma, 1000**abs(scale) + return scale_symbols[scale], places_after_comma, 1000 ** scale def nic_speed_human_readable(bits_per_second):

8 years, 6 months

3001 fileinfo: now able to configure resulting state if file is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 89de71379f519ed68f18b163138c67a0ded54571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89de71379f519e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 4 16:10:21 2016 +0100 3001 fileinfo: now able to configure resulting state if file is missing --- .werks/3001 | 9 +++++++++ ChangeLog | 1 + checks/fileinfo | 5 +++-- web/plugins/wato/check_parameters.py | 6 ++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/3001 b/.werks/3001 new file mode 100644 index 0000000..971847a --- /dev/null +++ b/.werks/3001 @@ -0,0 +1,9 @@ +Title: fileinfo: now able to configure the checks status if the file is missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1457104202 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2bdc503..2d0b64d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 3083 mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy * 3085 fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls... * 3257 dell_idrac_virtdisks: new check which monitors the virtual disks of a Dell IDrac Device + * 3001 fileinfo: now able to configure the checks status if the file is missing * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/fileinfo b/checks/fileinfo index 405fc08..51c46a4 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -108,10 +108,11 @@ def check_fileinfo(item, params, info): in_timerange = outof_range_txt == None reftime = int(info[0][0]) check_definition = False + state_missing = params.get("state_missing", 3) for line in info[1:]: if item == line[0]: if line[1] == "missing": - return in_timerange and 3 or 0, "File not found" + (outof_range_txt or "") + return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -121,7 +122,7 @@ def check_fileinfo(item, params, info): ("age", age, get_age_human_readable) ] if check_definition == False: - return in_timerange and 3 or 0, "File not found" + (outof_range_txt or "") + return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") return fileinfo_check_function(check_definition, params, outof_range_txt) # Extracts patterns that are relevant for the current host and item. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c99ad00..9c2ba0c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2390,6 +2390,12 @@ register_check_parameters( help = _("Outside these ranges the check will always be OK"), count = 3, )), + ("state_missing", + MonitoringState( + default_value = 3, + title = _("State when file is missing") + ) + ), ] ), TextAscii(

8 years, 6 months

fixed import error

by Simon Betz

Module: check_mk Branch: master Commit: 36c6fef7557bd2b05e23ac0d81d8907a419cbfb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36c6fef7557bd2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 4 15:44:39 2016 +0100 fixed import error --- web/htdocs/logwatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 4bbb258..00870ef 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -26,7 +26,7 @@ import time, re, os, datetime, config, defaults from lib import * -import views +import views, sites stylesheets = [ 'pages', 'status', 'logwatch' ]

8 years, 6 months

Fixed multiple loading of config plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 177ec6c70c67d68d9b50961fc2190a81b3f5f52b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=177ec6c70c67d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 4 15:08:39 2016 +0100 Fixed multiple loading of config plugins --- web/htdocs/config.py | 7 ++++--- web/htdocs/html_mod_python.py | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 2944146..5bc4557 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -131,6 +131,10 @@ def include(filename): # Load multisite.mk and all files in multisite.d/. This will happen # for *each* HTTP request. +# FIXME: Optimize this to cache the config etc. until either the config files or plugins +# have changed. We could make this being cached for multiple requests just like the +# plugins of other modules. This may save significant time in case of small requests like +# the graph ajax page or similar. def load_config(): global modification_timestamps, sites modification_timestamps = [] @@ -598,6 +602,3 @@ def load_plugins(force): # Make sure, builtin roles are present, even if not modified and saved with WATO. for br in builtin_role_ids: roles.setdefault(br, {}) - - -load_plugins(True) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 8777e2b..8d56604 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -39,6 +39,9 @@ class FinalizeRequest(Exception): class html_mod_python(htmllib.html): + # The constructor must not rely on "config.", because the configuration + # is not loaded yet. Earliest place is self.init_modes() where config + # is loaded. def __init__(self, req, fields): req.content_type = "text/html; charset=UTF-8" req.header_sent = False

8 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016