Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

Please ancient compilers. Added adopt_lock on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 84cea2f71cbe8b1b7b6fe9d80ee3c7be859e211d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cea2f71cbe8b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 16 10:49:46 2015 +0100 Please ancient compilers. Added adopt_lock on the way. --- livestatus/src/Mutex.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/livestatus/src/Mutex.h b/livestatus/src/Mutex.h index c19852a..644c450 100644 --- a/livestatus/src/Mutex.h +++ b/livestatus/src/Mutex.h @@ -39,8 +39,8 @@ namespace mk { class mutex { public: typedef pthread_mutex_t *native_handle_type; - mutex() : _mutex(PTHREAD_MUTEX_INITIALIZER) {} - ~mutex() {} + mutex() { pthread_mutex_init(native_handle(), 0); } + ~mutex() { check(pthread_mutex_destroy(native_handle())); } void lock() { check(pthread_mutex_lock(native_handle())); } bool try_lock() { @@ -51,8 +51,8 @@ public: void unlock() { check(pthread_mutex_unlock(native_handle())); } native_handle_type native_handle() { return &_mutex; } private: - mutex(const mutex &); // = delete - mutex &operator=(const mutex &); // = delete + mutex(const mutex &); // = delete + mutex &operator=(const mutex &); // = delete static void check(int status) { @@ -65,7 +65,7 @@ private: }; struct adopt_lock_t { }; -// constexpr adopt_lock_t adopt_lock { }; +const adopt_lock_t adopt_lock = { }; // constexpr template <typename Mutex> class lock_guard { @@ -75,8 +75,8 @@ public: lock_guard(mutex_type &m, adopt_lock_t) : _mutex(m) {} ~lock_guard() { _mutex.unlock(); } private: - lock_guard(const lock_guard &); // = delete - lock_guard &operator=(const lock_guard &); // = delete + lock_guard(const lock_guard &); // = delete + lock_guard &operator=(const lock_guard &); // = delete mutex_type &_mutex; };

8 years, 7 months

agent_netapp: added comment regarding tls/ssl authentification

by Andreas Boesl

Module: check_mk Branch: master Commit: 2f1d9e8850c676a854dd804b9d8921acb3ada79f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f1d9e8850c676… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 16 09:54:45 2015 +0100 agent_netapp: added comment regarding tls/ssl authentification --- agents/special/agent_netapp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 7753ef7..7e189b7c 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -36,6 +36,18 @@ except Exception, e: sys.exit(1) +# Use this block if you want to use TLS instead of SSL authentification + +#import ssl +#from functools import wraps +#def sslwrap(func): +# @wraps(func) +# def bar(*args, **kw): +# kw['ssl_version'] = ssl.PROTOCOL_TLSv1 +# return func(*args, **kw) +# return bar +# +#ssl.wrap_socket = sslwrap(ssl.wrap_socket) def usage():

8 years, 7 months

Added lock_guard.

by Sven Panne

Module: check_mk Branch: master Commit: 0d19eecc11dd50827edf14446acca699e2b203ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d19eecc11dd50… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 13 17:25:53 2015 +0100 Added lock_guard. TODO: Nuke (un)lockLogCache. --- livestatus/src/ClientQueue.cc | 12 +++++++----- livestatus/src/Mutex.h | 23 ++++++++++++++++++++--- livestatus/src/Store.cc | 5 +++-- livestatus/src/TimeperiodsCache.cc | 20 +++++++------------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/livestatus/src/ClientQueue.cc b/livestatus/src/ClientQueue.cc index 38d003b..7e44ec2 100644 --- a/livestatus/src/ClientQueue.cc +++ b/livestatus/src/ClientQueue.cc @@ -25,6 +25,8 @@ #include "ClientQueue.h" #include <unistd.h> +using mk::lock_guard; +using mk::mutex; ClientQueue::ClientQueue() { @@ -44,16 +46,17 @@ ClientQueue::~ClientQueue() void ClientQueue::addConnection(int fd) { - _lock.lock(); - _queue.push_back(fd); - _lock.unlock(); + { + lock_guard<mutex> lg(_lock); + _queue.push_back(fd); + } pthread_cond_signal(&_signal); } int ClientQueue::popConnection() { - _lock.lock(); + lock_guard<mutex> lg(_lock); if (_queue.size() == 0) { pthread_cond_wait(&_signal, _lock.native_handle()); } @@ -63,7 +66,6 @@ int ClientQueue::popConnection() fd = _queue.front(); _queue.pop_front(); } - _lock.unlock(); return fd; } diff --git a/livestatus/src/Mutex.h b/livestatus/src/Mutex.h index c19a8f6..c19852a 100644 --- a/livestatus/src/Mutex.h +++ b/livestatus/src/Mutex.h @@ -39,7 +39,6 @@ namespace mk { class mutex { public: typedef pthread_mutex_t *native_handle_type; - mutex() : _mutex(PTHREAD_MUTEX_INITIALIZER) {} ~mutex() {} void lock() { check(pthread_mutex_lock(native_handle())); } @@ -49,7 +48,6 @@ public: if (status != EBUSY) check(status); return status == 0; } - void unlock() { check(pthread_mutex_unlock(native_handle())); } native_handle_type native_handle() { return &_mutex; } private: @@ -65,5 +63,24 @@ private: pthread_mutex_t _mutex; }; -} + +struct adopt_lock_t { }; +// constexpr adopt_lock_t adopt_lock { }; + +template <typename Mutex> +class lock_guard { +public: + typedef Mutex mutex_type; + explicit lock_guard(mutex_type &m) : _mutex(m) { _mutex.lock(); } + lock_guard(mutex_type &m, adopt_lock_t) : _mutex(m) {} + ~lock_guard() { _mutex.unlock(); } +private: + lock_guard(const lock_guard &); // = delete + lock_guard &operator=(const lock_guard &); // = delete + + mutex_type &_mutex; +}; + +} // namespace mk + #endif // Mutex_h diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index aae00d1..75dc517 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -43,6 +43,8 @@ #include "tables.h" // IWYU pragma: keep #undef EXTERN +using mk::lock_guard; +using mk::mutex; using std::make_pair; using std::string; @@ -164,7 +166,7 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) void Store::answerCommandRequest(const char *command) { - _command_mutex.lock(); + lock_guard<mutex> lg(_command_mutex); #ifdef NAGIOS4 process_external_command1((char *)command); #else @@ -172,7 +174,6 @@ void Store::answerCommandRequest(const char *command) /* int ret = */ submit_external_command((char *)command, &buffer_items); #endif - _command_mutex.unlock(); } diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index e72563b..6bb787f 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -30,8 +30,9 @@ #include <utility> #include "logger.h" - using std::make_pair; +using mk::lock_guard; +using mk::mutex; extern timeperiod *timeperiod_list; @@ -46,7 +47,7 @@ TimeperiodsCache::~TimeperiodsCache() } void TimeperiodsCache::logCurrentTimeperiods(){ - _cache_lock.lock(); + lock_guard<mutex> lg(_cache_lock); time_t now = time(0); // Loop over all timeperiods and compute if we are // currently in. Detect the case where no time periods @@ -65,21 +66,17 @@ void TimeperiodsCache::logCurrentTimeperiods(){ logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); tp = tp->next; } - _cache_lock.unlock(); } void TimeperiodsCache::update(time_t now) { - _cache_lock.lock(); + lock_guard<mutex> lg(_cache_lock); // update cache only once a minute. The timeperiod // definitions have 1 minute as granularity, so a // 1sec resultion is not needed. int minutes = now / 60; - if (minutes == _cache_time) { - _cache_lock.unlock(); - return; - } + if (minutes == _cache_time) return; // Loop over all timeperiods and compute if we are // currently in. Detect the case where no time periods @@ -109,8 +106,6 @@ void TimeperiodsCache::update(time_t now) _cache_time = minutes; else logger(LG_INFO, "Timeperiod cache not updated, there are no timeperiods (yet)"); - - _cache_lock.unlock(); } bool TimeperiodsCache::inTimeperiod(const char *tpname) @@ -127,9 +122,9 @@ bool TimeperiodsCache::inTimeperiod(const char *tpname) bool TimeperiodsCache::inTimeperiod(timeperiod *tp) { - bool is_in; - _cache_lock.lock(); + lock_guard<mutex> lg(_cache_lock); _cache_t::iterator it = _cache.find(tp); + bool is_in; if (it != _cache.end()) is_in = it->second; else { @@ -141,7 +136,6 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp) // time_t now = time(0); // is_in = 0 == check_time_against_period(now, tp); } - _cache_lock.unlock(); return is_in; }

8 years, 7 months

Introduce C++11-like mutex class.

by Sven Panne

Module: check_mk Branch: master Commit: cd4f8c86067e56c9638d92bf7bc56d33b9097b98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd4f8c86067e56… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 13 15:53:03 2015 +0100 Introduce C++11-like mutex class. More stuff like lock_guard, recursive_mutex, etc. will come later. Note that waittriggers.{c,h} still uses plain old pthreads stuff directly, this needs to be cleaned up later. --- livestatus/src/ClientQueue.cc | 12 +++---- livestatus/src/ClientQueue.h | 4 +-- livestatus/src/LogCache.cc | 6 ++-- livestatus/src/LogCache.h | 4 +-- livestatus/src/Mutex.h | 69 ++++++++++++++++++++++++++++++++++++ livestatus/src/Store.cc | 7 ++-- livestatus/src/Store.h | 4 +-- livestatus/src/TimeperiodsCache.cc | 16 ++++----- livestatus/src/TimeperiodsCache.h | 4 +-- 9 files changed, 93 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd4f8c8606…

8 years, 7 months

#2790 FIX check_dns: now able to configure milliseconds as expected response time

by Andreas Boesl

Module: check_mk Branch: master Commit: 8b40c176d4443e2738f6aabe2597e58e777777cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b40c176d4443e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 13 16:02:48 2015 +0100 #2790 FIX check_dns: now able to configure milliseconds as expected response time The response time was already configurable in milliseconds through WATO. However, during the command line generation the decimal places got discarded. --- .werks/2790 | 11 +++++++++++ ChangeLog | 1 + checks/check_dns | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2790 b/.werks/2790 new file mode 100644 index 0000000..c42ab51 --- /dev/null +++ b/.werks/2790 @@ -0,0 +1,11 @@ +Title: check_dns: now able to configure milliseconds as expected response time +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447426874 +Class: fix + +The response time was already configurable in milliseconds through WATO. +However, during the command line generation the decimal places got discarded. + diff --git a/ChangeLog b/ChangeLog index 2b7786e..648b39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 2776 FIX: apache_status: fix crash for Apache versions with yet unhandled status fields * 2836 FIX: pandacom_psu: fixed handling of not available power supplies * 2766 FIX: juniper_fru: Don't discover devices reported as "empty"... + * 2790 FIX: check_dns: now able to configure milliseconds as expected response time... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/check_dns b/checks/check_dns index 8ea2887..1494358 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -46,8 +46,9 @@ def check_dns_arguments(params): args += ' -A' if "response_time" in settings: - args += ' -w %d' % int(settings["response_time"][0]) - args += ' -c %d' % int(settings["response_time"][1]) + args += ' -w %f' % float(settings["response_time"][0]) + args += ' -c %f' % float(settings["response_time"][1]) + if "timeout" in settings: args += ' -t %d' % int(settings['timeout'])

8 years, 7 months

Consolidated pnp_cleanup calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e8c3859a8440f58c6220c6c0703e657ad2b3f88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e8c3859a8440f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 13 15:09:28 2015 +0100 Consolidated pnp_cleanup calls --- web/htdocs/metrics.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7ef039d..1274ab6 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -314,7 +314,8 @@ def parse_perf_data(perf_data_string, check_command=None): for part in parts: try: varname, values = part.split("=", 1) - varname = varname.replace("\"", "").replace("\'", "") + varname = pnp_cleanup(varname.replace("\"", "").replace("\'", "")) + value_parts = values.split(";") while len(value_parts) < 5: value_parts.append(None) @@ -328,6 +329,7 @@ def parse_perf_data(perf_data_string, check_command=None): i += 1 unit_name = value_text[i:] value = value_text[:i] + perf_data.append((varname, value, unit_name, warn, crit, min, max)) except: if config.debug: @@ -1032,7 +1034,7 @@ def render_graph_pnp(graph_template, translated_metrics): # Define one RRD variable for each of the available metrics. # Note: We need to use the original name, not the translated one. for var_name, metrics in translated_metrics.items(): - rrd = "$RRDBASE$_" + pnp_cleanup(metrics["orig_name"]) + ".rrd" + rrd = "$RRDBASE$_" + metrics["orig_name"] + ".rrd" scale = metrics["scale"] unit = metrics["unit"] render_scale = unit.get("render_scale", 1)

8 years, 7 months

Fixed error handling in case of non parsable perfdata

by Lars Michelsen

Module: check_mk Branch: master Commit: 61a4548ac12973d58e8f75cd15efabf5dfb510f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a4548ac12973… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 13 14:58:09 2015 +0100 Fixed error handling in case of non parsable perfdata --- web/htdocs/metrics.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 2f9595d..7ef039d 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -292,7 +292,11 @@ def parse_perf_data(perf_data_string, check_command=None): return None, check_command # Split the perf data string into parts. Preserve quoted strings! - parts = split_perf_data(perf_data_string) + try: + parts = split_perf_data(perf_data_string) + except ValueError, e: + html.log("Failed to parse perfdata string: %s" % perf_data_string) + return None, check_command # Try if check command is appended to performance data # in a PNP like style

8 years, 7 months

#2767 FIX Fixed broken user list when non unicode mail addresses are loaded

by Lars Michelsen

Module: check_mk Branch: master Commit: 7647abef9cc090766221b6a9fadd9a8e0cb20838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7647abef9cc090… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 13 14:42:17 2015 +0100 #2767 FIX Fixed broken user list when non unicode mail addresses are loaded --- .werks/2767 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2767 b/.werks/2767 new file mode 100644 index 0000000..e9feaad --- /dev/null +++ b/.werks/2767 @@ -0,0 +1,10 @@ +Title: Fixed broken user list when non unicode mail addresses are loaded +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447422113 + + diff --git a/ChangeLog b/ChangeLog index 2b7786e..03dca4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 2742 FIX: Make selection of folders and host group tag filter use nicer drawing characters * 2774 FIX: Fix exception when deleting certain types of MIBs * 2760 FIX: Fixed case where "activate changes" was not commiting the pending changes entries correctly... + * 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 299cb59..93871b1 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -307,6 +307,10 @@ def load_users(lock = False): profile.update(user) result[id] = profile + # Convert non unicode mail addresses + if type(profile.get("email")) == str: + profile["email"] = profile["email"].decode("utf-8") + # This loop is only neccessary if someone has edited # contacts.mk manually. But we want to support that as # far as possible.

8 years, 7 months

#2789 netapp_api_snapvault: No longer monitors uninitialized volumes

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f2148533b7d38e12d7b88fbffcc71c5bb9506bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f2148533b7d38… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 13 14:32:34 2015 +0100 #2789 netapp_api_snapvault: No longer monitors uninitialized volumes The lag-time information is not available for uninitialized volumes. --- .werks/2789 | 10 ++++++++++ ChangeLog | 1 + checks/netapp_api_snapvault | 11 ++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/2789 b/.werks/2789 new file mode 100644 index 0000000..bb696a1 --- /dev/null +++ b/.werks/2789 @@ -0,0 +1,10 @@ +Title: netapp_api_snapvault: No longer monitors uninitialized volumes +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447421423 + +The lag-time information is not available for uninitialized volumes. diff --git a/ChangeLog b/ChangeLog index 73c43a8..2b7786e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 2787 netapp_api_snapvaults: Clustermode supported, netapp_api_disks: fixed invalid total disk space... * 2788 ESX Monitoring, esx_vsphere_vm subchecks: VM templates are now excluded... * 2833 isc_dhcpd, win_dhcp_pools: lower levels for used dhcp leases are now configurable... + * 2789 netapp_api_snapvault: No longer monitors uninitialized volumes... * 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/netapp_api_snapvault b/checks/netapp_api_snapvault index 556ed9c..c73f951 100644 --- a/checks/netapp_api_snapvault +++ b/checks/netapp_api_snapvault @@ -31,8 +31,9 @@ # snapvault /vol/ipb_vol0/ status idle state snapvaulted lag-time 97011 source-system 172.31.12.15 def inventory_netapp_api_snapvault(parsed): - for snapvault in parsed: - yield snapvault, {} + for snapvault, values in parsed.items(): + if "lag-time" in values: + yield snapvault, {} def check_netapp_api_snapvault(item, params, parsed): snapvault = parsed.get(item) @@ -44,7 +45,11 @@ def check_netapp_api_snapvault(item, params, parsed): if what in snapvault: yield 0, "%s: %s" % (what.title(), snapvault[what]) - lag_time = int(snapvault["lag-time"]) + lag_time = snapvault.get("lag-time") + if not lag_time: + return + + lag_time = int(lag_time) state = 0 if params: levels = None

8 years, 7 months

removed test var sepp

by Simon Betz

Module: check_mk Branch: master Commit: 83297b3082cc75eef499e439b63d44ac32699ea6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83297b3082cc75… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 13 13:51:13 2015 +0100 removed test var sepp --- checks/cpu_load.include | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index 4b6db43..b4698e6 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -41,8 +41,6 @@ def check_cpu_load_generic(params, load, num_cpus=1): perfdata = [ ('load' + str(z), l, warn, crit, 0, num_cpus ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] - perfdata.append( ('sepp', 17) ) - state, text, perf = check_levels(load[2], 'load15', params, factor = num_cpus) perfdata += perf infotext = "15 min load %.2f" % load[2]

8 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
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