Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Internal optimization for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: e66d206195c608c19dbec2b4443bc80a3e0d1a37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66d206195c608… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 7 01:48:55 2013 +0200 Internal optimization for CMC --- web/htdocs/wato.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9db9b9e..c64d8e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7643,7 +7643,6 @@ def ajax_activation(): # This is the single site activation mode try: start = time.time() - # if not cmc_rush_ahead_activation(): check_mk_local_automation(config.wato_activation_method) duration = time.time() - start update_replication_status(None, {}, { 'act': duration }) @@ -7651,7 +7650,7 @@ def ajax_activation(): if config.debug: import traceback raise MKUserError(None, "Error executing hooks: %s" % - traceback.format_exc().replace('\n', '<br />')) + traceback.format_exc().replace('\n', '<br />')) else: raise @@ -7667,21 +7666,9 @@ def ajax_activation(): # Try to do a rush-ahead-activation def cmc_rush_ahead_activation(): - if defaults.omd_root: - rush_config = defaults.var_dir + "/core/config.rush" - if os.path.exists(rush_config): - try: - rush_id = file(rush_config + ".id").read().strip() - changeid = file(log_dir + "changeid").read().strip() - if rush_id == changeid: # Rush ahead file is up-to-date! - os.rename(rush_config, rush_config[:-5]) - cmc_reload() - log_commit_pending() - html.final_javascript("wato_hide_changes_button();") - return True - except Exception, e: - if config.debug: - raise + return + + def cmc_reload(): log_audit(None, "activate-config", "Reloading Check_MK Micro Core on the fly")

10 years, 11 months

Check_MK Git: check_mk: Fixed .f12 helper to support .site

by Mathias Kettner

Module: check_mk Branch: master Commit: a03e599710e762cec4c943dda4648aba40f0af51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a03e599710e762… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 5 18:00:06 2013 +0200 Fixed .f12 helper to support .site --- livestatus/.f12 | 6 ++++-- web/.f12 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index 543c461..ac70c7b 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -1,4 +1,7 @@ -#!/bin/sh +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} + set -e if [ ! -f configure ]; then aclocal && autoheader && automake -a && autoconf @@ -11,7 +14,6 @@ fi make CFLAGS=-g -j 8 -SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo install src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o sudo install -m 755 src/livecheck /omd/versions/default/lib/mk-livestatus sudo rm -f /omd/versions/default/lib/livecheck diff --git a/web/.f12 b/web/.f12 index 546ee53..cf8c53b 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,5 +1,5 @@ #!/bin/bash -SITE=${SITE:-$(cat ../.site || true)} +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync --exclude=defaults.py --exclude "*mkevent*" --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied"

10 years, 11 months

