Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

mkbackup: Fixed encoding when outputting not to tty

by Lars Michelsen

Module: check_mk Branch: master Commit: aee3121dfd0ba5bb01158eee9dc22a986f31df24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aee3121dfd0ba5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 08:12:42 2017 +0200 mkbackup: Fixed encoding when outputting not to tty Change-Id: Ief5c498205dd910ff32aa220364d18ff9d6592d3 --- bin/mkbackup | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 96010a4..9513594 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1832,7 +1832,7 @@ def mode_jobs(opts): sys.stdout.write(fmt % ("Job-ID", "Title")) sys.stdout.write("%s\n" % ("-" * 60)) for job_id, job_cfg in sorted(g_config["jobs"].items(), key=lambda (x, y): x): - sys.stdout.write(fmt % (job_id, job_cfg["title"])) + sys.stdout.write(fmt % (job_id, job_cfg["title"].encode("utf-8"))) def mode_targets(opts): @@ -1840,7 +1840,7 @@ def mode_targets(opts): sys.stdout.write(fmt % ("Target-ID", "Title")) sys.stdout.write("%s\n" % ("-" * 60)) for job_id, job_cfg in sorted(g_config["targets"].items(), key=lambda (x, y): x): - sys.stdout.write(fmt % (job_id, job_cfg["title"])) + sys.stdout.write(fmt % (job_id, job_cfg["title"].encode("utf-8"))) def usage(error=None): @@ -1967,18 +1967,19 @@ def main(): globals()["mode_%s" % mode_name](*mode_args, opts=opt_dict) -try: - main() -except MKTerminate, e: - sys.stderr.write("%s\n" % e) - sys.exit(1) - -except KeyboardInterrupt: - sys.stderr.write("Terminated.\n") - sys.exit(0) - -except MKGeneralException, e: - sys.stderr.write("%s\n" % e) - if opt_debug: - raise - sys.exit(3) +if __name__ == "__main__": + try: + main() + except MKTerminate, e: + sys.stderr.write("%s\n" % e) + sys.exit(1) + + except KeyboardInterrupt: + sys.stderr.write("Terminated.\n") + sys.exit(0) + + except MKGeneralException, e: + sys.stderr.write("%s\n" % e) + if opt_debug: + raise + sys.exit(3)

6 years, 10 months

Add basic tests for mkbackup command line calls

by Lars Michelsen

Module: check_mk Branch: master Commit: e6a4c8e889a3ff60353582dbc43f9f64f6f3cb3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6a4c8e889a3ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 08:13:50 2017 +0200 Add basic tests for mkbackup command line calls Change-Id: I805e4a1c1fdf9c25f75afe0e1a9893b7fb332275 --- tests/bin/test_mkbackup.py | 211 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6a4c8e889…

6 years, 10 months

