Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

Removed deprecated option debug_mkeventd_queries

by Lars Michelsen

Module: check_mk Branch: master Commit: 69aa28677e1c236869229a75d4501580f35cc1cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69aa28677e1c23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:45:32 2016 +0200 Removed deprecated option debug_mkeventd_queries --- web/plugins/config/mkeventd.py | 1 - web/plugins/wato/mkeventd.py | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/web/plugins/config/mkeventd.py b/web/plugins/config/mkeventd.py index 0f9e856..24d5cb3 100644 --- a/web/plugins/config/mkeventd.py +++ b/web/plugins/config/mkeventd.py @@ -30,7 +30,6 @@ mkeventd_notify_contactgroup = None mkeventd_notify_facility = 16 mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10 -debug_mkeventd_queries = False log_level = 0 log_rulehits = False rule_optimizer = True diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index cb25702..e9d11f7 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2443,16 +2443,6 @@ if mkeventd_enabled: ) register_configvar(group, - "debug_mkeventd_queries", - Checkbox(title = _("Debug queries to Event Console"), - label = _("Enable debugging of queries"), - help = _("With this option turned on all queries asking for data of the Event Console " - "will be displayed in the views."), - default_value = False), - domain = "mkeventd", - ) - - register_configvar(group, "actions", vs_mkeventd_actions, allow_reset = False,

8 years, 4 months

Cleaned up refactored code

by Lars Michelsen

Module: check_mk Branch: master Commit: 88fbe1ee61418240e0eed23a8db42178bea296ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88fbe1ee614182… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:41:14 2016 +0200 Cleaned up refactored code --- web/plugins/views/mkeventd.py | 2 +- web/plugins/wato/mkeventd.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index e49c211..c54f9b9 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -400,7 +400,7 @@ if mkeventd_enabled: # '----------------------------------------------------------------------' def command_executor_mkeventd(command, site): - response = mkeventd.execute_command(command, site=site) + mkeventd.execute_command(command, site=site) # Acknowledge and update comment and contact config.declare_permission("mkeventd.update", diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 0bfd69b..cb25702 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1354,12 +1354,11 @@ def mode_mkeventd_rules(phase): # TODO: Make use of ec via livestatus when core is ready def copy_rules_from_master(): raise MKGeneralException(_("This is not working at the moment. Will fix this soon.")) - - answer = mkeventd.query("REPLICATE 0") - if "rules" not in answer: - raise MKGeneralException(_("Cannot get rules from local event daemon.")) - rule_packs = answer["rules"] - save_mkeventd_rules([], rule_packs) + #answer = mkeventd.query("REPLICATE 0") + #if "rules" not in answer: + # raise MKGeneralException(_("Cannot get rules from local event daemon.")) + #rule_packs = answer["rules"] + #save_mkeventd_rules([], rule_packs) def mode_mkeventd_edit_rule_pack(phase):

8 years, 4 months

Cleaned up debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c830ebcfddc6a12136c3768aa0b1705e696b7f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c830ebcfddc6a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:31:39 2016 +0200 Cleaned up debug output --- web/plugins/views/mkeventd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 5b2b352..e49c211 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -93,8 +93,7 @@ if mkeventd_enabled: "title" : _("ID of the event"), "short" : _("ID"), "columns" : ["event_id"], - "paint" : lambda row: ("number", repr(mkeventd.replication_mode())), - #str(row["event_id"])), + "paint" : lambda row: ("number", str(row["event_id"])), } multisite_painters["event_count"] = {

8 years, 4 months

Intermediate step in distributed event console implementation

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d81c6082b9d37605ea67d6d18887c018bde174b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d81c6082b9d37… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:29:56 2016 +0200 Intermediate step in distributed event console implementation We are almost feature complete. Missing things: a) REPLICATE action for distributed EC setups b) Permission checking (General visibility control and seeunrelated permission) --- web/htdocs/mkeventd.py | 46 +++---- web/htdocs/sites.py | 4 + web/htdocs/views.py | 9 +- web/htdocs/watolib.py | 2 +- web/plugins/sidebar/mkeventd.py | 16 +-- web/plugins/views/datasources.py | 8 +- web/plugins/views/mkeventd.py | 263 ++------------------------------------ web/plugins/visuals/mkeventd.py | 102 ++++++--------- web/plugins/wato/mkeventd.py | 13 +- 9 files changed, 96 insertions(+), 367 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d81c6082b…