Check_MK Git: check_mk: Some fixes for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: fe2d9e5b239111086e6bff59ca1391aef931372d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe2d9e5b239111… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 5 17:49:26 2013 +0200 Some fixes for CMC --- livestatus/src/LogCache.cc | 13 ++----------- livestatus/src/LogCache.h | 2 -- livestatus/src/LogEntry.cc | 31 +++++++++++++++++++++++-------- livestatus/src/LogEntry.h | 1 + livestatus/src/Logfile.cc | 34 +++++++++++++++++++++++++++++----- livestatus/src/Logfile.h | 25 +++++++++++++++---------- 6 files changed, 70 insertions(+), 36 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 9f5b025..9261be8 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -52,7 +52,7 @@ int num_cached_log_messages = 0; // Debugging logging is hard if debug messages are logged themselves... void debug(const char *loginfo, ...) { - if (g_debug_level < 2) + if (g_debug_level >= 3) return; FILE *x = fopen("/tmp/livestatus.log", "a+"); @@ -67,7 +67,6 @@ void debug(const char *loginfo, ...) LogCache::LogCache(unsigned long max_cached_messages) : _max_cached_messages(max_cached_messages) , _num_at_last_check(0) - , _my_world(0) { pthread_mutex_init(&_lock, 0); updateLogfileIndex(); @@ -100,12 +99,6 @@ void LogCache::unlockLogCache() bool LogCache::logCachePreChecks() { -#ifdef CMC - if (g_live_world != _my_world) { - forgetLogfiles(); - updateLogfileIndex(); - } -#endif // Do we have any logfiles (should always be the case, // but we don't want to crash... if (_logfiles.size() == 0) { @@ -125,6 +118,7 @@ bool LogCache::logCachePreChecks() void LogCache::forgetLogfiles() { + logger(LOG_INFO, "Logfile cache: flushing complete cache."); for (_logfiles_t::iterator it = _logfiles.begin(); it != _logfiles.end(); ++it) @@ -133,9 +127,6 @@ void LogCache::forgetLogfiles() } _logfiles.clear(); num_cached_log_messages = 0; -#ifdef CMC - _my_world = g_live_world; -#endif } void LogCache::updateLogfileIndex() diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index a3c1bd3..5d795a4 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -31,7 +31,6 @@ #include "Table.h" class Logfile; -class World; typedef map<time_t, Logfile *> _logfiles_t; @@ -47,7 +46,6 @@ public: ~LogCache(); void setMaxCachedMessages(unsigned long m); time_t _last_index_update; - World *_my_world; const char *name() { return "log"; } const char *prefixname() { return "logs"; } diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 1ef92e2..23724c4 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -79,14 +79,7 @@ LogEntry::LogEntry(unsigned lineno, char *line, unsigned logclasses = LOGCLASS_A ((1 << LOGCLASS_COMMAND & logclasses) && handleExternalCommandEntry()) ) { - if (_host_name) - _host = find_host(_host_name); - if (_svc_desc) - _service = find_service(_host_name, _svc_desc); - if (_contact_name) - _contact = find_contact(_contact_name); - if (_command_name) - _command = find_command(_command_name); + updateReferences(); } else { (1 << LOGCLASS_PROGRAM & logclasses) && handleProgrammEntry(); // Performance killer strstr! @@ -396,3 +389,25 @@ inline int LogEntry::hostStateToInt(char *s) } } + +unsigned LogEntry::updateReferences() +{ + unsigned updated = 0; + if (_host_name) { + _host = find_host(_host_name); + updated++; + } + if (_svc_desc) { + _service = find_service(_host_name, _svc_desc); + updated++; + } + if (_contact_name) { + _contact = find_contact(_contact_name); + updated++; + } + if (_command_name) { + _command = find_command(_command_name); + updated++; + } + return updated; +} diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index bd39006..b744b64 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -84,6 +84,7 @@ struct LogEntry LogEntry(unsigned lineno, char *line, unsigned logclasses); ~LogEntry(); + unsigned updateReferences(); private: bool handleStatusEntry(); diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index cef5b1a..472973e 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -33,6 +33,11 @@ #include "Query.h" #include "LogCache.h" +#ifdef CMC +#include "Core.h" +extern Core *g_core; +#endif + Logfile::Logfile(const char *path, bool watch) : _path(strdup(path)) @@ -68,14 +73,14 @@ Logfile::Logfile(const char *path, bool watch) Logfile::~Logfile() { - free(_path); flush(); + free(_path); } void Logfile::flush() { - for (logfile_entries_t::iterator it = _entries.begin(); it != _entries.end(); ++it) + for (logfile_entries_t::iterator it = _entries.begin(); it != _entries.end(); ++it) delete it->second; _entries.clear(); @@ -112,7 +117,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, unsigned logc fgetpos(file, &_read_pos); } if (missing_types) { - fseek(file, 0, SEEK_SET); + fseek(file, 0, SEEK_SET); _lineno = 0; loadRange(file, missing_types, logcache, since, until, logclasses); _logclasses_read |= missing_types; @@ -194,12 +199,14 @@ inline bool Logfile::processLogLine(uint32_t lineno, unsigned logclasses) logfile_entries_t* Logfile::getEntriesFromQuery(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { - load(logcache, since, until, logclasses); // make sure all messages are present - return &_entries; + updateReferences(); + load(logcache, since, until, logclasses); // make sure all messages are present + return &_entries; } bool Logfile::answerQuery(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { + updateReferences(); load(logcache, since, until, logclasses); // make sure all messages are present uint64_t sincekey = makeKey(since, 0); logfile_entries_t::iterator it = _entries.lower_bound(sincekey); @@ -217,6 +224,7 @@ bool Logfile::answerQuery(Query *query, LogCache *logcache, time_t since, time_t bool Logfile::answerQueryReverse(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { + updateReferences(); load(logcache, since, until, logclasses); // make sure all messages are present uint64_t untilkey = makeKey(until, 999999999); logfile_entries_t::iterator it = _entries.upper_bound(untilkey); @@ -237,3 +245,19 @@ uint64_t Logfile::makeKey(time_t t, unsigned lineno) return (uint64_t)((uint64_t)t << 32) | (uint64_t)lineno; } + +void Logfile::updateReferences() +{ +#ifdef CMC + // If our references in cached log entries do not point to the currently + // active configuration world, then update all references + if (_world != g_live_world) { + unsigned num = 0; + for (logfile_entries_t::iterator it = _entries.begin(); it != _entries.end(); ++it) + num += it->second->updateReferences(); + logger(LOG_NOTICE, "Updated %u log cache references of %s to new world.", num, _path); + _world = g_live_world; + } +#endif +} + diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index acc799c..931b03a 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -37,11 +37,25 @@ using namespace std; class LogEntry; class Query; class LogCache; +class World; typedef map<uint64_t, LogEntry *> logfile_entries_t; // key is time_t . lineno class Logfile { +private: + char *_path; + time_t _since; // time of first entry + bool _watch; // true only for current logfile + ino_t _inode; // needed to detect switching + fpos_t _read_pos; // read until this position + uint32_t _lineno; // read until this line + + logfile_entries_t _entries; + char _linebuffer[MAX_LOGLINE]; + World *_world; // CMC: world our references point into + + public: Logfile(const char *path, bool watch); ~Logfile(); @@ -57,18 +71,9 @@ public: bool answerQueryReverse(Query *query, LogCache *lc, time_t since, time_t until, unsigned); long freeMessages(unsigned logclasses); + void updateReferences(); unsigned _logclasses_read; // only these types have been read -private: - char *_path; - time_t _since; // time of first entry - bool _watch; // true only for current logfile - ino_t _inode; // needed to detect switching - fpos_t _read_pos; // read until this position - uint32_t _lineno; // read until this line - - logfile_entries_t _entries; - char _linebuffer[MAX_LOGLINE]; private:

10 years, 11 months

Check_MK Git: check_mk: Livestatus: fix compatibility with CMC in statehist

by Mathias Kettner

Module: check_mk Branch: master Commit: da48b30e46f6da08efc00ec2cdc1b6ffb10e7f2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da48b30e46f6da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 5 17:57:06 2013 +0200 Livestatus: fix compatibility with CMC in statehist --- livestatus/src/TableStateHistory.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index af6c2ae..4848bd5 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -454,8 +454,8 @@ void TableStateHistory::answerQuery(Query *query) state->_host = entry->_host; state->_service = entry->_service; #ifdef CMC - state->_host_name = entry->_host->name(); - state->_service_description = entry->_service != 0 ? entry->_service->name() : ""; + state->_host_name = entry->_host->_name; + state->_service_description = entry->_service != 0 ? entry->_service->_name : ""; #else state->_host_name = entry->_host->name; state->_service_description = entry->_service != 0 ? entry->_service->description : "";

10 years, 11 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 15bcaca61c0cdf4094ceac25003a26deb0084e49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15bcaca61c0cdf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 4 23:03:30 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index e255a85..6d5177e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1072 +1082

10 years, 11 months

Check_MK Git: check_mk: livestatus table statehist: fixed rubbish entries whenever

by Andreas Boesl

Module: check_mk Branch: master Commit: 4567c5d6b83b89a182acce090645e707db78eb39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4567c5d6b83b89… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 4 15:13:51 2013 +0200 livestatus table statehist: fixed rubbish entries whenever --- ChangeLog | 2 ++ livestatus/src/TableStateHistory.cc | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5624601..ca7b650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.3i3: Core: * FIX: fixed typo in core startup message "logging initial states" + * FIX: livestatus table statehist: fixed rubbish entries whenever + logfile instances got unloaded Notifications: * mkeventd: new notification plugin for forwarding notifications diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 74228c9..af6c2ae 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -453,8 +453,13 @@ void TableStateHistory::answerQuery(Query *query) state->_is_host = entry->_svc_desc == 0; state->_host = entry->_host; state->_service = entry->_service; - state->_host_name = entry->_host_name; - state->_service_description = entry->_svc_desc != 0 ? entry->_svc_desc : ""; + #ifdef CMC + state->_host_name = entry->_host->name(); + state->_service_description = entry->_service != 0 ? entry->_service->name() : ""; + #else + state->_host_name = entry->_host->name; + state->_service_description = entry->_service != 0 ? entry->_service->description : ""; + #endif // No state found. Now check if this host/services is filtered out. // Note: we currently do not filter out hosts since they might be

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1062

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7bf1f0b2d3239db442a5ae485b651ae44258f3d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bf1f0b2d3239d… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Oct 4 12:37:27 2013 +0200 Updated bug entries #1062 --- .bugs/1062 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1062 b/.bugs/1062 new file mode 100644 index 0000000..34250a4 --- /dev/null +++ b/.bugs/1062 @@ -0,0 +1,11 @@ +Title: mismatch between check and check manpages for plugin sap +Component: checks +State: open +Date: 2013-10-04 12:34:09 +Targetversion: 1.2.3i3 +Class: bug + +the sap checks provide perfdata +but the manpages sap.dialog and sap.value tell, it does not + +perfdata need to be documented in the both manpages

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0901

