Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX LDAP: Now handling user-ids with umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: 84f69ad53ba14c7f5f627cf2ed6e62fee7ab100a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f69ad53ba14c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:06:27 2013 +0100 FIX LDAP: Now handling user-ids with umlauts User-IDs with umlauts seem to be used in some installations. We added one new configuration options to handle those User-IDs. The default is now that multisite replaces the umlauts ü, ö, ä, ß with two letters ue, oe, ae, ss. Other umlauts are left untouched. Another option is that users with umlauts are simply skipped and not synced into multisite. Please note: Users with umlauts need to login with their umlaut login name. After login, the username is always used without umlauts within multisite. Maybe we make multisite handle umlauts correctly one day, but for the moment this change could have too many unwanted results. --- .werks/375 | 19 +++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 5 ++- web/plugins/userdb/ldap.py | 49 +++++++++++++++++++++------- web/plugins/wato/check_mk_configuration.py | 13 +++++++- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/.werks/375 b/.werks/375 new file mode 100644 index 0000000..3f7a792 --- /dev/null +++ b/.werks/375 @@ -0,0 +1,19 @@ +Title: LDAP: Now handling user-ids with umlauts +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387270969 +Targetversion: future + +User-IDs with umlauts seem to be used in some installations. We added one new configuration +options to handle those User-IDs. The default is now that multisite replaces the umlauts +ü, ö, ä, ß with two letters ue, oe, ae, ss. Other umlauts are left untouched. Another option +is that users with umlauts are simply skipped and not synced into multisite. + +Please note: Users with umlauts need to login with their umlaut login name. After login, the +username is always used without umlauts within multisite. + +Maybe we make multisite handle umlauts correctly one day, but for the moment this change +could have too many unwanted results. diff --git a/ChangeLog b/ChangeLog index 6ca7559..b89185e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 0356 FIX: Fixed exception caused by utf8 chars in tooltip text... * 0368 FIX: Generating selection id is hopefully now compatible to more systems... * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... + * 0375 FIX: LDAP: Now handling user-ids with umlauts... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c5a3b1a..fd285d8 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -215,7 +215,10 @@ escape_plugin_output = True user_connectors = ['htpasswd'] userdb_automatic_sync = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ] ldap_connection = {} -ldap_userspec = {} +ldap_userspec = { + 'scope' : 'sub', + 'user_id_umlauts' : 'replace', +} ldap_groupspec = {} ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} ldap_cache_livetime = 300 diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index bf14356..ca1fd6c 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -399,6 +399,36 @@ def ldap_replace_macros(tmpl): return dn +def ldap_rewrite_user_id(user_id): + if config.ldap_userspec.get('lower_user_ids', False): + user_id = user_id.lower() + + umlauts = config.ldap_userspec.get('user_id_umlauts', 'replace') + new = "" + for c in user_id: + if c == u'ü': + new += 'ue' + elif c == u'ö': + new += 'oe' + elif c == u'ä': + new += 'ae' + elif c == u'ß': + new += 'ss' + elif c == u'Ü': + new += 'UE' + elif c == u'Ö': + new += 'OE' + elif c == u'Ä': + new += 'AE' + else: + new += c + if umlauts == 'replace': + user_id = new + elif umlauts == 'skip' and user_id != new: + return None # This makes the user being skipped + + return user_id + def ldap_user_id_attr(): return config.ldap_userspec.get('user_id', ldap_attr('user_id')) @@ -430,11 +460,9 @@ def ldap_get_user(username, no_escape = False): if result: dn = result[0][0] - user_id = result[0][1][ldap_user_id_attr()][0] - - if config.ldap_userspec.get('lower_user_ids', False): - user_id = user_id.lower() - + user_id = ldap_rewrite_user_id(result[0][1][ldap_user_id_attr()][0]) + if user_id is None: + return None g_ldap_user_cache[username] = (dn, user_id) if no_escape: @@ -488,13 +516,10 @@ def ldap_get_users(add_filter = ''): if ldap_user_id_attr() not in ldap_user: raise MKLDAPException(_('The configured User-ID attribute "%s" does not ' 'exist for the user "%s"') % (ldap_user_id_attr(), dn)) - user_id = ldap_user[ldap_user_id_attr()][0] - - if config.ldap_userspec.get('lower_user_ids', False): - user_id = user_id.lower() - - ldap_user['dn'] = dn # also add the DN - result[user_id] = ldap_user + user_id = ldap_rewrite_user_id(ldap_user[ldap_user_id_attr()][0]) + if user_id: + ldap_user['dn'] = dn # also add the DN + result[user_id] = ldap_user return result diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2a25018..5ffabb5 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -698,8 +698,19 @@ register_configvar(group, value = True, totext = _("Enforce lower case User-IDs."), )), + ("user_id_umlauts", DropdownChoice( + title = _("Umlauts in User-IDs"), + help = _("Multisite does not support umlauts in User-IDs at the moment. To deal " + "with LDAP users having umlauts in their User-IDs you have the following " + "choices."), + choices = [ + ("replace", _("Replace umlauts like \"ü\" with \"ue\"")), + ("skip", _("Skip users with umlauts in their User-IDs")), + ], + default_value = "replace", + )), ], - optional_keys = ['scope', 'filter', 'filter_group', 'user_id', 'lower_user_ids'], + optional_keys = ['filter', 'filter_group', 'user_id', 'lower_user_ids', ], ), domain = "multisite", in_global_settings = False,