8 years, 4 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 35092c1826feb80bd1a95cf1841f0de574812ee0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35092c1826feb8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 2 16:22:36 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/TableEventConsole.cc | 10 ++++------ livestatus/src/TableEventConsole.h | 3 ++- livestatus/src/TableEventConsoleStatus.cc | 8 +++++++- livestatus/src/TableEventConsoleStatus.h | 7 +++++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index cd5dda1..576e74c 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -102,7 +102,7 @@ private: auto it = row._map.find("event_host"); #ifdef CMC row._host = - (it == row._map.end() || _core == nullptr) + it == row._map.end() ? nullptr : _core->_world->getHostByDesignation(it->second); #else @@ -126,7 +126,6 @@ private: #ifdef CMC TableEventConsole::TableEventConsole(Core *core) : _core(core) {} -TableEventConsole::TableEventConsole() : _core(nullptr) {} #else TableEventConsole::TableEventConsole() {} #endif @@ -139,11 +138,10 @@ void TableEventConsole::answerQuery(Query *query) { #endif // skip "eventconsole" prefix :-P string internal_name = name() + 12; - ECTableConnection(path, internal_name, query #ifdef CMC - , - _core + ECTableConnection(path, internal_name, query, _core) +#else + ECTableConnection(path, internal_name, query) #endif - ) .run(); } diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 2dc3d0b..eb63163 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -52,8 +52,9 @@ class TableEventConsole : public Table { public: #ifdef CMC explicit TableEventConsole(Core *core); -#endif +#else TableEventConsole(); +#endif void answerQuery(Query *) override; struct Row { diff --git a/livestatus/src/TableEventConsoleStatus.cc b/livestatus/src/TableEventConsoleStatus.cc index 3224633..76253e6 100644 --- a/livestatus/src/TableEventConsoleStatus.cc +++ b/livestatus/src/TableEventConsoleStatus.cc @@ -24,7 +24,13 @@ #include "TableEventConsoleStatus.h" -TableEventConsoleStatus::TableEventConsoleStatus() { +#ifdef CMC +TableEventConsoleStatus::TableEventConsoleStatus(Core *core) + : TableEventConsole(core) +#else +TableEventConsoleStatus::TableEventConsoleStatus() +#endif +{ addColumn( new IntEventConsoleColumn("status_messages", "The number of messages")); addColumn(new DoubleEventConsoleColumn("status_message_rate", diff --git a/livestatus/src/TableEventConsoleStatus.h b/livestatus/src/TableEventConsoleStatus.h index f53cb83..23d9d9e 100644 --- a/livestatus/src/TableEventConsoleStatus.h +++ b/livestatus/src/TableEventConsoleStatus.h @@ -27,10 +27,17 @@ #include "config.h" // IWYU pragma: keep #include "TableEventConsole.h" +#ifdef CMC +struct Core; +#endif class TableEventConsoleStatus : public TableEventConsole { public: +#ifdef CMC + explicit TableEventConsoleStatus(Core *core); +#else TableEventConsoleStatus(); +#endif const char *name() const override; const char *namePrefix() const override; };

8 years, 4 months

3588 FIX BI aggregation: Fixed folding of tag groups in aggregation rules using host/ service searches

by Lars Michelsen

Module: check_mk Branch: master Commit: 24efeb6df182e5c5831abfb9a3ca5e67e06cc536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24efeb6df182e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 16:21:04 2016 +0200 3588 FIX BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches --- .werks/3588 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3588 b/.werks/3588 new file mode 100644 index 0000000..1f9c1a0 --- /dev/null +++ b/.werks/3588 @@ -0,0 +1,10 @@ +Title: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464877241 + + diff --git a/ChangeLog b/ChangeLog index 0f4b2e0..2dfe84c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -415,6 +415,7 @@ * 3242 FIX: Fixed hostname translation for empty optional groups * 3579 FIX: Fixed visibility of SNMP community attribute when SNMP tag is inherited * 3583 FIX: Fixed loosing some services after saving services in WATO... + * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 690d4da..5e5899f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4363,7 +4363,8 @@ def render_condition_editor(tag_specs, varprefix=""): make_foldable = len(all_topics) > 1 for topic in all_topics: if make_foldable: - html.begin_foldable_container("topic", topic, True, HTML("<b>%s</b>" % (_u(topic)))) + html.begin_foldable_container("topic", varprefix + topic, True, + HTML("<b>%s</b>" % (_u(topic)))) html.write("<table class=\"hosttags\">") # Show main tags

8 years, 4 months

Fetched Livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: a117069435f2d11b995304a951df93e9abbb44c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a117069435f2d1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 2 15:54:34 2016 +0200 Fetched Livestatus from downstream plus associated fixes. --- livestatus/src/EventConsoleConnection.cc | 125 +++++++++++++ livestatus/src/EventConsoleConnection.h | 49 +++++ livestatus/src/Makefile.am | 1 + livestatus/src/StringUtils.cc | 19 +- livestatus/src/StringUtils.h | 14 +- livestatus/src/TableEventConsole.cc | 300 ++++++++---------------------- livestatus/src/TableEventConsole.h | 22 +-- 7 files changed, 286 insertions(+), 244 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a117069435…

8 years, 4 months