Various simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: 951221416577f9b03c136178b8d508fe9be140d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=951221416577f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 25 15:28:10 2017 +0200 Various simplifications. Change-Id: I5c48ee3c194e6c2b1332b8b98464ebdce800e1a5 --- livestatus/src/pnp4nagios.cc | 26 +++----------------------- livestatus/src/pnp4nagios.h | 13 +------------ 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 50b7aeb..46d9204 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -24,14 +24,11 @@ #include "pnp4nagios.h" #include <cstddef> -#include <system_error> -#include "MonitoringCore.h" -#ifdef CMC -#include "Object.h" -#include "Host.h" -#else +#ifndef CMC +#include <system_error> #include "FileSystem.h" +#include "MonitoringCore.h" #endif using std::string; @@ -68,20 +65,3 @@ int pnpgraph_present(MonitoringCore* mc, const string& host, return ec ? 0 : 1; } #endif - -#ifdef CMC -// TODO(sp) Merge this with Perfdatabase::getPNPRRDPath -fs::path rrd_path(MonitoringCore* mc, const Object* object, - const string& varname) { - fs::path pnp_path = mc->pnpPath(); - if (pnp_path.empty()) { - return ""; - } - fs::path path = pnp_path / pnp_cleanup(object->host()->name()) / - (pnp_cleanup(object->serviceDescription()) + "_" + - pnp_cleanup(varname) + ".rrd"); - std::error_code ec; - fs::status(path, ec); - return ec ? "" : path; -} -#endif diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 5990223..3800d76 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -27,11 +27,8 @@ #include "config.h" // IWYU pragma: keep #include <string> +#ifndef CMC class MonitoringCore; - -#ifdef CMC -#include "FileSystem.h" -class Object; #endif inline std::string dummy_service_description() { return "_HOST_"; } @@ -43,12 +40,4 @@ int pnpgraph_present(MonitoringCore* mc, const std::string& host, const std::string& service); #endif -#ifdef CMC -// Determines if a RRD database exists and returns its path name. Returns an -// empty string otherwise. This assumes paths created in the PNP4Nagios style -// with storage type MULTIPLE. -fs::path rrd_path(MonitoringCore* mc, const Object* object, - const std::string& varname); -#endif - #endif // pnp4nagios_h

6 years, 10 months

Centralized magic service description plus tiny cleanups.

by Sven Panne

