Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

check_levels: Allow dsname=None in order to skip perfdata

by Simon Betz

Module: check_mk Branch: master Commit: 2562c2048eff53279b37a96cead024fcb3da9a30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2562c2048eff53… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 5 10:54:55 2019 +0200 check_levels: Allow dsname=None in order to skip perfdata Change-Id: I0fb363f2ce7355f3857dc3ff175ccaaec44ca2c8 --- cmk_base/check_api.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 20fa1bc..3258bae 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -383,6 +383,7 @@ def check_levels(value, value: currently measured value dsname: name of the datasource in the RRD that corresponds to this value + or None in order to skip perfdata params: None or Tuple(None, None) -> no level checking. Tuple variants with non-None values: Tuple[warn_upper, crit_upper] -> upper level checking only. @@ -438,10 +439,11 @@ def check_levels(value, else: infotext = "%s%s" % (human_readable_func(value), unit_info) - perf_value = (dsname, value) # None, {} or (None, None) -> do not check any levels if not params or params == (None, None): - return 0, infotext, [perf_value] + if dsname: + return 0, infotext, [(dsname, value)] + return 0, infotext, [] # Pair of numbers -> static levels elif isinstance(params, tuple): @@ -478,9 +480,12 @@ def check_levels(value, if statemarkers: infotext += state_markers[state] - perfdata = [perf_value + tuple(levels[:2])] - if ref_value: - perfdata.append(('predict_' + dsname, ref_value)) + if dsname: + perfdata = [(dsname, value, levels[0], levels[1])] + if ref_value: + perfdata.append(('predict_' + dsname, ref_value)) + else: + perfdata = [] return state, infotext, perfdata

5 years, 6 months

mongodb_collections: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: c7ec7aad2563699712f7f4c80f7a484b74cf10df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7ec7aad256369… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 09:10:16 2019 +0200 mongodb_collections: add test Change-Id: If6986f07d5c470ce5d163fa9a858b3974241190a --- .../generictests/datasets/mongodb_collections_1.py | 177 +++++++++++++++++++++ 1 file changed, 177 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7ec7aad25…

5 years, 6 months

Use std::string more often, improving readability quite a lot.

by Sven Panne

Module: check_mk Branch: master Commit: 620965d4eef2417433ca8cd483d2e907d9ec3ee9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=620965d4eef241… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 4 13:32:00 2019 +0200 Use std::string more often, improving readability quite a lot. Change-Id: Ibe1057783f69f3961f09d48296418c1f898b3249 --- livestatus/src/OffsetStringMacroColumn.cc | 79 +++++++++++++++---------------- livestatus/src/OffsetStringMacroColumn.h | 6 +-- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/livestatus/src/OffsetStringMacroColumn.cc b/livestatus/src/OffsetStringMacroColumn.cc index e902b76..f6d0994 100644 --- a/livestatus/src/OffsetStringMacroColumn.cc +++ b/livestatus/src/OffsetStringMacroColumn.cc @@ -24,10 +24,10 @@ #include "OffsetStringMacroColumn.h" #include <cstdlib> -#include <cstring> #include "Column.h" #include "RegExp.h" #include "Row.h" +#include "StringUtils.h" std::string OffsetStringMacroColumn::getValue(Row row) const { // TODO(sp): Use _mc! @@ -44,104 +44,101 @@ std::string OffsetStringMacroColumn::getValue(Row row) const { std::string OffsetStringMacroColumn::expandMacros(const std::string &raw, const host *hst, const service *svc) { - // search for macro names, beginning with $ std::string result; - const char *scan = raw.c_str(); - while (*scan != 0) { - const char *dollar = strchr(scan, '$'); - if (dollar == nullptr) { - result += scan; + size_t pos = 0; + while (pos < raw.size()) { + auto start = raw.find('$', pos); + if (start == std::string::npos) { + result += raw.substr(pos); break; } - result += std::string(scan, dollar - scan); - const char *otherdollar = strchr(dollar + 1, '$'); - if (otherdollar == nullptr) { // unterminated macro, do not expand - result += dollar; + auto end = raw.find('$', start + 1); + if (end == std::string::npos) { + result += raw.substr(pos); break; } - std::string macroname = - std::string(dollar + 1, otherdollar - dollar - 1); - const char *replacement = expandMacro(macroname.c_str(), hst, svc); - if (replacement != nullptr) { - result += replacement; + auto macroname = raw.substr(start + 1, end - (start + 1)); + if (auto replacement = expandMacro(macroname, hst, svc)) { + result += raw.substr(pos, start - pos) + replacement; } else { - result += std::string( - dollar, otherdollar - dollar + 1); // leave macro unexpanded + result += raw.substr(pos, end + 1 - pos); } - scan = otherdollar + 1; + pos = end + 1; } return result; } // static -const char *OffsetStringMacroColumn::expandMacro(const char *macroname, +const char *OffsetStringMacroColumn::expandMacro(const std::string &macroname, const host *hst, const service *svc) { // host macros - if (strcmp(macroname, "HOSTNAME") == 0) { + if (macroname == "HOSTNAME") { return hst->name; } - if (strcmp(macroname, "HOSTDISPLAYNAME") == 0) { + if (macroname == "HOSTDISPLAYNAME") { return hst->display_name; } - if (strcmp(macroname, "HOSTALIAS") == 0) { + if (macroname == "HOSTALIAS") { return hst->alias; } - if (strcmp(macroname, "HOSTADDRESS") == 0) { + if (macroname == "HOSTADDRESS") { return hst->address; } - if (strcmp(macroname, "HOSTOUTPUT") == 0) { + if (macroname == "HOSTOUTPUT") { return hst->plugin_output; } - if (strcmp(macroname, "LONGHOSTOUTPUT") == 0) { + if (macroname == "LONGHOSTOUTPUT") { return hst->long_plugin_output; } - if (strcmp(macroname, "HOSTPERFDATA") == 0) { + if (macroname == "HOSTPERFDATA") { return hst->perf_data; } - if (strcmp(macroname, "HOSTCHECKCOMMAND") == 0) { + if (macroname == "HOSTCHECKCOMMAND") { #ifndef NAGIOS4 return hst->host_check_command; #else return hst->check_command; #endif // NAGIOS4 } - if (strncmp(macroname, "_HOST", 5) == 0) { // custom macro - return expandCustomVariables(macroname + 5, hst->custom_variables); + if (mk::starts_with(macroname, "_HOST")) { // custom macro + return expandCustomVariables(macroname.substr(5), + hst->custom_variables); // service macros } if (svc != nullptr) { - if (strcmp(macroname, "SERVICEDESC") == 0) { + if (macroname == "SERVICEDESC") { return svc->description; } - if (strcmp(macroname, "SERVICEDISPLAYNAME") == 0) { + if (macroname == "SERVICEDISPLAYNAME") { return svc->display_name; } - if (strcmp(macroname, "SERVICEOUTPUT") == 0) { + if (macroname == "SERVICEOUTPUT") { return svc->plugin_output; } - if (strcmp(macroname, "LONGSERVICEOUTPUT") == 0) { + if (macroname == "LONGSERVICEOUTPUT") { return svc->long_plugin_output; } - if (strcmp(macroname, "SERVICEPERFDATA") == 0) { + if (macroname == "SERVICEPERFDATA") { return svc->perf_data; } - if (strcmp(macroname, "SERVICECHECKCOMMAND") == 0) { + if (macroname == "SERVICECHECKCOMMAND") { #ifndef NAGIOS4 return svc->service_check_command; #else return svc->check_command; #endif // NAGIOS4 } - if (strncmp(macroname, "_SERVICE", 8) == 0) { // custom macro - return expandCustomVariables(macroname + 8, svc->custom_variables); + if (mk::starts_with(macroname, "_SERVICE")) { // custom macro + return expandCustomVariables(macroname.substr(8), + svc->custom_variables); } } // USER macros - if (strncmp(macroname, "USER", 4) == 0) { - int n = atoi(macroname + 4); + if (mk::starts_with(macroname, "USER")) { + int n = atoi(macroname.substr(4).c_str()); if (n > 0 && n <= MAX_USER_MACROS) { extern char *macro_user[MAX_USER_MACROS]; return macro_user[n - 1]; @@ -153,7 +150,7 @@ const char *OffsetStringMacroColumn::expandMacro(const char *macroname, // static const char *OffsetStringMacroColumn::expandCustomVariables( - const char *varname, const customvariablesmember *custvars) { + const std::string &varname, const customvariablesmember *custvars) { RegExp regExp(varname, RegExp::Case::ignore, RegExp::Syntax::literal); for (; custvars != nullptr; custvars = custvars->next) { if (regExp.match(custvars->variable_name)) { diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index 595f111..ecbb3c8 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -54,10 +54,10 @@ private: static std::string expandMacros(const std::string &raw, const host *hst, const service *svc); - static const char *expandMacro(const char *macroname, const host *hst, - const service *svc); + static const char *expandMacro(const std::string &macroname, + const host *hst, const service *svc); static const char *expandCustomVariables( - const char *varname, const customvariablesmember *custvars); + const std::string &varname, const customvariablesmember *custvars); }; #endif // OffsetStringMacroColumn_h

5 years, 6 months

added WK7254: Background Jobs: Fixed bug on several job detail pages, stating the job is stuck in initialized phase

by Andreas Boesl

Module: check_mk Branch: master Commit: c8d356c424c3d2c0cf5d18e3d3cdb1ffabd6849a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8d356c424c3d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 10:44:39 2019 +0200 added WK7254: Background Jobs: Fixed bug on several job detail pages, stating the job is stuck in initialized phase Change-Id: I62012b483611f500ee6d0737eaeb37578e673efd --- .werks/7254 | 13 +++++++++++++ cmk/gui/background_job.py | 15 +++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/7254 b/.werks/7254 new file mode 100644 index 0000000..b78ab25 --- /dev/null +++ b/.werks/7254 @@ -0,0 +1,13 @@ +Title: Background Jobs: Fixed bug on several job detail pages, stating the job is stuck in "initialized" phase +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554382214 + +The <tt>Bake agents</tt> or <tt>Download agent output</tt> background job details pages incorrectly showed the jobstatus as initialized. +This error solely was a display bug and was caused by invalid parsing of the jobs statefile. +The actual background job was running fine. diff --git a/cmk/gui/background_job.py b/cmk/gui/background_job.py index 7a6307c..f37140a 100644 --- a/cmk/gui/background_job.py +++ b/cmk/gui/background_job.py @@ -310,19 +310,18 @@ class BackgroundJob(object): ]: return False + if job_status["state"] == JobStatus.state_initialized: + # The process was created a millisecond ago + # The child process however, did not have time to update the statefile with its PID + # We consider this scenario as OK, if the start time was recent enough + if time.time() - job_status["started"] < 5: # 5 seconds + return True + if job_status["pid"] is None: return False try: p = psutil.Process(job_status["pid"]) - if job_status["state"] == JobStatus.state_initialized: - # The process was just created, but has/may not been renamed yet - # Additionally it has no open file handle to the status file - # The _is_correct_process check will fail in this gray area - # We consider this scenario as OK, if the start time was recent enough - if time.time() - job_status["started"] < 5: # 5 seconds - return True - if self._is_correct_process(job_status, p): return True except (psutil.NoSuchProcess, psutil.AccessDenied):

5 years, 6 months

mk_mongodb: fix handling of state file

by Moritz Kiemer

Module: check_mk Branch: master Commit: cebef02d2d29e44b5acbcd3a60a5862d6b8c78c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cebef02d2d29e4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 08:28:06 2019 +0200 mk_mongodb: fix handling of state file reading: * use context manager * handle missing read permission and invalid content * avoid returning (None, False) which would have crashed updateing: * moved to function * use context manager * handle missing write permission and invalid timestamp Change-Id: Id80d9b1d183be3b6a337178ff6f7b6215fbc5ce2 --- agents/plugins/mk_mongodb | 52 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index c4dfdeb..4159a38 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -126,7 +126,8 @@ def section_by_keys(section_name, keys, server_status, output_key=False): def get_timestamp(text): - """parse timestamps like 'Nov 6 13:44:09' or '2015-10-17T05:35:24'""" + """parse timestamps like 'Nov 6 13:44:09.345' or '2015-10-17T05:35:24.234'""" + text = text.split('.')[0] for pattern in ["%a %b %d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"]: try: return time.mktime(time.strptime(text, pattern)) @@ -135,24 +136,36 @@ def get_timestamp(text): def read_statefile(state_file): - last_timestamp = None - output_all = False - year_available = False - if os.path.exists(state_file): - last_timestamp = int(file(state_file).read()) - if time.localtime(last_timestamp).tm_year >= 2015: - year_available = True - - # Note: there is no year information in these loglines - # As workaround we look at the creation date (year) of the last statefile - # If it differs and there are new messages we start from the beginning - if not year_available: - statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year - if time.localtime().tm_year != statefile_year: - output_all = True + try: + with open(state_file) as state_fd: + last_timestamp = int(state_fd.read()) + except (IOError, ValueError): + return None, True + + if time.localtime(last_timestamp).tm_year >= 2015: + return last_timestamp, False + + # Note: there is no year information in these loglines + # As workaround we look at the creation date (year) of the last statefile + # If it differs and there are new messages we start from the beginning + statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year + output_all = time.localtime().tm_year != statefile_year return last_timestamp, output_all +def update_statefile(state_file, startup_warnings): + lines = startup_warnings.get("log") + if not lines: + return + timestamp = get_timestamp(lines[-1]) + try: + with open(state_file, 'w') as state_fd: + state_fd.write("%d" % timestamp) + except (IOError, TypeError): + # TypeError: timestamp was None, but at least ctime is updated. + pass + + def section_logwatch(client): if not MK_VARDIR: return @@ -174,13 +187,10 @@ def section_logwatch(client): if "** WARNING:" in line: state = "W" - if output_all or get_timestamp(line.split(".")[0]) > last_timestamp: + if output_all or get_timestamp(line) > last_timestamp: sys.stdout.write("%s %s\n" % (state, line)) - # update state file - if startup_warnings["log"]: - timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) - file(state_file, "w").write("%d" % timestamp) + update_statefile(state_file, startup_warnings) def main():

5 years, 6 months

mongodb_collections: some refactoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2119b1c933bd95f097539b846eb2cc519bda266f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2119b1c933bd95… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 15:50:46 2019 +0200 mongodb_collections: some refactoring Change-Id: I914de6e0f2b450d5e1f99e60cf3d6a3dda7c0a98 --- checks/mongodb_collections | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/checks/mongodb_collections b/checks/mongodb_collections index bd681a8..5c5208c 100644 --- a/checks/mongodb_collections +++ b/checks/mongodb_collections @@ -39,19 +39,24 @@ def parse_mongodb_collections(info): + required_keys_int = ("size", "storageSize") parsed = {} for line in info: db_name, collection, key, value = line data = parsed.setdefault("%s %s" % (db_name, collection), {}) - data[key] = value + if key in required_keys_int: + try: + data[key] = int(value) + except ValueError: + pass return parsed def check_mongodb_collections(item, params, parsed): fslist_blocks = [] for coll_item, values in parsed.items(): - used_mb = float(values["size"]) / 1024.0**2 - total_mb = float(values["storageSize"]) / 1024.0**2 + used_mb = values["size"] / 1024.0**2 + total_mb = values["storageSize"] / 1024.0**2 fslist_blocks.append((coll_item, total_mb, total_mb - used_mb, 0)) return df_check_filesystem_list(item, params, fslist_blocks)

5 years, 6 months

mk_mongodb: refactor reading of state file

by Moritz Kiemer

Module: check_mk Branch: master Commit: 659b58ca1b5733e4c885ac186154e37e25312759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=659b58ca1b5733… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 08:06:34 2019 +0200 mk_mongodb: refactor reading of state file Change-Id: Ifd1d69c0537a51d596e3fdafbf0cd89a0d9374d3 --- agents/plugins/mk_mongodb | 97 +++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 6f04ac4..c4dfdeb 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -125,57 +125,62 @@ def section_by_keys(section_name, keys, server_status, output_key=False): sys.stdout.write(fmt % item) +def get_timestamp(text): + """parse timestamps like 'Nov 6 13:44:09' or '2015-10-17T05:35:24'""" + for pattern in ["%a %b %d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"]: + try: + return time.mktime(time.strptime(text, pattern)) + except ValueError: + pass + + +def read_statefile(state_file): + last_timestamp = None + output_all = False + year_available = False + if os.path.exists(state_file): + last_timestamp = int(file(state_file).read()) + if time.localtime(last_timestamp).tm_year >= 2015: + year_available = True + + # Note: there is no year information in these loglines + # As workaround we look at the creation date (year) of the last statefile + # If it differs and there are new messages we start from the beginning + if not year_available: + statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year + if time.localtime().tm_year != statefile_year: + output_all = True + return last_timestamp, output_all + + def section_logwatch(client): - # TODO: this produces an empty section if MK_VARDIR is not set. Intended? + if not MK_VARDIR: + return + sys.stdout.write("<<<logwatch>>>\n") sys.stdout.write("[[[MongoDB startupWarnings]]]\n") startup_warnings = client.admin.command({"getLog": "startupWarnings"}) - if MK_VARDIR: - state_file = "%s/mongodb.state" % MK_VARDIR - last_timestamp = None - output_all = False - - # Supports: Nov 6 13:44:09 - # 2015-10-17T05:35:24 - def get_timestamp(text): - for pattern in ["%a %b %d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"]: - try: - result = time.mktime(time.strptime(text, pattern)) - return result - except Exception: # pylint: disable=broad-except - continue - - year_available = False - if os.path.exists(state_file): - last_timestamp = int(file(state_file).read()) - if time.localtime(last_timestamp).tm_year >= 2015: - year_available = True - - # Note: there is no year information in these loglines - # As workaround we look at the creation date (year) of the last statefile - # If it differs and there are new messages we start from the beginning - if not year_available: - statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year - if time.localtime().tm_year != statefile_year: - output_all = True - - for line in startup_warnings["log"]: - state = "C" - state_index = line.find("]") + 2 - if len(line) == state_index or line[state_index:].startswith("** "): - state = "." - - if "** WARNING:" in line: - state = "W" - - if output_all or get_timestamp(line.split(".")[0]) > last_timestamp: - sys.stdout.write("%s %s\n" % (state, line)) - - # update state file - if startup_warnings["log"]: - timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) - file(state_file, "w").write("%d" % timestamp) + state_file = "%s/mongodb.state" % MK_VARDIR + + last_timestamp, output_all = read_statefile(state_file) + + for line in startup_warnings["log"]: + state = "C" + state_index = line.find("]") + 2 + if len(line) == state_index or line[state_index:].startswith("** "): + state = "." + + if "** WARNING:" in line: + state = "W" + + if output_all or get_timestamp(line.split(".")[0]) > last_timestamp: + sys.stdout.write("%s %s\n" % (state, line)) + + # update state file + if startup_warnings["log"]: + timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) + file(state_file, "w").write("%d" % timestamp) def main():

5 years, 6 months

mongodb_collections: simplify

by Moritz Kiemer

Module: check_mk Branch: master Commit: 049db5a26167ec92c0a3a06519c1a206cbd493d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049db5a26167ec… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 15:24:33 2019 +0200 mongodb_collections: simplify Change-Id: I7c9d507d25d4f4bdc8d394f336922893ccff5c1c --- checks/mongodb_collections | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/checks/mongodb_collections b/checks/mongodb_collections index 2c9d1ec..bd681a8 100644 --- a/checks/mongodb_collections +++ b/checks/mongodb_collections @@ -39,23 +39,14 @@ def parse_mongodb_collections(info): - databases = {} - for line in info: - db, coll, what, value = line - databases.setdefault(db, {}).setdefault(coll, {})[what] = value - parsed = {} - for db, collections in databases.items(): - for collection, values in collections.items(): - parsed["%s %s" % (db, collection)] = values + for line in info: + db_name, collection, key, value = line + data = parsed.setdefault("%s %s" % (db_name, collection), {}) + data[key] = value return parsed -def inventory_mongodb_collections(parsed): - for item in parsed: - yield item, {} - - def check_mongodb_collections(item, params, parsed): fslist_blocks = [] for coll_item, values in parsed.items(): @@ -68,8 +59,8 @@ def check_mongodb_collections(item, params, parsed): check_info["mongodb_collections"] = { "parse_function": parse_mongodb_collections, + "inventory_function": discover(), "check_function": check_mongodb_collections, - "inventory_function": inventory_mongodb_collections, "service_description": "MongoDB Collection %s", "group": "mongodb_collections", "default_levels_variable": "filesystem_default_levels",

5 years, 6 months

mk_mongodb: refactor even more

by Moritz Kiemer

Module: check_mk Branch: master Commit: f673a852737f23687738bd9e90fdadbcdac4eccd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f673a852737f23… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 14:15:03 2019 +0200 mk_mongodb: refactor even more Change-Id: I6089fd9253c6f926f8c92b13585ff62d5c06c4d7 --- agents/plugins/mk_mongodb | 106 ++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index f4c7fd1..6f04ac4 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -19,6 +19,8 @@ from contextlib import contextmanager import pymongo # pylint: disable=import-error +MK_VARDIR = os.environ.get("MK_VARDIR") + @contextmanager def piggyback(info): @@ -123,6 +125,59 @@ def section_by_keys(section_name, keys, server_status, output_key=False): sys.stdout.write(fmt % item) +def section_logwatch(client): + # TODO: this produces an empty section if MK_VARDIR is not set. Intended? + sys.stdout.write("<<<logwatch>>>\n") + sys.stdout.write("[[[MongoDB startupWarnings]]]\n") + startup_warnings = client.admin.command({"getLog": "startupWarnings"}) + + if MK_VARDIR: + state_file = "%s/mongodb.state" % MK_VARDIR + last_timestamp = None + output_all = False + + # Supports: Nov 6 13:44:09 + # 2015-10-17T05:35:24 + def get_timestamp(text): + for pattern in ["%a %b %d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"]: + try: + result = time.mktime(time.strptime(text, pattern)) + return result + except Exception: # pylint: disable=broad-except + continue + + year_available = False + if os.path.exists(state_file): + last_timestamp = int(file(state_file).read()) + if time.localtime(last_timestamp).tm_year >= 2015: + year_available = True + + # Note: there is no year information in these loglines + # As workaround we look at the creation date (year) of the last statefile + # If it differs and there are new messages we start from the beginning + if not year_available: + statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year + if time.localtime().tm_year != statefile_year: + output_all = True + + for line in startup_warnings["log"]: + state = "C" + state_index = line.find("]") + 2 + if len(line) == state_index or line[state_index:].startswith("** "): + state = "." + + if "** WARNING:" in line: + state = "W" + + if output_all or get_timestamp(line.split(".")[0]) > last_timestamp: + sys.stdout.write("%s %s\n" % (state, line)) + + # update state file + if startup_warnings["log"]: + timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) + file(state_file, "w").write("%d" % timestamp) + + def main(): # might be implemented in the future.. host = None @@ -186,56 +241,7 @@ def potentially_piggybacked_sections(client, server_status): for what, value in colldata.items(): sys.stdout.write("%s\t%s\t%s\t%s\n" % (dbname, collname, what, value)) - sys.stdout.write("<<<logwatch>>>\n") - sys.stdout.write("[[[MongoDB startupWarnings]]]\n") - startup_warnings = client.admin.command({"getLog": "startupWarnings"}) - - var_dir = os.environ.get("MK_VARDIR") - if var_dir: - state_file = "%s/mongodb.state" % var_dir - last_timestamp = None - output_all = False - - # Supports: Nov 6 13:44:09 - # 2015-10-17T05:35:24 - def get_timestamp(text): - for pattern in ["%a %b %d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"]: - try: - result = time.mktime(time.strptime(text, pattern)) - return result - except Exception: # pylint: disable=broad-except - continue - - year_available = False - if os.path.exists(state_file): - last_timestamp = int(file(state_file).read()) - if time.localtime(last_timestamp).tm_year >= 2015: - year_available = True - - # Note: there is no year information in these loglines - # As workaround we look at the creation date (year) of the last statefile - # If it differs and there are new messages we start from the beginning - if not year_available: - statefile_year = time.localtime(os.stat(state_file).st_ctime).tm_year - if time.localtime().tm_year != statefile_year: - output_all = True - - for line in startup_warnings["log"]: - state = "C" - state_index = line.find("]") + 2 - if len(line) == state_index or line[state_index:].startswith("** "): - state = "." - - if "** WARNING:" in line: - state = "W" - - if output_all or get_timestamp(line.split(".")[0]) > last_timestamp: - sys.stdout.write("%s %s\n" % (state, line)) - - # update state file - if startup_warnings["log"]: - timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) - file(state_file, "w").write("%d" % timestamp) + section_logwatch(client) if __name__ == "__main__":

5 years, 6 months

GUI CSS: Fixed server time snapin styles to not affect other time divs

by Kenneth Okoh

Module: check_mk Branch: master Commit: 51579eca3c574f4fd5a578ec4eea7678ce14fb24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51579eca3c574f… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Apr 4 15:53:26 2019 +0200 GUI CSS: Fixed server time snapin styles to not affect other time divs Change-Id: I6f18e28bf4cd13094cecd155d60cc6aa264c0a98 --- web/htdocs/themes/classic/scss/_snapins.scss | 2 +- web/htdocs/themes/facelift/scss/_snapins.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/themes/classic/scss/_snapins.scss b/web/htdocs/themes/classic/scss/_snapins.scss index 46ef9de..fafdb79 100644 --- a/web/htdocs/themes/classic/scss/_snapins.scss +++ b/web/htdocs/themes/classic/scss/_snapins.scss @@ -202,7 +202,7 @@ table.performance { /* * Server time snapin */ -div.time { +#snapin_time div.time { width: 228px; font-size: 24px; font-weight: bold; diff --git a/web/htdocs/themes/facelift/scss/_snapins.scss b/web/htdocs/themes/facelift/scss/_snapins.scss index f7a4e15..2b2bdb2 100644 --- a/web/htdocs/themes/facelift/scss/_snapins.scss +++ b/web/htdocs/themes/facelift/scss/_snapins.scss @@ -235,7 +235,7 @@ table.performance { /* * Server time snapin */ -div.time { +#snapin_time div.time { width: $theme-snapin-width - 2px; padding: 8px; font-size: 24px;

5 years, 6 months

← Newer
1
...
41
42
43
44
45
46
47
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019