Fixed merge issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e1f62637e8acf3fdf360d17421827bf083ef89c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e1f62637e8acf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 13:22:13 2016 +0200 Fixed merge issue --- modules/check_mk_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 004a63a..312f2dd 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1951,8 +1951,8 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int infotext_fmt = "%s" color = tty.states[state] verbose(("%-20s %s%s"+infotext_fmt+"%s%s\n") % (servicedesc.encode('utf-8'), - tty_bold, color, make_utf8(infotext.split('\n')[0]), - tty_normal, make_utf8(p))) + tty.bold, color, make_utf8(infotext.split('\n')[0]), + tty.normal, make_utf8(p))) def submit_to_core(host, service, state, output, cached_at = None, cache_interval = None):

8 years, 4 months

3587 FIX SNMP: Fixed possible random IO issues when using classic SNMP

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b8902472bf7fcdfd7a3113d2485a1e4aff40375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b8902472bf7fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 13:12:58 2016 +0200 3587 FIX SNMP: Fixed possible random IO issues when using classic SNMP The file descriptors of Check_MK were not properly closed when launching the SNMP subprocesses. --- .werks/3587 | 11 +++++++++++ ChangeLog | 1 + modules/snmp.py | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3587 b/.werks/3587 new file mode 100644 index 0000000..0f39ff9 --- /dev/null +++ b/.werks/3587 @@ -0,0 +1,11 @@ +Title: SNMP: Fixed possible random IO issues when using classic SNMP +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464865901 + +The file descriptors of Check_MK were not properly closed when launching +the SNMP subprocesses. diff --git a/ChangeLog b/ChangeLog index 968ceb0..0f4b2e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -254,6 +254,7 @@ * 3582 FIX: check_mail: Fixed issue with processing multipart mails... * 3630 FIX: docsis_channels_upstream: fixed channel discovery * 3584 FIX: check_mkevents: Fixed "failed to parse perfdata" errors in web.log caused by "Events" checks... + * 3587 FIX: SNMP: Fixed possible random IO issues when using classic SNMP... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/snmp.py b/modules/snmp.py index 3068a68..9df943b 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -577,7 +577,8 @@ def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False, context_name = None command += " -OQ -OU -On -Ot %s%s%s %s" % (protospec, ip, portspec, oid) vverbose(' Running %s\n' % command) - snmp_process = subprocess.Popen(command, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE) + snmp_process = subprocess.Popen(command, shell=True, close_fds=True, stdin=open(os.devnull), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) # Ugly(1): in some cases snmpwalk inserts line feed within one # dataset. This happens for example on hexdump outputs longer

8 years, 4 months

Fixed some verbose / very verbose outputs during checking

by Lars Michelsen

Module: check_mk Branch: master Commit: 094cf5b0ec118ce795d4cd1cb2ccc89b45dd2e20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094cf5b0ec118c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 2 13:08:55 2016 +0200 Fixed some verbose / very verbose outputs during checking --- modules/check_mk_base.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index ffa50fe..004a63a 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1183,8 +1183,7 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero # This is the main check function - the central entry point to all and # everything def do_check(hostname, ipaddress, only_check_types = None): - if opt_verbose: - sys.stderr.write("Check_mk version %s\n" % check_mk_version) + verbose("Check_mk version %s\n" % check_mk_version) start_time = time.time() @@ -1273,6 +1272,7 @@ def do_check(hostname, ipaddress, only_check_types = None): if opt_keepalive: add_keepalive_result_line(output) + verbose(output) else: sys.stdout.write(core_state_names[status] + " - " + output.encode('utf-8')) @@ -1399,13 +1399,11 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag # Skip checks that are not in their check period period = check_period_of(hostname, description) if period and not check_timeperiod(period): - if opt_debug: - sys.stderr.write("Skipping service %s: currently not in timeperiod %s.\n" % - (description, period)) + verbose("Skipping service %s: currently not in timeperiod %s.\n" % (description, period)) continue - elif period and opt_debug: - sys.stderr.write("Service %s: timeperiod %s is currently active.\n" % - (description, period)) + + elif period: + vverbose("Service %s: timeperiod %s is currently active.\n" % (description, period)) infotype = checkname.split('.')[0] try: @@ -1952,9 +1950,9 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int p = '' infotext_fmt = "%s" color = tty.states[state] - print ("%-20s %s%s"+infotext_fmt+"%s%s") % (servicedesc.encode('utf-8'), - tty.bold, color, make_utf8(infotext.split('\n')[0]), - tty.normal, make_utf8(p)) + verbose(("%-20s %s%s"+infotext_fmt+"%s%s\n") % (servicedesc.encode('utf-8'), + tty_bold, color, make_utf8(infotext.split('\n')[0]), + tty_normal, make_utf8(p))) def submit_to_core(host, service, state, output, cached_at = None, cache_interval = None):

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016