Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4217 WATO rules can now be moved via drag&drop

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a771d97d4e283a58bba0f9aae617117f38d2187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a771d97d4e283… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:30:14 2016 +0100 4217 WATO rules can now be moved via drag&drop Other list elements will be movable like this soon too. Change-Id: I220164683f781938dc873ca45b28f16c4a1e3a9f --- .werks/4217 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4217 b/.werks/4217 new file mode 100644 index 0000000..80431f5 --- /dev/null +++ b/.werks/4217 @@ -0,0 +1,9 @@ +Title: WATO rules can now be moved via drag&drop +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482334187 +Class: feature + +Other list elements will be movable like this soon too. diff --git a/ChangeLog b/ChangeLog index a2d9676..354153c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ WATO: * 4142 New extended search dialog for rulesets and rules... + * 4217 WATO rules can now be moved via drag&drop... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config"

7 years, 9 months

Fixed dragging in chrome; Do not reload page when nothing has moved

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e2e564162fc1367d87cc0cf9212e074268b0c37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e2e564162fc13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 16:27:03 2016 +0100 Fixed dragging in chrome; Do not reload page when nothing has moved Change-Id: Ie8abe136e8f5617def47b93ba6d298b9574315a6 --- web/htdocs/js/checkmk.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d1d6aa6..9de8f55 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -236,8 +236,8 @@ function mouse_offset(obj, event){ var obj_pos = obj.getBoundingClientRect(); var mouse_pos = mouse_position(event); return { - "x": mouse_pos.x - obj_pos.x, - "y": mouse_pos.y - obj_pos.y + "x": mouse_pos.left - obj_pos.x, + "y": mouse_pos.top - obj_pos.y } } @@ -246,8 +246,8 @@ function mouse_offset_to_middle(obj, event){ var obj_pos = obj.getBoundingClientRect(); var mouse_pos = mouse_position(event); return { - "x": mouse_pos.x - (obj_pos.x + obj_pos.width/2), - "y": mouse_pos.y - (obj_pos.y + obj_pos.height/2) + "x": mouse_pos.x - (obj_pos.left + obj_pos.width/2), + "y": mouse_pos.y - (obj_pos.top + obj_pos.height/2) } } @@ -1733,8 +1733,9 @@ function element_drag_start(event, dragger, dragging_tag, base_url) add_class(dragging, "dragging"); g_dragging = { - "dragging": dragging, - "base_url": base_url, + "dragging" : dragging, + "moved" : false, + "base_url" : base_url, }; return prevent_default_events(event); @@ -1777,6 +1778,7 @@ function position_dragging_object(event) // Move it up? var previous = get_previous(dragging); while (previous && Math.abs(mouse_offset_to_middle(previous, event).y) < offset_y) { + g_dragging.moved = true; container.insertBefore(dragging, previous); previous = get_previous(dragging); } @@ -1784,6 +1786,7 @@ function position_dragging_object(event) // Move it down? var next = get_next(dragging); while (next && Math.abs(mouse_offset_to_middle(next, event).y) < offset_y) { + g_dragging.moved = true; container.insertBefore(dragging, next.nextElementSibling); next = get_next(dragging); } @@ -1808,6 +1811,9 @@ function finalize_dragging() var dragging = g_dragging.dragging; remove_class(dragging, "dragging"); + if (!g_dragging.moved) + return; // Nothing changed. Fine. + var elements = Array.prototype.slice.call(dragging.parentNode.children); var index = elements.indexOf(dragging); @@ -1823,6 +1829,7 @@ function finalize_dragging() index -= 1; var url = g_dragging.base_url + "&_index="+encodeURIComponent(index); + location.href = url; //call_ajax(url, {

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ddd0042c27e29cc83b1e8fd0b0280a38d4b5018f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd0042c27e29c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 21 14:50:19 2016 +0100 Fetched livestatus from downstream. Change-Id: I82068bb9716889cf592458974cefc48f6f8dee6d --- livestatus/src/ServiceListColumn.cc | 3 ++- livestatus/src/ServiceListColumn.h | 14 ++++++++------ livestatus/src/ServiceListFilter.cc | 37 ++++++++++++++++++++---------------- livestatus/src/ServiceListFilter.h | 5 +++-- livestatus/src/TableHosts.cc | 14 +++++++------- livestatus/src/TableServiceGroups.cc | 8 ++++---- 6 files changed, 45 insertions(+), 36 deletions(-) diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index 5877544..50876e4 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -86,7 +86,8 @@ void ServiceListColumn::output(void *row, RowRenderer &r, contact *auth_user) { unique_ptr<Filter> ServiceListColumn::createFilter(RelationalOperator relOp, const string &value) { - return make_unique<ServiceListFilter>(this, relOp, value); + return make_unique<ServiceListFilter>(this, _hostname_required, relOp, + value); } int ServiceListColumn::inCustomTimeperiod(service *svc, const char *varname) { diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index 5aaaee3..5398281 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -35,15 +35,12 @@ class Filter; class RowRenderer; class ServiceListColumn : public Column { - int _offset; - bool _show_host; - int _info_depth; - public: ServiceListColumn(const std::string &name, const std::string &description, - int offset, int indirect_offset, bool show_host, - int info_depth, int extra_offset = -1) + bool hostname_required, int offset, int indirect_offset, + bool show_host, int info_depth, int extra_offset) : Column(name, description, indirect_offset, extra_offset) + , _hostname_required(hostname_required) , _offset(offset) , _show_host(show_host) , _info_depth(info_depth) {} @@ -54,6 +51,11 @@ public: servicesmember *getMembers(void *data); private: + bool _hostname_required; + int _offset; + bool _show_host; + int _info_depth; + int inCustomTimeperiod(service *svc, const char *varname); }; diff --git a/livestatus/src/ServiceListFilter.cc b/livestatus/src/ServiceListFilter.cc index 6d37865..0de7775 100644 --- a/livestatus/src/ServiceListFilter.cc +++ b/livestatus/src/ServiceListFilter.cc @@ -24,37 +24,41 @@ // IWYU pragma: no_include <ext/alloc_traits.h> #include "ServiceListFilter.h" -#include <cstring> #include <ostream> #include "Logger.h" using std::string; -#define HOSTSERVICE_SEPARATOR '|' +namespace { +constexpr char hostservice_separator = '|'; +} // namespace ServiceListFilter::ServiceListFilter(ServiceListColumn *column, + bool hostname_required, RelationalOperator relOp, const string &value) - : _column(column), _relOp(relOp) { + : _column(column), _hostname_required(hostname_required), _relOp(relOp) { if ((_relOp == RelationalOperator::equal || _relOp == RelationalOperator::not_equal) && value.empty()) { return; // test for emptiness is allowed } - // ref_value must be of from hostname HOSTSERVICE_SEPARATOR - // service_description - const char *sep = index(value.c_str(), HOSTSERVICE_SEPARATOR); - if (sep == nullptr) { - Informational(logger()) << "Invalid reference value for service list " - "membership. Must be 'hostname" - << string(1, HOSTSERVICE_SEPARATOR) - << "servicename'"; - _ref_host = ""; - _ref_service = ""; + // ref_value must be of the form + // hostname hostservice_separator service_description + auto pos = value.find(hostservice_separator); + if (pos == string::npos) { + if (_hostname_required) { + Informational(logger()) << "Invalid reference value for service " + "list membership. Must be 'hostname" + << string(1, hostservice_separator) + << "servicename'"; + } else { + _ref_service = value; + } } else { - _ref_host = string(&value[0], sep - &value[0]); - _ref_service = sep + 1; + _ref_host = value.substr(0, pos); + _ref_service = value.substr(pos + 1); } } @@ -77,7 +81,8 @@ bool ServiceListFilter::accepts(void *row, contact * /* auth_user */, bool is_member = false; for (; mem != nullptr; mem = mem->next) { service *svc = mem->service_ptr; - if (svc->host_name == _ref_host && svc->description == _ref_service) { + if ((!_hostname_required || svc->host_name == _ref_host) && + svc->description == _ref_service) { is_member = true; break; } diff --git a/livestatus/src/ServiceListFilter.h b/livestatus/src/ServiceListFilter.h index 5a01ab6..2fdf755 100644 --- a/livestatus/src/ServiceListFilter.h +++ b/livestatus/src/ServiceListFilter.h @@ -39,13 +39,14 @@ class ServiceListFilter : public ColumnFilter { public: - ServiceListFilter(ServiceListColumn *column, RelationalOperator relOp, - const std::string &value); + ServiceListFilter(ServiceListColumn *column, bool hostname_required, + RelationalOperator relOp, const std::string &value); bool accepts(void *row, contact *auth_user, int timezone_offset) override; ServiceListColumn *column() const override; private: ServiceListColumn *_column; + bool _hostname_required; RelationalOperator _relOp; std::string _ref_host; std::string _ref_service; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 960b58d..de3f277 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -678,27 +678,27 @@ void TableHosts::addColumns(Table *table, const string &prefix, extra_offset, core)); table->addColumn(make_unique<ServiceListColumn>( - prefix + "services", "A list of all services of the host", + prefix + "services", "A list of all services of the host", false, reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, false, 0, extra_offset)); table->addColumn(make_unique<ServiceListColumn>( prefix + "services_with_state", "A list of all services of the host together with state and " "has_been_checked", - reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, false, - 1, extra_offset)); + false, reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, + false, 1, extra_offset)); table->addColumn(make_unique<ServiceListColumn>( prefix + "services_with_info", "A list of all services including detailed information about each " "service", - reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, false, - 2, extra_offset)); + false, reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, + false, 2, extra_offset)); table->addColumn(make_unique<ServiceListColumn>( prefix + "services_with_fullstate", "A list of all services including full state information. The list of " "entries can grow in future versions.", - reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, false, - 3, extra_offset)); + false, reinterpret_cast<char *>(&hst.services) - ref, indirect_offset, + false, 3, extra_offset)); table->addColumn(make_unique<MetricsColumn>( prefix + "metrics", diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index af2edc3..3bbf764 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -72,14 +72,14 @@ void TableServiceGroups::addColumns(Table *table, const string &prefix, table->addColumn(make_unique<ServiceListColumn>( prefix + "members", "A list of all members of the service group as host/service pairs", - reinterpret_cast<char *>(&sgr.members) - ref, indirect_offset, true, - 0)); + true, reinterpret_cast<char *>(&sgr.members) - ref, indirect_offset, + true, 0, -1)); table->addColumn(make_unique<ServiceListColumn>( prefix + "members_with_state", "A list of all members of the service group with state and " "has_been_checked", - reinterpret_cast<char *>(&sgr.members) - ref, indirect_offset, true, - 1)); + true, reinterpret_cast<char *>(&sgr.members) - ref, indirect_offset, + true, 1, -1)); table->addColumn(make_unique<ServiceListStateColumn>( prefix + "worst_service_state",

7 years, 9 months

Small cleanup of EC events check WATO rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 4ed86824dc69cbbb20f86fab0a0d3efeae47bb55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ed86824dc69cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 13:31:59 2016 +0100 Small cleanup of EC events check WATO rule Change-Id: Idc57156e53718f40e08f442aec5e30d0f7430714 --- web/plugins/wato/mkeventd.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 958862a..2542c02 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2864,7 +2864,7 @@ register_rule( ), ( "item", TextAscii( - title = _("Item (Used in service description)"), + title = _("Item (used in service description)"), help = _("If you enter an item name here, this will be used as " "part of the service description after the prefix \"Events \". " "The prefix plus the configured item must result in an unique " @@ -2890,7 +2890,7 @@ register_rule( ( "ignore_acknowledged", FixedValue( True, - title = _("Ignore Acknowledged Events"), + title = _("Ignore acknowledged events"), help = _("If you check this box then only open events are honored when " "determining the event state. Acknowledged events are displayed " "(i.e. their count) but not taken into account."), @@ -2900,7 +2900,7 @@ register_rule( ( "less_verbose", FixedValue( True, - title = _("Less Verbose Output"), + title = _("Less verbose output"), help = _("If enabled the check reports less information in its output. " "You will see no information regarding the worst state or unacknowledged events. " " For example a default output without this option is " @@ -2908,6 +2908,7 @@ register_rule( "Output with less verbosity: " "<tt>WARN - 1 events (Worst line: Incomplete Content)</tt><br>" ), + totext = _("produce a more terse output"), ) ), ( "remote", @@ -2948,7 +2949,7 @@ register_rule( ), ], - default_value = cmk.paths.omd_root + "/tmp/run/mkeventd/status" + default_value = None, ) ), ],

7 years, 9 months

Crawl tests now really do not use system apache

by Lars Michelsen

Module: check_mk Branch: master Commit: c56efc119f0374654715a9252c22bddd0179133b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c56efc119f0374… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 11:28:55 2016 +0100 Crawl tests now really do not use system apache Change-Id: Ibea790cfc2cec6a4a755e3eb0ca3e80822caf00f --- tests/testlib/__init__.py | 11 ++++++++++- tests/web/test_crawl.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index b9cc888..d213fea 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -436,9 +436,14 @@ class WebSession(requests.Session): self.transids = [] # Resources are self.verified_resources = set() + self.via_system_apache = True super(WebSession, self).__init__() + def dont_use_system_apache(self): + self.via_system_apache = False + + def check_redirect(self, path, proto="http", expected_code=302, expected_target=None): url = self.url(proto, path) @@ -626,7 +631,11 @@ class CMKWebSession(WebSession): if "/" not in urlparse(path).path: path = "/%s/check_mk/%s" % (self.site.id, path) - return '%s://%s%s' % (self.site.http_proto, self.site.http_address, path) + if self.via_system_apache: + return '%s://%s%s' % (self.site.http_proto, self.site.http_address, path) + else: + return '%s://%s:%d%s' % (self.site.http_proto, self.site.http_address, + self.site.apache_port, path) def login(self, username="omdadmin", password="omd"): diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 9fc2aa3..6c10fd6 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -57,6 +57,7 @@ class Worker(threading.Thread): self.idle = True self.client = CMKWebSession(self.crawler.site) + self.client.dont_use_system_apache() self.client.login() self.client.set_language("en")

7 years, 9 months

4008 FIX Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent

by Andreas Boesl

Module: check_mk Branch: master Commit: fc6c00fa3137b225eb3097d1771e1cecea238acf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc6c00fa3137b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 21 11:06:11 2016 +0100 4008 FIX Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent The windows agent could freeze in the dotnet_clrmemory section while querying WMI counters. This freeze is presumably caused by an earlier WMI query for the skype section which failed, due to a non-existing wmi counter. Change-Id: I4fc4d08a0e2deec60766da2d3d49eac157628622 --- .werks/4008 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1327104 -> 1327104 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15506632 -> 15506632 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1327104 -> 1327104 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes agents/windows/check_mk_agent.msi | Bin 2899456 -> 2899456 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13407014 -> 13407014 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1302528 bytes agents/windows/install_agent-64.exe | Bin 585703 -> 585704 bytes agents/windows/install_agent.exe | Bin 582532 -> 582536 bytes agents/windows/wmiHelper.cc | 2 +- 13 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4008 b/.werks/4008 new file mode 100644 index 0000000..531b894 --- /dev/null +++ b/.werks/4008 @@ -0,0 +1,10 @@ +Title: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482314283 +Class: fix + +The windows agent could freeze in the dotnet_clrmemory section while querying WMI counters. +This freeze is presumably caused by an earlier WMI query for the skype section which failed, due to a non-existing wmi counter. diff --git a/ChangeLog b/ChangeLog index 7130923..a2d9676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 4174 FIX: added missing perfometer for interface services * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting + * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/windows/build_version b/agents/windows/build_version index 76c0db3..cc50439 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2196 +2199 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a3c6a22..99ba5e8 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index af25adc..e050b8e 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 6319119..e5604f8 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index aefa0e4..8f805ab 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index f573f80..eaf74da 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 78d6e4c..c289fb1 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 0e9744c..7061d64 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 61adf30..2eb908c 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 84f75ea..5e37241 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 1fc6219..edc7e8a 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -188,7 +188,7 @@ bool Result::next() { IWbemClassObject *obj; ULONG numReturned; // always retrieve only one element - HRESULT res = _enumerator->Next(WBEM_INFINITE, 1, &obj, &numReturned); + HRESULT res = _enumerator->Next(10000, 1, &obj, &numReturned); if (FAILED(res)) { // in this case the "current" object isn't changed to guarantee that the

7 years, 9 months

4007 Windows Agent: Reduced number of needless WMI Queries when Skype performance counters are missing

by Andreas Boesl

Module: check_mk Branch: master Commit: b89af681c90e01e852f172482b407a86317f7d22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b89af681c90e01… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 21 10:49:01 2016 +0100 4007 Windows Agent: Reduced number of needless WMI Queries when Skype performance counters are missing The windows agent now skips the processing of the skype section earlier, if the performancecounters are not available. This presumably fixes an error where the windows agents hangs in a followup WMI query. Change-Id: Ia8a0b8e16e4db1152f725b6f2e77e00b3bafcd72 --- .werks/4007 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1326592 -> 1327104 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15505551 -> 15506632 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1326592 -> 1327104 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes agents/windows/check_mk_agent.msi | Bin 2898944 -> 2899456 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13405932 -> 13407014 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1302528 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 585677 -> 585703 bytes agents/windows/install_agent.exe | Bin 582548 -> 582532 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionGroup.cc | 10 ++++++++++ agents/windows/sections/SectionGroup.h | 2 ++ agents/windows/sections/SectionSkype.cc | 1 + 17 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/4007 b/.werks/4007 new file mode 100644 index 0000000..38ec8d2 --- /dev/null +++ b/.werks/4007 @@ -0,0 +1,11 @@ +Title: Windows Agent: Reduced number of needless WMI Queries when Skype performance counters are missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482313422 +Class: feature + +The windows agent now skips the processing of the skype section earlier, if the +performancecounters are not available. This presumably fixes an error where the windows +agents hangs in a followup WMI query. diff --git a/ChangeLog b/ChangeLog index 16a32c0..7130923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 4005 agent_activemq: now able to provide BasicAuth credentials... NOTE: Please refer to the migration notes! * 4201 mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution... + * 4007 Windows Agent: Reduced number of needless WMI Queries when Skype performance counters are missing... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/windows/build_version b/agents/windows/build_version index 811f4e3..76c0db3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2193 +2196 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 87ba09f..a3c6a22 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 7fc7774..af25adc 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 27ec82b..6319119 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ad56930..aefa0e4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 7f4969a..f573f80 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 7fd04ea..78d6e4c 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 9526051..0e9744c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 4e83695..5d2ffdc 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 60cc69f..61adf30 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 7a8cca9..84f75ea 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 3deb1b4..d4d8e4b 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/sections/SectionGroup.cc b/agents/windows/sections/SectionGroup.cc index 1e25d61..48bde73 100644 --- a/agents/windows/sections/SectionGroup.cc +++ b/agents/windows/sections/SectionGroup.cc @@ -48,6 +48,12 @@ SectionGroup *SectionGroup::withToggleIfMissing() return this; } +SectionGroup *SectionGroup::withFailIfMissing() +{ + _fail_if_missing = true; + return this; +} + SectionGroup *SectionGroup::withNestedSubtables() { withHiddenHeader(false); @@ -68,6 +74,10 @@ bool SectionGroup::produceOutputInner(std::ostream &out, if (table->produceOutput(out, env, _nested)) { all_failed = false; } + else if (_fail_if_missing) { + all_failed = true; + break; + } } if (!all_failed) { diff --git a/agents/windows/sections/SectionGroup.h b/agents/windows/sections/SectionGroup.h index 139cbbb..932961a 100644 --- a/agents/windows/sections/SectionGroup.h +++ b/agents/windows/sections/SectionGroup.h @@ -42,6 +42,7 @@ class SectionGroup : public Section { std::vector<std::unique_ptr<Section>> _subsections; std::vector<std::unique_ptr<Section>> _dependent_subsections; bool _toggle_if_missing{false}; + bool _fail_if_missing{false}; bool _nested{false}; time_t _disabled_until{0}; @@ -61,6 +62,7 @@ public: **/ SectionGroup *withDependentSubSection(Section *section); SectionGroup *withToggleIfMissing(); + SectionGroup *withFailIfMissing(); protected: virtual bool produceOutputInner(std::ostream &out, diff --git a/agents/windows/sections/SectionSkype.cc b/agents/windows/sections/SectionSkype.cc index a9cacd2..f1e0f00 100644 --- a/agents/windows/sections/SectionSkype.cc +++ b/agents/windows/sections/SectionSkype.cc @@ -27,6 +27,7 @@ SectionSkype::SectionSkype() : SectionGroup("skype") { withToggleIfMissing(); + withFailIfMissing(); withNestedSubtables(); withSeparator(',');

7 years, 9 months

4146 FIX Fixed broken "Global settings" when having the Event Console disabled via "omd config"

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bc07010e8a3fa57f6bcb4c0f6290a26915cd4e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc07010e8a3fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 10:46:12 2016 +0100 4146 FIX Fixed broken "Global settings" when having the Event Console disabled via "omd config" Change-Id: Ie919fd37fc923cdff0b7ccda637df9fc7f4fd82e --- .werks/4146 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 20 ++++++++++++++++++-- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/4146 b/.werks/4146 new file mode 100644 index 0000000..c9c05fa --- /dev/null +++ b/.werks/4146 @@ -0,0 +1,9 @@ +Title: Fixed broken "Global settings" when having the Event Console disabled via "omd config" +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482313552 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1e0e270..16a32c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ WATO: * 4142 New extended search dialog for rulesets and rules... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery + * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 181110e..096f9b8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9321,7 +9321,7 @@ def mode_edit_site(phase): # Don't know exactly what have been changed, so better issue a change # affecting all domains - add_change("edit-sites", msg, sites=[id], domains=ConfigDomain.all_classes()) + add_change("edit-sites", msg, sites=[id], domains=ConfigDomain.enabled_domains()) if id != config.omd_site(): # On central site issue a change only for the GUI diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 205b8d5..9836090 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -286,6 +286,11 @@ class ConfigDomain(object): @classmethod + def enabled_domains(cls): + return [ d for d in cls.all_classes() if d.enabled() ] + + + @classmethod def get_class(cls, ident): for domain_class in cls.__subclasses__(): # pylint: disable=no-member if domain_class.ident == ident: @@ -293,6 +298,11 @@ class ConfigDomain(object): raise NotImplementedError(_("The domain \"%s\" does not exist") % ident) + @classmethod + def enabled(self): + return True + + def config_dir(self): raise NotImplementedError() @@ -367,6 +377,12 @@ class ConfigDomainEventConsole(ConfigDomain): ident = "ec" in_global_settings = False + + @classmethod + def enabled(self): + return config.mkeventd_enabled + + def config_dir(self): return mkeventd_config_dir @@ -3140,7 +3156,7 @@ def register_configvar_group(title, order=None): def load_configuration_settings(): settings = {} - for domain in ConfigDomain.all_classes(): + for domain in ConfigDomain.enabled_domains(): settings.update(domain().load()) return settings @@ -3159,7 +3175,7 @@ def save_configuration_settings(vars): if "userdb_automatic_sync" in vars: per_domain.setdefault("multisite", {})["userdb_automatic_sync"] = vars["userdb_automatic_sync"] - for domain in ConfigDomain.all_classes(): + for domain in ConfigDomain.enabled_domains(): domain().save(per_domain.get(domain, {}))

7 years, 9 months

4006 FIX Windows Agent: Fixed possible memory leak when using logwatch with vista api setting

by Andreas Boesl

Module: check_mk Branch: master Commit: 066f93192892e85c87cfd40e8cc1b8b4340cf364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=066f93192892e8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 21 10:38:38 2016 +0100 4006 FIX Windows Agent: Fixed possible memory leak when using logwatch with vista api setting Change-Id: I757dbc44cdfee28fce120923f564da69295424da --- .werks/4006 | 9 +++++++++ ChangeLog | 1 + agents/windows/EventLogVista.cc | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1326592 -> 1326592 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15505551 -> 15505551 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1326592 -> 1326592 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes agents/windows/check_mk_agent.msi | Bin 2898944 -> 2898944 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13405932 -> 13405932 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1302528 bytes agents/windows/install_agent-64.exe | Bin 585694 -> 585677 bytes agents/windows/install_agent.exe | Bin 582519 -> 582548 bytes 13 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4006 b/.werks/4006 new file mode 100644 index 0000000..9c92fe5 --- /dev/null +++ b/.werks/4006 @@ -0,0 +1,9 @@ +Title: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482313070 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7b1c519..1e0e270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... * 4174 FIX: added missing perfometer for interface services * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... + * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 91f018e..ee200a8 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -244,6 +244,7 @@ public: std::replace_if(result.begin(), result.end(), [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); + _evt->close(publisher_meta); return result; } }; diff --git a/agents/windows/build_version b/agents/windows/build_version index 0ed0ea4..811f4e3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2190 +2193 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d086565..87ba09f 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 827c631..7fc7774 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 0f8047c..27ec82b 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index bbcf6b9..ad56930 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index a71fbb0..7f4969a 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 92d3ae7..7fd04ea 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index b566d1c..9526051 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8aaf204..60cc69f 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ba8a687..7a8cca9 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 9 months

added missing changes for werk4172

by Simon Betz

Module: check_mk Branch: master Commit: 9fd174d4ead0b7c5ac03f92f04c66a8acb11d16c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fd174d4ead0b7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 21 10:14:57 2016 +0100 added missing changes for werk4172 Change-Id: I4cef909293df4674d9e603a247b5dee6d65f4566 --- checks/smart | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/checks/smart b/checks/smart index efd396d..89e04c8 100644 --- a/checks/smart +++ b/checks/smart @@ -178,16 +178,19 @@ check_info["smart.stats"] = { def inventory_smart_temp(info): disks = parse_smart_raw_values(info) for disk_name, disk in disks.iteritems(): - if disk in [ "Temperature_Celsius", "Temperature_Internal" ]: - yield (disk_name, {}) + if "Temperature_Celsius" in disk or \ + "Temperature_Internal" in disk: + yield disk_name, {} def check_smart_temp(item, params, info): disks = parse_smart_raw_values(info) - try: + if "Temperature_Celsius" in disks[item]: temperature = disks[item]["Temperature_Celsius"] - except KeyError: + elif "Temperature_Internal" in disks[item]: + temperature = disks[item]["Temperature_Internal"] + else: return return check_temperature(temperature, params, "smart_%s" % item)

7 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016