Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 06a53c4c134b66e27c83bd0018e1140818ae5a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a53c4c134b66… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 30 10:35:43 2017 +0100 Accept wheezy, too. Change-Id: Iac1d285d07579b2c0090bc84e79224005d7c9ede --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bb9706d..13f1a16 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,8 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 16.04" \ - -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ + -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" \ + -o "$$(head -c 18 /etc/issue)" = "Debian GNU/Linux 7" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi

7 years, 4 months

4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis

by Marcel Arentz

Module: check_mk Branch: master Commit: 845223e6a1463c7cdcdf7314f32276f79c97df73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=845223e6a1463c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Jan 20 20:42:04 2017 +0100 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis The inventory is now capable to inventorize chassis information in the same way as other backplane components information is already used. Change-Id: I45d34e48e1c0a9d698ef1dcf961910bb416fbe7b --- .werks/4188 | 11 +++++++++++ ChangeLog | 1 + inventory/snmp_extended_info | 28 ++++++++++++++-------------- web/plugins/views/inventory.py | 10 ++++++++++ 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.werks/4188 b/.werks/4188 new file mode 100644 index 0000000..a4d61cd --- /dev/null +++ b/.werks/4188 @@ -0,0 +1,11 @@ +Title: snmp_extended_info: Now capable to inventorize cisco backplane chassis +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i4 +Date: 1484941164 +Class: feature + +The inventory is now capable to inventorize chassis information in the same +way as other backplane components information is already used. + diff --git a/ChangeLog b/ChangeLog index 87b0c5e..5e5867f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 4314 FIX: Quick event delete icon works with checkboxes enabled now HW/SW-Inventory: + * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable diff --git a/inventory/snmp_extended_info b/inventory/snmp_extended_info index cd98e9a..222cc6b 100644 --- a/inventory/snmp_extended_info +++ b/inventory/snmp_extended_info @@ -35,17 +35,17 @@ def inv_snmp_extended_info(info): map_type = { - "1" : "Other", - "2" : "Unknown", - "3" : "Chassis", - "4" : "Backplane", - "5" : "Container", - "6" : "PSU", - "7" : "Fan", - "8" : "Sensor", - "9" : "Module", - "10" : "Port", - "11" : "Stack", + "1" : ( "Other", "others" ), + "2" : ( "Unknown", "unknowns" ), + "3" : ( "Chassis", "chassis" ), + "4" : ( "Backplane", "backplanes" ), + "5" : ( "Container", "containers" ), + "6" : ( "PSU", "psus" ), + "7" : ( "Fan", "fans" ), + "8" : ( "Sensor", "sensors" ), + "9" : ( "Module", "modules" ), + "10" : ( "Port", "ports" ), + "11" : ( "Stack", "stacks" ), } parsed = {} @@ -61,12 +61,12 @@ def inv_snmp_extended_info(info): if model: node["model"] = model # backplanes, psus, fans, sensors, modules - elif entity_type in ["4", "6", "7", "8", "9"]: + elif entity_type in ["3", "4", "6", "7", "8", "9"]: if parsed.get(parent): - location_info = (map_type[parsed[parent][2]], parent) + location_info = (map_type[parsed[parent][2]][0], parent) else: location_info = ("Missing in ENTITY table", parent) - node = inv_tree_list("hardware.components.%ss:" % (map_type[entity_type]).lower()) + node = inv_tree_list("hardware.components.%s:" % (map_type[entity_type][1])) node.append({ "index" : index, "name" : name, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 295fdb6..060a0aa 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -620,6 +620,16 @@ inventory_displayhints.update({ ".hardware.system.manufacturer" : { "title" : _("Manufacturer") }, ".hardware.components." : { "title" : _("Physical Components") }, + ".hardware.components.chassis:" : { "title" : _("Chassis"), "render" : render_inv_dicttable, + "keyorder" : [ "index", "name", "description", "serial", "model", "location" ], + "view" : "invchassis_of_host" }, + ".hardware.components.chassis:*.index" : { "title" : _("Index") }, + ".hardware.components.chassis:*.name" : { "title" : _("Name") }, + ".hardware.components.chassis:*.description" : { "title" : _("Description") }, + ".hardware.components.chassis:*.serial" : { "title" : _("Serial Number") }, + ".hardware.components.chassis:*.model" : { "title" : _("Model Name") }, + ".hardware.components.chassis:*.location" : { "title" : _("Location") }, + ".hardware.components.backplanes:" : { "title" : _("Backplanes"), "render" : render_inv_dicttable, "keyorder" : [ "index", "name", "description", "serial", "model", "location" ], "view" : "invbackplane_of_host" },