by Mathias Kettner

Module: check_mk Branch: master Commit: e6bf145aa56987be47c4596d37a57566bf8fa3cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6bf145aa56987… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 12:35:45 2013 +0200 Updated bug entries #0901 --- .bugs/901 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.bugs/901 b/.bugs/901 index d725161..48c5d6f 100644 --- a/.bugs/901 +++ b/.bugs/901 @@ -1,9 +1,9 @@ Title: fix logwatch in mk_logwatch & check_mk_caching_agent & zei monitoring servers Component: core -State: open +Class: bug +State: wontfix Date: 2013-03-01 12:39:47 Targetversion: future -Class: bug Wir setzen omd 0.56 ein. Dabei haben wir eine test und eine prod instanz und transportieren config änderungen per svn von test nach prod. @@ -59,3 +59,12 @@ nagios ALL=(root) NOPASSWD: /usr/bin/check_mk_caching_agent PS wir machen in user ~nagios/.ssh/authorized_keys sowas: command="/usr/bin/sudo /usr/bin/check_mk_caching_agent" ssh-rsa AAAAB3Nz + +----------------------------------------------------------------- +Alles viel zu kompliziert. + + +2013-10-03 12:35:43: changed state open -> wontfix +Eine Lösung ist wohl viel zu kompliziert. Allenfalls können wir den +Fall mit xinetd beheben, indem wir die Quell-IP nehmen. Aber +das ist ein anderes Thema.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0932

by Mathias Kettner

Module: check_mk Branch: master Commit: e945c9cf4ac9af55084e1aec0ffb59247aafd201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e945c9cf4ac9af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 12:40:41 2013 +0200 Updated bug entries #0932 --- .bugs/932 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/932 b/.bugs/932 index df83bbb..e0ae1b3 100644 --- a/.bugs/932 +++ b/.bugs/932 @@ -1,9 +1,9 @@ Title: Percentage valuespec not constistent Component: wato -State: open +Class: bug +State: works4me Date: 2013-06-26 10:44:31 Targetversion: future -Class: bug The validate_datatype() is not always called on creating rules @@ -14,3 +14,9 @@ Create rule in WATO -> Warning check_parameters.py filesystem_elements Remove allow_int from trend_perc Create rule in WATO -> No Warning (int not allowed) + +2013-10-03 12:40:38: changed state open -> works4me +Sollte behoben sein. Das validate() wird jetzt s +doch sauber durchgeführt und ein gelber Kasten angezeigt, wenn +der aktuelle Wert vom Valuespec nicht dargestellt werden kann, +weil die Validierung scheitert.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1041

by Mathias Kettner

Module: check_mk Branch: master Commit: 96ff54a7e4d3180d8912f0d448111908de3cd16b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96ff54a7e4d318… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 12:33:09 2013 +0200 Updated bug entries #1041 --- .bugs/1041 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/1041 b/.bugs/1041 index 3e42e18..10404d3 100644 --- a/.bugs/1041 +++ b/.bugs/1041 @@ -1,12 +1,16 @@ Title: cmc problem with parents Component: core -State: open +Class: bug +State: done Date: 2013-08-30 12:37:32 Targetversion: 1.2.3 -Class: bug when running site with cmc, parents of a host are not shown in multisite gui in host status page even if there are configured some maybe parent hosts are ignored completely?? if running the same site with nagios core, the parents are displayed on host status page + +2013-10-03 12:33:07: changed state open -> done +War wohl das Cache-Program von NagVis mit program_start, das +inzwischen behoben ist.

10 years, 11 months

← Newer
1
...
31
32
33
34
35
36
37
38
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013