10 years, 6 months

Check_MK Git: check_mk: FIX LDAP: Default configuration of attributes is reflected within WATO now

by Lars Michelsen

Module: check_mk Branch: master Commit: 6dd78ca0453c5f920dadfed9e1d4f5f0bf098b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd78ca0453c5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:11:21 2013 +0100 FIX LDAP: Default configuration of attributes is reflected within WATO now --- .werks/376 | 10 ++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 4 +++- web/plugins/wato/check_mk_configuration.py | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/376 b/.werks/376 new file mode 100644 index 0000000..42f1cc6 --- /dev/null +++ b/.werks/376 @@ -0,0 +1,10 @@ +Title: LDAP: Default configuration of attributes is reflected within WATO now +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387271448 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index b89185e..f228f00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 0332 FIX: Own host tag groups without topics resulted in two groups "Host tags" in the rule editor * 0361 FIX: The page linked by "new rule" can now be bookmarked again * 0341 FIX: Avoid rare exception in WATO when deleting a host... + * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index fd285d8..bec88d0 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -219,7 +219,9 @@ ldap_userspec = { 'scope' : 'sub', 'user_id_umlauts' : 'replace', } -ldap_groupspec = {} +ldap_groupspec = { + 'scope' : 'sub', +} ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} ldap_cache_livetime = 300 ldap_debug_log = None diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5ffabb5..f7b0a1a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -759,7 +759,7 @@ register_configvar(group, attrencode = True, )), ], - optional_keys = ['scope', 'filter', 'member'], + optional_keys = ['filter', 'member'], ), domain = "multisite", in_global_settings = False,

10 years, 6 months