7 years, 4 months

Fixed accidently scrolled ListChoice() in many WATO dialogs

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fadf55f746ac4fd03473d723d26e79fe6c5368b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fadf55f746ac4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 07:30:12 2017 +0100 Fixed accidently scrolled ListChoice() in many WATO dialogs Change-Id: I835a6619e458816712de0f96518f3dff5b44aa05 --- web/htdocs/check_mk.css | 7 +++++++ web/htdocs/valuespec.py | 30 +++++++++++------------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 7a8cbbc..d2f59c4 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -613,6 +613,13 @@ table.listchoice td input[type=checkbox] { height: 12px; } +div.floatfilter.double > div.content > table.listchoice { + display: block; + height: 80px; + overflow: hidden; + overflow-y:scroll; +} + div.popup_container { position: relative; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index efe48bf..3b770d3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2006,25 +2006,17 @@ class ListChoice(ValueSpec): if self._toggle_all: html.a(_("Check / Uncheck all"), href="javascript:vs_list_choice_toggle_all('%s')" % varprefix) - if self._columns > 1: - html.open_table(id_="%s_tbl" % varprefix, class_=["listchoice"]) - for nr, (key, title) in enumerate(elements): - if nr % self._columns == 0: - if nr > 0: - html.close_tr() - html.open_tr() - html.open_td() - html.checkbox("%s_%d" % (varprefix, nr), key in value, label = title) - html.close_td() - html.close_tr() - html.close_table() - else: - html.open_div(style="height:80px;overflow:hidden; overflow-y:scroll;") - for nr, (key, title) in enumerate(elements): - html.open_div() - html.checkbox("%s_%d" % (varprefix, nr), key in value, label = title) - html.close_div() - html.close_div() + html.open_table(id_="%s_tbl" % varprefix, class_=["listchoice"]) + for nr, (key, title) in enumerate(elements): + if nr % self._columns == 0: + if nr > 0: + html.close_tr() + html.open_tr() + html.open_td() + html.checkbox("%s_%d" % (varprefix, nr), key in value, label = title) + html.close_td() + html.close_tr() + html.close_table() def render_input(self, varprefix, value):

7 years, 4 months

4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option

by Sven Rueß

Module: check_mk Branch: master Commit: 6302c59e3fb1d5e5d474caa04ba9cc938fa7bc1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6302c59e3fb1d5… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sat Jan 28 12:30:05 2017 +0100 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option The new released monitoring plugins version 2.2 offer new parameters for check_http. The new SSL options 1.1 for TLSv1.1 and 1.2 for TLSv1.2 were added to support this new protocol version. Change-Id: I590596edd4f3ae59251c95e4320e2a998b04363b --- .werks/4332 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 2 ++ 3 files changed, 15 insertions(+) diff --git a/.werks/4332 b/.werks/4332 new file mode 100644 index 0000000..86cc517 --- /dev/null +++ b/.werks/4332 @@ -0,0 +1,12 @@ +Title: check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485602837 +Class: feature + +The new released monitoring plugins version 2.2 offer new parameters for check_http. The +new SSL options 1.1 for TLSv1.1 and 1.2 for TLSv1.2 were added to support this new protocol +version. + diff --git a/ChangeLog b/ChangeLog index 4fba649..87b0c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB * 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases... * 4215 hp_webmgmt_status: Now also displays device model and serial number + * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... * 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/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index f71f205..0c15d14 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -825,6 +825,8 @@ register_rule(group, title = _("Use SSL/HTTPS for the connection"), choices = [ ("auto", _("Use SSL with auto negotiation")), + ("1.2", _("Use SSL, enforce TLSv1.2")), + ("1.1", _("Use SSL, enforce TLSv1.1")), ("1", _("Use SSL, enforce TLSv1")), ("2", _("Use SSL, enforce SSLv2")), ("3", _("Use SSL, enforce SSLv3")),

7 years, 5 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 37d59ddd7fa49b69cea774960b095ae07971ffd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d59ddd7fa49b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sat Jan 28 12:25:58 2017 +0100 Reserved 1 Werk IDS Change-Id: Ic24706e9a6a53d27a5968d73dbacddc328082ab8 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6327683..736d2a9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4332 +4333

7 years, 5 months

4215 hp_webmgmt_status: Now also displays device model and serial number

by Konstantin Büttner

Module: check_mk Branch: master Commit: 24dff20021798db64776d0803b3c541a1b02d22d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24dff20021798d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 27 17:29:44 2017 +0100 4215 hp_webmgmt_status: Now also displays device model and serial number Change-Id: Id0b3599beeaa1f7017eb015e93d2fb03a88af47f --- .werks/4215 | 9 +++++++++ ChangeLog | 1 + checks/hp_webmgmt_status | 16 +++++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/4215 b/.werks/4215 new file mode 100644 index 0000000..1d792fc --- /dev/null +++ b/.werks/4215 @@ -0,0 +1,9 @@ +Title: hp_webmgmt_status: Now also displays device model and serial number +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485534564 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fc04b6c..4fba649 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses... * 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB * 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases... + * 4215 hp_webmgmt_status: Now also displays device model and serial number * 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/checks/hp_webmgmt_status b/checks/hp_webmgmt_status index 8f4a8fb..97c073a 100644 --- a/checks/hp_webmgmt_status +++ b/checks/hp_webmgmt_status @@ -39,10 +39,16 @@ def check_hp_webmgmt_status(item, _no_params, info): "5": (2, "critical"), "6": (2, "non-recoverable") } - for index, health in info: + + device_model = info[1][0][0] + serial_number = info[2][0][0] + for index, health in info[0]: if index == item: status, status_msg = status_map[health] - return status, "Device status: %s" % status_msg + infotext = "Device status: %s" % status_msg + if device_model and serial_number: + infotext += " [Model: %s, Serial Number: %s]" % (device_model, serial_number) + return status, infotext check_info['hp_webmgmt_status'] = { @@ -51,8 +57,12 @@ check_info['hp_webmgmt_status'] = { 'service_description' : "Status %s", 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11")\ and oid(".1.3.6.1.4.1.11.2.36.1.1.5.1.1.*"), - 'snmp_info' : ('.1.3.6.1.4.1.11.2.36.1.1.5.1.1', [1, # hpHttpMgDeviceIndex + 'snmp_info' : [ + ('.1.3.6.1.4.1.11.2.36.1.1.5.1.1', [1, # hpHttpMgDeviceIndex 3 # hpHttpMgDeviceHealth ]), + ('.1.3.6.1.4.1.11.2.36.1.1.5.1.1.9', [1]), # Device Model + ('.1.3.6.1.4.1.11.2.36.1.1.5.1.1.10', [1]), # Device Serial Number + ] }

7 years, 5 months

Added missing changes

by Lars Michelsen

Module: check_mk Branch: master Commit: d00ba81177c6663f2acc73c618b1d864f916ef8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d00ba81177c666… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 12:35:30 2017 +0100 Added missing changes Change-Id: I81f7b7edb7a713a6133e7e2e69ec942f5058232c --- web/htdocs/htmllib.py | 8 +++++--- web/htdocs/wato.py | 24 ++++++++++++++++++++++++ web/plugins/userdb/ldap.py | 14 +++++++++----- web/plugins/views/mkeventd.py | 3 ++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4ce946d..af4e001 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1649,12 +1649,14 @@ class html(DeprecationWrapper): return filename - def makeactionuri(self, addvars, filename=None): - return self.makeuri(addvars + [("_transid", self.get_transid())], filename=filename) + def makeactionuri(self, addvars, filename=None, delvars=None): + return self.makeuri(addvars + [("_transid", self.get_transid())], + filename=filename, delvars=delvars) def makeactionuri_contextless(self, addvars, filename=None): - return self.makeuri_contextless(addvars + [("_transid", self.get_transid())], filename=filename) + return self.makeuri_contextless(addvars + [("_transid", self.get_transid())], + filename=filename) # diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f535412..8b4fe71 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5825,9 +5825,33 @@ def vs_ldap_connection(new, connection_id): 'user_filter', 'user_filter_group', 'user_id', 'lower_user_ids', 'connect_timeout', 'version', 'group_filter', 'group_member', 'suffix', ], + validate = validate_ldap_connection, ) +def validate_ldap_connection(value, varprefix): + for role_id, group_specs in value["active_plugins"].get("groups_to_roles", {}).items(): + for index, group_spec in enumerate(group_specs): + dn, connection_id = group_spec + + if connection_id == None: + group_dn = value["group_dn"] + + else: + connection = userdb.get_connection(connection_id) + if not connection: + continue + group_dn = connection.get_group_dn() + + if not group_dn: + raise MKUserError(varprefix, _("You need to configure the group base DN to be able to " + "use the roles synchronization plugin.")) + + if not dn.lower().endswith(group_dn.lower()): + varname = "connection_p_active_plugins_p_groups_to_roles_p_%s_1_%d" % (role_id, index) + raise MKUserError(varname, _("The configured DN does not match the group base DN.")) + + def mode_edit_ldap_connection(phase): connection_id = html.var("id") connections = userdb.load_connection_config() diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 5e764e3..ea6b2d0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -334,6 +334,10 @@ class LDAPUserConnector(UserConnector): return self._config['group_dn'] != '' + def get_group_dn(self): + return self.replace_macros(self._config['group_dn']) + + def get_suffix(self): return self._config.get('suffix') @@ -378,7 +382,7 @@ class LDAPUserConnector(UserConnector): def group_base_dn_exists(self): - return self.object_exists(self.replace_macros(self._config['group_dn'])) + return self.object_exists(self.get_group_dn()) def ldap_paged_async_search(self, base, scope, filt, columns): @@ -669,7 +673,7 @@ class LDAPUserConnector(UserConnector): def get_groups(self, specific_dn = None): filt = self.ldap_filter('groups') - dn = self.replace_macros(self._config['group_dn']) + dn = self.get_group_dn() if specific_dn: # When using AD, the groups can be filtered by the DN attribute. With @@ -712,8 +716,8 @@ class LDAPUserConnector(UserConnector): add_filt = '(|%s)' % ''.join([ '(%s=%s)' % (filt_attr, f) for f in filters ]) filt = '(&%s%s)' % (filt, add_filt) - for dn, obj in self.ldap_search(self.replace_macros(self._config['group_dn']), - filt, ['cn', member_attr], self._config['group_scope']): + for dn, obj in self.ldap_search(self.get_group_dn(), filt, ['cn', member_attr], + self._config['group_scope']): groups[dn] = { 'cn' : obj['cn'][0], 'members' : [ m.encode('utf-8').lower() for m in obj.get(member_attr,[]) ], @@ -738,7 +742,7 @@ class LDAPUserConnector(UserConnector): groups = {} for filter_val in filters: if filt_attr == 'cn': - result = self.ldap_search(self.replace_macros(self._config['group_dn']), + result = self.ldap_search(self.get_group_dn(), '(&%s(cn=%s))' % (self.ldap_filter('groups'), filter_val), ['dn'], self._config['group_scope']) if not result: diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 4a0b9d8..48e4935 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -324,7 +324,8 @@ if mkeventd_enabled: ("_delete_event", _("Archive Event")), ("_show_result", "0"), ] - url = html.makeactionuri(urlvars, filename=filename) + url = html.makeactionuri(urlvars, filename=filename, + delvars=["selection", "show_checkboxes"]) return html.render_icon_button(url, _("Archive this event"), "delete") else: return ''

7 years, 5 months

4314 FIX Quick event delete icon works with checkboxes enabled now

by Lars Michelsen

Module: check_mk Branch: master Commit: ba12816c686489e126ac71161853ec0bd17824b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba12816c686489… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 11:47:14 2017 +0100 4314 FIX Quick event delete icon works with checkboxes enabled now Change-Id: Ic5a0223df6b846fc63db56501a356e3562a35df4 --- .bugs/2547 | 6 ++++-- .werks/4314 | 9 +++++++++ ChangeLog | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.bugs/2547 b/.bugs/2547 index a30fd1c..6752953 100644 --- a/.bugs/2547 +++ b/.bugs/2547 @@ -1,12 +1,14 @@ Title: Event Console delete icon does not work if checkboxes are enabled Component: ec -State: open +Class: bug +State: done Date: 2016-12-05 13:04:28 Targetversion: 1.2.8 -Class: bug If you activate checkboxes and the use the delete icon for deleting one event you will run into an error message that no items are selected. I fear that I some *would* be selected, then all those would be deleted instead of just that one where the icon was clicked. + +2017-01-27 11:46:38: changed state open -> done diff --git a/.werks/4314 b/.werks/4314 new file mode 100644 index 0000000..8a7c10f --- /dev/null +++ b/.werks/4314 @@ -0,0 +1,9 @@ +Title: Quick event delete icon works with checkboxes enabled now +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1485514011 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 473e0c2..fc04b6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 4219 FIX: Trap processing with community "public" is now only default and not accepted in all cases anymore... NOTE: Please refer to the migration notes! * 4312 FIX: Counting events are now also respecting the EC limits + * 4314 FIX: Quick event delete icon works with checkboxes enabled now HW/SW-Inventory: * 4258 FIX: snmp_extended_info: fixed undefined variable

7 years, 5 months

4016 FIX Windows Agents: fixed broken custom windows performance counter monitoring ( winperf section)

by Andreas Boesl

Module: check_mk Branch: master Commit: a3e385ec7638c5380db10faa85143e4cc7a32d89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e385ec7638c5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 27 13:24:22 2017 +0100 4016 FIX Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) Change-Id: I001dbabd902d9fcf8e26f34eca3a876949402cec --- .werks/4016 | 9 ++++++++ ChangeLog | 1 + agents/windows/SectionManager.cc | 27 +++++++++++++++-------- agents/windows/SectionManager.h | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1439232 -> 1328640 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 17018273 -> 15652368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1439232 -> 1328640 bytes agents/windows/check_mk_agent.cc | 1 + agents/windows/check_mk_agent.exe | Bin 1304064 -> 1305088 bytes agents/windows/check_mk_agent.msi | Bin 3014144 -> 2903552 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13537258 -> 13543976 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1304064 -> 1305088 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 615184 -> 586639 bytes agents/windows/install_agent.exe | Bin 583368 -> 583697 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionWMI.cc | 4 ++++ 18 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.werks/4016 b/.werks/4016 new file mode 100644 index 0000000..ac099f4 --- /dev/null +++ b/.werks/4016 @@ -0,0 +1,9 @@ +Title: Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) +Level: 2 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485519795 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7daf617..473e0c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 4304 FIX: mk_inventory.linux: fixed missing redirection to null device in if statement * 4305 FIX: postgres_stat_database.size: fixed missing database size perfometer * 4313 FIX: ps: Improved performance of ps check on systems with a large number of processes + * 4016 FIX: Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 57f8c31..2478b29 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -41,13 +41,19 @@ void SectionManager::addSection(Section *section) { } bool SectionManager::sectionEnabled(const std::string &name) const { - // if no sections were set, assume they are all enabled + // If no sections were set, assume they are all enabled + std::string section_name = name; + + // Special handling for winperf_* custom sections + if (name.substr(0, 8) == std::string("winperf_")) + section_name = std::string("winperf"); + bool is_disabled = - _disabled_sections->find(name) != _disabled_sections->end(); + _disabled_sections->find(section_name) != _disabled_sections->end(); bool is_enabled = !_enabled_sections.wasAssigned() || - (_enabled_sections->find(name) != _enabled_sections->end()); + (_enabled_sections->find(section_name) != _enabled_sections->end()); return !is_disabled && is_enabled; } @@ -59,6 +65,15 @@ bool SectionManager::useRealtimeMonitoring() const { return _realtime_sections->size(); } +void SectionManager::loadDynamicSections() { + for (winperf_counter *counter : *_winperf_counters) { + if (counter->id != -1) { + addSection((new SectionWinperf(counter->name.c_str())) + ->withBase(counter->id)); + } + } +} + void SectionManager::loadStaticSections(Configuration &config, const Environment &env) { addSection(new SectionCrashDebug(config)); @@ -76,12 +91,6 @@ void SectionManager::loadStaticSections(Configuration &config, ->withBase(238) ->withRealtimeSupport()); - for (winperf_counter *counter : *_winperf_counters) { - if (counter->id != -1) { - addSection((new SectionWinperf(counter->name.c_str())) - ->withBase(counter->id)); - } - } addSection(new SectionEventlog(config)); addSection(new SectionLogwatch(config, env)); diff --git a/agents/windows/SectionManager.h b/agents/windows/SectionManager.h index d8cc3c0..0bdf38b 100644 --- a/agents/windows/SectionManager.h +++ b/agents/windows/SectionManager.h @@ -65,7 +65,7 @@ public: ~SectionManager() { _sections.clear(); } void emitConfigLoaded(const Environment &env); - + void loadDynamicSections(); const std::vector<std::unique_ptr<Section>> &sections() const { return _sections; } diff --git a/agents/windows/build_version b/agents/windows/build_version index 38e2443..324f7a3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2488 +2518 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 606a633..3dfb0ce 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 9a63b28..a2032f4 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 dc53938..0025556 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.cc b/agents/windows/check_mk_agent.cc index 40f5541..c745e59 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -938,6 +938,7 @@ void RunImmediate(const char *mode, int argc, char **argv) { g_config->parser.readSettings(); postProcessOnlyFrom(); + g_sections->loadDynamicSections(); g_sections->emitConfigLoaded(env); if (!strcmp(mode, "test")) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d6d9939..d545f22 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 7c829e0..c04a63a 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 5ab29b6..805f0dd 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 55da4fa..42eff1c 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 12b2a4f..70c7b87 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 c8cdad9..1bc1758 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 2de2c64..f8b352f 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 7f9fecd..142db98 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/sections/SectionWMI.cc b/agents/windows/sections/SectionWMI.cc index 86c2abc..e4564dd 100644 --- a/agents/windows/sections/SectionWMI.cc +++ b/agents/windows/sections/SectionWMI.cc @@ -27,6 +27,10 @@ #include "../wmiHelper.h" #include <ctime> + +// How to fix broken performance counters +// http://johansenreidar.blogspot.de/2014/01/windows-server-rebuild-all-perfor… + SectionWMI::SectionWMI(const char *name) : Section(name) { withSeparator(','); } SectionWMI *SectionWMI::withNamespace(const wchar_t *name) {

7 years, 5 months

LDAP: Always do paged sync

by Lars Michelsen

Module: check_mk Branch: master Commit: bc4f9695bc97a9455d88a94e38ee9427c6f5cba4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc4f9695bc97a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 10:51:14 2017 +0100 LDAP: Always do paged sync Change-Id: Iecd8f8dc67c43f6ac062df4e3ef6eba3d27813dc --- web/plugins/userdb/ldap.py | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 986a79f..5e764e3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -381,28 +381,6 @@ class LDAPUserConnector(UserConnector): return self.object_exists(self.replace_macros(self._config['group_dn'])) - def ldap_async_search(self, base, scope, filt, columns): - self.log(' ASYNC SEARCH') - msgid = self._ldap_obj.search_ext(base, scope, filt, columns) - - results = [] - while True: - restype, resdata = self._ldap_obj.result(msgid = msgid, - timeout = self._config.get('response_timeout', 5)) - - results.extend(resdata) - if restype == ldap.RES_SEARCH_RESULT or not resdata: - break - - # no limit at the moment - #if sizelimit and len(users) >= sizelimit: - # self._ldap_obj.abandon_ext(msgid) - # break - time.sleep(0.1) - - return results - - def ldap_paged_async_search(self, base, scope, filt, columns): self.log(' PAGED ASYNC SEARCH') page_size = self._config.get('page_size', 1000) @@ -462,9 +440,8 @@ class LDAPUserConnector(UserConnector): self.connect() result = [] try: - search_func = self._config.get('page_size') \ - and self.ldap_paged_async_search or self.ldap_async_search - for dn, obj in search_func(make_utf8(base), self.ldap_get_scope(scope), make_utf8(filt), columns): + for dn, obj in self.ldap_paged_async_search(make_utf8(base), + self.ldap_get_scope(scope), make_utf8(filt), columns): if dn is None: continue # skip unwanted answers new_obj = {}

7 years, 5 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017