Module: check_mk Branch: master Commit: 02a80d7e7d35e17f4e9ada6fac419b03a491980a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02a80d7e7d35e1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 25 10:22:59 2017 +0200 Centralized magic service description plus tiny cleanups. Change-Id: Ib74c7bda02fce06653cca598504e710b19fac70b --- livestatus/src/HostSpecialIntColumn.cc | 3 ++- livestatus/src/pnp4nagios.cc | 13 ++++++++----- livestatus/src/pnp4nagios.h | 9 ++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index 6234b14..fbac0a0 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -45,7 +45,8 @@ int32_t HostSpecialIntColumn::getValue(Row row, } case Type::pnp_graph_present: - return pnpgraph_present(_mc, hst->name); + return pnpgraph_present(_mc, hst->name, + dummy_service_description()); case Type::mk_inventory_last: { return mk_inventory_last(_mc->mkInventoryPath() + "/" + diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index af39f7d..50b7aeb 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -27,7 +27,10 @@ #include <system_error> #include "MonitoringCore.h" -#ifndef CMC +#ifdef CMC +#include "Object.h" +#include "Host.h" +#else #include "FileSystem.h" #endif @@ -68,15 +71,15 @@ int pnpgraph_present(MonitoringCore* mc, const string& host, #ifdef CMC // TODO(sp) Merge this with Perfdatabase::getPNPRRDPath -fs::path rrd_path(MonitoringCore* mc, const string& host, const string& service, +fs::path rrd_path(MonitoringCore* mc, const Object* object, const string& varname) { fs::path pnp_path = mc->pnpPath(); if (pnp_path.empty()) { return ""; } - fs::path path = - pnp_path / pnp_cleanup(host) / - (pnp_cleanup(service) + "_" + pnp_cleanup(varname) + ".rrd"); + fs::path path = pnp_path / pnp_cleanup(object->host()->name()) / + (pnp_cleanup(object->serviceDescription()) + "_" + + pnp_cleanup(varname) + ".rrd"); std::error_code ec; fs::status(path, ec); return ec ? "" : path; diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 3be82a1..5990223 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -31,21 +31,24 @@ class MonitoringCore; #ifdef CMC #include "FileSystem.h" +class Object; #endif +inline std::string dummy_service_description() { return "_HOST_"; } + std::string pnp_cleanup(const std::string& name); #ifndef CMC int pnpgraph_present(MonitoringCore* mc, const std::string& host, - const std::string& service = "_HOST_"); + const std::string& service); #endif #ifdef CMC // Determines if a RRD database exists and returns its path name. Returns an // empty string otherwise. This assumes paths created in the PNP4Nagios style // with storage type MULTIPLE. -fs::path rrd_path(MonitoringCore* mc, const std::string& host, - const std::string& service, const std::string& varname); +fs::path rrd_path(MonitoringCore* mc, const Object* object, + const std::string& varname); #endif #endif // pnp4nagios_h

6 years, 10 months

Check_MK was unable to handle cached tcp data greater than 10MB

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c5b913474a6c8e0cee3b31f50a4ae7c32f0e0cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5b913474a6c8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 24 16:12:17 2017 +0200 Check_MK was unable to handle cached tcp data greater than 10MB Change-Id: I59acb681bdce819bbf98b86c3ca34f062e097981 --- .werks/4856 | 12 ++++++++++++ cmk_base/agent_data.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4856 b/.werks/4856 new file mode 100644 index 0000000..ca47a89 --- /dev/null +++ b/.werks/4856 @@ -0,0 +1,12 @@ +Title: Check_MK was unable to handle cached tcp data greater than 10MB +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1503583733 + +With this werk, Check_MK is unable to handle cached tcp data greater than 100MB. + diff --git a/cmk_base/agent_data.py b/cmk_base/agent_data.py index 5183715..8b7806b 100644 --- a/cmk_base/agent_data.py +++ b/cmk_base/agent_data.py @@ -566,7 +566,7 @@ def read_cache_file(relpath, max_cache_age): or (config.simulation_mode and not _no_cache) ): if cmk_base.utils.cachefile_age(cachefile) <= max_cache_age or config.simulation_mode: f = open(cachefile, "r") - result = f.read(10000000) + result = f.read(100000000) f.close() if len(result) > 0: console.verbose("Using data from cachefile %s.\n" % cachefile)

6 years, 10 months

Reserved 10 Werk IDS

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 11e5f8b3ce3c04007cba5396d72985ff14ee4966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e5f8b3ce3c04… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 24 14:32:22 2017 +0200 Reserved 10 Werk IDS Change-Id: I8493b5c28d11b2c4f1a6967c07ef1cf498613c7e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 70a0dd7..e10a919 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5128 +5138

6 years, 10 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 4afd5866c6e11e7417fffc32fdfa2868c40de711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4afd5866c6e11e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 24 13:09:37 2017 +0200 Reserved 10 Werk IDS Change-Id: I9da56e4050b43fdb27fc4df97a6da68c3c01e1a1 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5d8510a..70a0dd7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5118 +5128

6 years, 10 months

Use the right clock to measure durations.

by Sven Panne

Module: check_mk Branch: master Commit: 78da9233f8a08046b0d332975f6e780aed6e0399 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78da9233f8a080… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 23 11:59:01 2017 +0200 Use the right clock to measure durations. system_clock is not guaranteed to be steady, it's a wall clock. Change-Id: I7cdcedc8315c434b1b68d7895c7d767996aa2274 --- livestatus/src/ChronoUtils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index 1073138..ca78ff8 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -36,9 +36,9 @@ using minutes_d = std::chrono::duration<double, std::ratio<60>>; -inline double elapsed_ms_since(std::chrono::system_clock::time_point then) { +inline double elapsed_ms_since(std::chrono::steady_clock::time_point then) { using namespace std::chrono; - return duration_cast<duration<double, std::milli>>(system_clock::now() - + return duration_cast<duration<double, std::milli>>(steady_clock::now() - then) .count(); }

6 years, 10 months

5116 FIX if.include: Fixed wrong handling of duplicate interfaces if " use alias" or "use desccription" is configured

by Simon Betz

Module: check_mk Branch: master Commit: bc40e7d393cbadaeb01c46e396b49039a9aba5c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc40e7d393cbad… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 23 11:51:10 2017 +0200 5116 FIX if.include: Fixed wrong handling of duplicate interfaces if "use alias" or "use desccription" is configured Within the rule {{Network Interface and Switch Port Discovery}} you are able to configure the service description to use the interface alias or description. Per default the index is used. If there are duplicate interfaces with same name, the interface index should be added. Unfortunately, the afore-mentioned mechanism was broken. This has been fixed. Change-Id: I44221ac4b1323e551ce9758041fae192baa38405 --- .werks/5116 | 19 +++++++++++++++++++ checks/if.include | 35 ++++++++++++++--------------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.werks/5116 b/.werks/5116 new file mode 100644 index 0000000..8f03058 --- /dev/null +++ b/.werks/5116 @@ -0,0 +1,19 @@ +Title: if.include: Fixed wrong handling of duplicate interfaces if "use alias" or "use desccription" is configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1503481848 + +Within the rule {{Network Interface and Switch Port Discovery}} +you are able to configure the service description to use the +interface alias or description. Per default the index is used. +If there are duplicate interfaces with same name, the interface +index should be added. + + +Unfortunately, the afore-mentioned mechanism was broken. This +has been fixed. diff --git a/checks/if.include b/checks/if.include index 3d0a3ed..5b76a66 100644 --- a/checks/if.include +++ b/checks/if.include @@ -321,8 +321,6 @@ def inventory_if_common(info, has_nodeinfo = False): group_patterns = _prepare_if_group_patterns_from_conf() local_seen = set() - seen_items = set() - duplicate = set() have_groups = {} # Determine whether single, grouped or both @@ -416,24 +414,17 @@ def inventory_if_common(info, has_nodeinfo = False): is_only_in_group = True # Prepare single interfaces - if not is_only_in_group: - if ifIndex in global_seen: - continue - - if item in seen_items: # duplicate - duplicate.add(item) - seen_items.add(item) - - if ifType in porttypes and ifOperStatus in portstates and \ - port_match(ifAlias, match_alias) and port_match(ifDescr, match_desc): - params = {} - if if_inventory_monitor_state: - params["state"] = [ ifOperStatus ] - - if ifSpeed != "" and if_inventory_monitor_speed: - params["speed"] = int(ifSpeed) - local_seen.add(ifIndex) - pre_inventory.append( (item, "%r" % params, int(ifIndex)) ) + if not is_only_in_group and ifIndex not in global_seen and \ + ifType in porttypes and ifOperStatus in portstates and \ + port_match(ifAlias, match_alias) and port_match(ifDescr, match_desc): + params = {} + if if_inventory_monitor_state: + params["state"] = [ ifOperStatus ] + + if ifSpeed != "" and if_inventory_monitor_speed: + params["speed"] = int(ifSpeed) + local_seen.add(ifIndex) + pre_inventory.append((item, "%r" % params, int(ifIndex))) global_seen = global_seen.union(local_seen) @@ -476,9 +467,11 @@ def inventory_if_common(info, has_nodeinfo = False): pre_inventory.append((group_name, "%r" % params, 1)) inventory = [] + s = set() + duplicates = set(x[0] for x in pre_inventory if x[0] in s or s.add(x[0])) # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) for item, params, index in pre_inventory: - if item in duplicate: + if item in duplicates: new_item = "%s %d" % (item, index) else: new_item = item

6 years, 10 months

fixed last commit

by Andreas Boesl

Module: check_mk Branch: master Commit: 247ff314e5aa553ed5b0a90c09a4d2c150cd4c26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=247ff314e5aa55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 23 11:55:04 2017 +0200 fixed last commit Change-Id: Ie4d36e121244ac2599dd24940cbe95376dbe4c45 --- web/plugins/webapi/webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index a6f7c2b..c77b1f8 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -842,7 +842,7 @@ class APICallHosttags(APICallCollection): "configuration: %s") % ", ".join(missing_tags)) changed_hosttags_config.save() - add_change("edit-hosttags", _("Updated host tags through Web-API")) + watolib.add_change("edit-hosttags", _("Updated host tags through Web-API")) def _get_used_grouped_tags(self):

6 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017