Check_MK Git: check_mk: FIX: Linux agent: fix detaching of background plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b97347881693169485aeb1685d2900f6568aee9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b973478816931… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 10:07:46 2013 +0100 FIX: Linux agent: fix detaching of background plugins The asynchronous execution of background processes in the Linux agent has been fixed. Before it could have happened that the agent starts background processes but - however - waits for all of them to finish until finishing itself. This has now been fixed. All plugins started with run_cached are now correctly detached from the agent. --- .werks/345 | 14 ++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/345 b/.werks/345 new file mode 100644 index 0000000..fed7f1f --- /dev/null +++ b/.werks/345 @@ -0,0 +1,14 @@ +Title: Linux agent: fix detaching of background plugins +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387270406 +Targetversion: future + +The asynchronous execution of background processes in the Linux agent has +been fixed. Before it could have happened that the agent starts background +processes but - however - waits for all of them to finish until finishing +itself. This has now been fixed. All plugins started with run_cached are +now correctly detached from the agent. diff --git a/ChangeLog b/ChangeLog index 6ca7559..0ad4f89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0369 FIX: cups_queues: Fixed bug checking the last queue reported by agent... * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... + * 0345 FIX: Linux agent: fix detaching of background plugins... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 28453ad..2f67328 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -88,7 +88,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "$CMDLINE" | setsid bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + echo "set -o noclobber ; exec > $CACHEFILE.new || exit 1 ; $CMDLINE && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new" | nohup bash 2>/dev/null & fi }

10 years, 6 months

Check_MK Git: check_mk: FIX Fixed syntax error in exception handler of LDAP search code

by Lars Michelsen

Module: check_mk Branch: master Commit: a8d162b91c6fd94048a30bfbc25f13d60f6e130d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d162b91c6fd9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 09:21:00 2013 +0100 FIX Fixed syntax error in exception handler of LDAP search code The exceptions are generated correctly now to show the real error message. --- .werks/374 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/374 b/.werks/374 new file mode 100644 index 0000000..8bd910f --- /dev/null +++ b/.werks/374 @@ -0,0 +1,10 @@ +Title: Fixed syntax error in exception handler of LDAP search code +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387268423 +Targetversion: future + +The exceptions are generated correctly now to show the real error message. diff --git a/ChangeLog b/ChangeLog index 4b77afe..6ca7559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 0333 FIX: Fixed too long page title during performing several actions... * 0356 FIX: Fixed exception caused by utf8 chars in tooltip text... * 0368 FIX: Generating selection id is hopefully now compatible to more systems... + * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3f3bed2..bf14356 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -363,8 +363,8 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): raise MKLDAPException(_('Unable to successfully perform the LDAP search ' '(Base: %s, Scope: %s, Filter: %s, Columns: %s): %s') % (html.attrencode(base), html.attrencode(scope), - html.attrencode(filt), html.attrencode(','.join(columns))), - last_exc) + html.attrencode(filt), html.attrencode(','.join(columns)), + last_exc)) else: raise MKLDAPException(_('Unable to successfully perform the LDAP search (%s)') % last_exc)

10 years, 6 months

Check_MK Git: check_mk: user sync: More verbose exception handling during manually triggered user sync

by Lars Michelsen

Module: check_mk Branch: master Commit: dbef4c3acfe1db816015eacea69ef3f3d2187ac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbef4c3acfe1db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 09:33:30 2013 +0100 user sync: More verbose exception handling during manually triggered user sync --- web/htdocs/wato.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4414320..029eac2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8872,7 +8872,11 @@ def mode_users(phase): if userdb.hook_sync(add_to_changelog = True, raise_exc = True): return None, _('The user synchronization completed successfully.') except Exception, e: - raise MKUserError(None, str(e)) + if config.debug: + import traceback + raise MKUserError(None, traceback.format_exc().replace('\n', '<br>\n')) + else: + raise MKUserError(None, str(e)) return None

10 years, 6 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 17167f110e0386ce387c1d2b56cd3034c0fb61b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17167f110e0386… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:01:29 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d9061d9..e537bfe 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -375 +395

10 years, 6 months

Check_MK Git: check_mk: wut_webtherm: Supporting several other devices now

by Lars Michelsen

Module: check_mk Branch: master Commit: b6788829774cad070f2c9ec29f33ea1bf29fc514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6788829774cad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 19:54:12 2013 +0100 wut_webtherm: Supporting several other devices now --- .werks/373 | 10 ++++++++++ ChangeLog | 1 + checks/wut_webtherm | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/373 b/.werks/373 new file mode 100644 index 0000000..31e7e4b --- /dev/null +++ b/.werks/373 @@ -0,0 +1,10 @@ +Title: wut_webtherm: Supporting several other devices now +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387220019 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index fcb6df2..4b77afe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0075 raritan_pdu_inlet: new check to monitor inlet sensors of the Raritan PX-2000 PDUs * 0315 hitachi_hnas_quorumdevice, hitachi_hnas_pnode, hitachi_hnas_vnode: New checks for Hitachi HNAS devices * 0316 hitachi_hnas_cpu: New check for CPU utilization of Hitachi HNAS devices + * 0373 wut_webtherm: Supporting several other devices now * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 289ccbf..445479a 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -53,7 +53,9 @@ def detect_webtherm(oid): ".1.3.6.1.4.1.5040.1.2.2", ".1.3.6.1.4.1.5040.1.2.3", ".1.3.6.1.4.1.5040.1.2.6", + ".1.3.6.1.4.1.5040.1.2.7", ".1.3.6.1.4.1.5040.1.2.8", + ".1.3.6.1.4.1.5040.1.2.9", ".1.3.6.1.4.1.5040.1.2.16" ] check_info["wut_webtherm"] = { @@ -62,7 +64,7 @@ check_info["wut_webtherm"] = { 'service_description': 'Thermograph Sensor %s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.5040.1.2', - ['1', '2', '3', '6', '8', '16'], + ['1', '2', '3', '6', '7', '8', '9', '16'], ['1.2.1.1', '1.3.1.1'] ), 'snmp_scan_function': detect_webtherm,

10 years, 6 months

Check_MK Git: check_mk: Added log class filter to hostsvcevents view

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f7a4e5deee249fc05f8855df1409d8f643baa6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f7a4e5deee249… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 19:26:49 2013 +0100 Added log class filter to hostsvcevents view --- .werks/371 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/371 b/.werks/371 new file mode 100644 index 0000000..bd4a58b --- /dev/null +++ b/.werks/371 @@ -0,0 +1,10 @@ +Title: Added log class filter to hostsvcevents view +Level: 1 +Component: multisite +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387218393 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index fc739f0..29b2b20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0370 FIX: brocade_mlx_module*: Improved output of checks Multisite: + * 0371 Added log class filter to hostsvcevents view * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... * 0307 FIX: Increased performance of multisite GUI with a large userbase... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 91a6907..c340b53 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1907,7 +1907,7 @@ multisite_builtin_views.update({ ], 'play_sounds': False, 'public': True, - 'show_filters': ['logtime', 'log_state', 'log_state'], + 'show_filters': ['logtime', 'log_state', 'log_class'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host & services')}, 'logfile': {'browser_reload': 0,

10 years, 6 months

Check_MK Git: check_mk: FIX megaraid_ldisks: Ignoring adapters without configured logical disks

by Lars Michelsen

Module: check_mk Branch: master Commit: 061ba50810877303c4d7137dc50a78d71216ba3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=061ba508108773… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 19:34:47 2013 +0100 FIX megaraid_ldisks: Ignoring adapters without configured logical disks Previous versions of this check did simply fail with an exception if an adapter has no logical disks configured. This change makes the inventory function simply ignore those adapters. --- .werks/372 | 12 ++++++++++++ ChangeLog | 1 + checks/megaraid_ldisks | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/372 b/.werks/372 new file mode 100644 index 0000000..9cb2c21 --- /dev/null +++ b/.werks/372 @@ -0,0 +1,12 @@ +Title: megaraid_ldisks: Ignoring adapters without configured logical disks +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387218819 +Targetversion: future + +Previous versions of this check did simply fail with an exception if an +adapter has no logical disks configured. This change makes the inventory +function simply ignore those adapters. diff --git a/ChangeLog b/ChangeLog index 29b2b20..29d5c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 0343 FIX: postgres_sessions: make agent plugin compatible with PostgreSQL 9.2... * 0369 FIX: cups_queues: Fixed bug checking the last queue reported by agent... * 0370 FIX: brocade_mlx_module*: Improved output of checks + * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/megaraid_ldisks b/checks/megaraid_ldisks index d09fbce..c6c7d29 100644 --- a/checks/megaraid_ldisks +++ b/checks/megaraid_ldisks @@ -31,12 +31,14 @@ # State: Optimal # Stripe Size: 64kB # Number Of Drives:2 +# Adapter 1: No Virtual Drive Configured. def inventory_megaraid_ldisks(info): inventory = [] adapter = None for line in info: - if line[0] == "Adapter": + l = ' '.join(line) + if line[0] == "Adapter" and not l.endswith('No Virtual Drive Configured.'): adapter = int(line[1]) elif line[0] == "Virtual" and (line[1] == "Disk:" or line[1] == "Drive:"): disk = int(line[2])

10 years, 6 months

Check_MK Git: check_mk: FIX Fix semantics of columns num_services_hard_*

by Mathias Kettner

Module: check_mk Branch: master Commit: cede101c08feafef766b4e3298fcf7acec7d3910 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cede101c08feaf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 19:36:27 2013 +0100 FIX Fix semantics of columns num_services_hard_* In the tables <tt>hosts</tt> and <tt>servicegroups</tt> the columns <tt>num_services_hard_warn</tt>, <tt>num_services_hard_crit</tt> and <tt>num_services_hard_unknown<tt> did not correctly reflect the hard status but in most cases just the soft status - effectively ignoring the <tt>_hard_</tt>. This has now been fixed. --- .werks/344 | 14 ++++++++++++++ ChangeLog | 1 + livestatus/src/ServicelistStateColumn.cc | 8 +++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/344 b/.werks/344 new file mode 100644 index 0000000..36054cf --- /dev/null +++ b/.werks/344 @@ -0,0 +1,14 @@ +Title: Fix semantics of columns num_services_hard_* +Level: 1 +Component: livestatus +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387218771 +Targetversion: future + +In the tables <tt>hosts</tt> and <tt>servicegroups</tt> the columns +<tt>num_services_hard_warn</tt>, <tt>num_services_hard_crit</tt> and +<tt>num_services_hard_unknown<tt> did not correctly reflect the +hard status but in most cases just the soft status - effectively +ignoring the <tt>_hard_</tt>. This has now been fixed. diff --git a/ChangeLog b/ChangeLog index fc739f0..f49b2a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 0337 New header for limiting the execution time of a query... * 0335 FIX: Parse state of downtime notification log entries correctly... * 0336 FIX: Limit the number of lines read from a single logfile... + * 0344 FIX: Fix semantics of columns num_services_hard_*... 1.2.3i7: diff --git a/livestatus/src/ServicelistStateColumn.cc b/livestatus/src/ServicelistStateColumn.cc index a4f9064..7565091 100644 --- a/livestatus/src/ServicelistStateColumn.cc +++ b/livestatus/src/ServicelistStateColumn.cc @@ -51,22 +51,24 @@ int32_t ServicelistStateColumn::getValue(int logictype, servicesmember *mem, Que { contact *auth_user = query->authUser(); int32_t result = 0; + int lt; while (mem) { service *svc = mem->service_ptr; if (!auth_user || g_table_services->isAuthorized(auth_user, svc)) { + int lt = logictype; int state; int has_been_checked; if (logictype >= 60) { state = svc->last_hard_state; - logictype -= 64; + lt -= 64; } else state = svc->current_state; has_been_checked = svc->has_been_checked; - switch (logictype) { + switch (lt) { case SLSC_WORST_STATE: if (svcStateIsWorse(state, result)) result = state; @@ -79,7 +81,7 @@ int32_t ServicelistStateColumn::getValue(int logictype, servicesmember *mem, Que result++; break; default: - if (has_been_checked && state == logictype) + if (has_been_checked && state == lt) result++; break; }

10 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013