Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX Increased performance of multisite GUI with a large userbase

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e3cc33004f3ec5b19c621b64c05e4a7ac790251 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e3cc33004f3ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 14:19:56 2013 +0100 FIX Increased performance of multisite GUI with a large userbase --- .werks/307 | 8 ++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 14 ++++++++++++++ web/htdocs/login.py | 3 --- web/htdocs/userdb.py | 9 +++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/307 b/.werks/307 new file mode 100644 index 0000000..3648423 --- /dev/null +++ b/.werks/307 @@ -0,0 +1,8 @@ +Title: Increased performance of multisite GUI with a large userbase +Level: 1 +Component: multisite +Version: 1.2.3i8 +Date: 1386595064 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 126a657..47582d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE + * 0307 FIX: Increased performance of multisite GUI with a large userbase WATO: * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 16f2c8c..a54368d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -70,6 +70,7 @@ class html: self.help_visible = False self.treestates = {} self.treestates_for_id = None + self.caches = {} RETURN = 13 SHIFT = 16 @@ -1246,3 +1247,16 @@ class html: def uploaded_file(self, varname, default = None): raise MKGeneralException("uploaded_file not implemented") + + # + # Per request caching + # + + def set_cache(self, name, value): + self.caches[name] = value + + def is_cached(self, name): + return name in self.caches + + def get_cached(self, name): + return self.caches.get(name) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 3d65284..5f691c3 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -88,9 +88,6 @@ def auth_cookie_value(username, serial): def set_auth_cookie(username, serial): html.set_cookie(site_cookie_name(), auth_cookie_value(username, serial)) -def get_cookie_value(): - return auth_cookie_value(config.user_id, load_serial(config.user_id)) - def renew_cookie(cookie_name, username, serial): # Do not renew if: # a) The _ajaxid var is set diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index d69d733..7808dc9 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -185,6 +185,9 @@ def load_users(lock = False): file(filename, "a") aquire_lock(filename) + if html.is_cached('users'): + return html.get_cached('users') + # First load monitoring contacts from Check_MK's world. If this is # the first time, then the file will be empty, which is no problem. # Execfile will the simply leave contacts = {} unchanged. @@ -316,6 +319,9 @@ def load_users(lock = False): "automation_secret" : secret, } + # populate the users cache + html.set_cache('users', result) + return result def load_custom_attr(userid, key, conv_func, default = None): @@ -457,6 +463,9 @@ def save_users(profiles): # to be written (like during user syncs, wato, ...) release_lock(root_dir + "contacts.mk") + # populate the users cache + html.set_cache('users', users) + # Call the users_saved hook hooks.call("users-saved", users)

10 years, 9 months

Check_MK Git: check_mk: FIX: Increased performance of multisite GUI with a large userbase

by Lars Michelsen

Module: check_mk Branch: master Commit: 1dae3efa68c2cf94689342bb6b2fa317a0007bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dae3efa68c2cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 14:37:50 2013 +0100 FIX: Increased performance of multisite GUI with a large userbase --- .werks/307 | 4 +++- ChangeLog | 2 +- web/htdocs/login.py | 10 +++++----- web/htdocs/userdb.py | 6 ++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.werks/307 b/.werks/307 index 3648423..6cb3aa1 100644 --- a/.werks/307 +++ b/.werks/307 @@ -5,4 +5,6 @@ Version: 1.2.3i8 Date: 1386595064 Class: fix - +The processing performance of each multisite page might decrease +when having a large amount of users. This commit tries to reduce +the time taken by processing the user information. diff --git a/ChangeLog b/ChangeLog index 47582d4..baac9e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE - * 0307 FIX: Increased performance of multisite GUI with a large userbase + * 0307 FIX: Increased performance of multisite GUI with a large userbase... WATO: * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 5f691c3..c3a06e0 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -67,9 +67,10 @@ def load_secret(): # Load the password serial of the user. This serial identifies the current config # state of the user account. If either the password is changed or the account gets # locked the serial is increased and all cookies get invalidated. -def load_serial(user_id): - users = userdb.load_users() - return users.get(user_id, {}).get('serial', 0) +# Better use the value from the "serials.mk" file, instead of loading the whole +# user database via load_users() for performance reasons. +def load_serial(username): + return userdb.load_custom_attr(username, 'serial', saveint, 0) # Generates the hash to be added into the cookie value def generate_hash(username, now, serial): @@ -105,8 +106,7 @@ def check_auth_cookie(cookie_name): # del_auth_cookie() # return '' - users = userdb.load_users().keys() - if not username in users: + if not userdb.user_exists(username): raise MKAuthException(_('Username is unknown')) # Validate the hash diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 7808dc9..43ad80b 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -117,6 +117,12 @@ def create_non_existing_user(connector_id, username): # Call the sync function for this new user hook_sync(connector_id = connector_id, only_username = username) +# FIXME: Can we improve this easily? Would be nice not to have to call "load_users". +# Maybe a directory listing of profiles or a list of a small file would perform better +# than having to load the users, contacts etc. during each http request to multisite +def user_exists(username): + return username in load_users().keys() + def user_locked(username): users = load_users() return users[username].get('locked', False)

10 years, 9 months

Check_MK Git: check_mk: FIX mssql: Server instances with underline in name are now supported.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 824a1ce1f1524ddf724ee903edc0bb6b7c06e435 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=824a1ce1f1524d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 9 14:09:24 2013 +0100 FIX mssql: Server instances with underline in name are now supported. Thanks to a patch from H.Schniggendiller --- .werks/104 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 21 ++++++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.werks/104 b/.werks/104 new file mode 100644 index 0000000..c306f80 --- /dev/null +++ b/.werks/104 @@ -0,0 +1,8 @@ +Title: mssql: Server instances with underline in name are now supported. +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386594495 +Class: fix + +Thanks to a patch from H.Schniggendiller diff --git a/ChangeLog b/ChangeLog index 72ef6c3..fd86410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... * 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data... + * 0104 FIX: mssql: Server instances with underline in name are now supported.... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index b9fc1c9..7f508ff 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -17,11 +17,13 @@ ' ' This check has been developed with MSSQL Server 2008 R2. It should work with ' older versions starting from at least MSSQL Server 2005. +' +' 16.10.2013 Instanzen mit Unterstrich im Namen -- H.Schniggendiller ' ----------------------------------------------------------------------------- Option Explicit -Dim WMI, prop, instId, instVersion, instIds, instName, output, WMIservice, colRunningServices, objService +Dim WMI, prop, instId, instIdx, instVersion, instIds, instName, output, WMIservice, colRunningServices, objService WScript.Timeout = 10 @@ -71,11 +73,11 @@ For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " Set colRunningServices = WMIservice.ExecQuery("SELECT State FROM Win32_Service WHERE Name = '" & prop.ServiceName & "'") - instId = Replace(prop.ServiceName, "$", "_") + instId = Replace(prop.ServiceName, "$", "__") instVersion = prop.PropertyStrValue - + instIdx = Replace(instId, "__", "_") addOutput( "<<<mssql_versions>>>" ) - addOutput( instId & " " & instVersion ) + addOutput( instIdx & " " & instVersion ) ' Now query the server instance for the databases ' Use name as key and always empty value for the moment @@ -106,9 +108,10 @@ For Each instId In instIds.Keys ' At this place one could implement to use other authentication mechanism CONN.Properties("Integrated Security").Value = "SSPI" - If InStr(instId, "_") <> 0 Then - instName = Split(instId, "_")(1) - Else + If InStr(instId, "__") <> 0 Then + instName = Split(instId, "__")(1) + instId = Replace(instId, "__", "_") + Else instName = instId End If @@ -117,7 +120,8 @@ For Each instId In instIds.Keys CONN.Properties("Data Source").Value = "(local)" Else CONN.Properties("Data Source").Value = hostname & "\" & instName - End If + End If + 'WScript.echo (CONN) CONN.Open @@ -217,4 +221,3 @@ Set CONN = nothing ' finally output collected data WScript.echo output -

10 years, 9 months

Check_MK Git: check_mk: FIX Fixed incorrect html formatting when displaying host or service comments

by Andreas Boesl

Module: check_mk Branch: master Commit: 73817857ac4823dca6fd301f6bc8954637bec5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73817857ac4823… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 9 14:04:39 2013 +0100 FIX Fixed incorrect html formatting when displaying host or service comments The comment icon in a multisite view was not drawn correctly whenever a comment for this host or service had a single quote. --- .werks/239 | 9 +++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/239 b/.werks/239 new file mode 100644 index 0000000..40b6bef --- /dev/null +++ b/.werks/239 @@ -0,0 +1,9 @@ +Title: Fixed incorrect html formatting when displaying host or service comments +Level: 1 +Component: multisite +Version: 1.2.3i8 +Date: 1386594095 +Class: fix + +The comment icon in a multisite view was not drawn correctly whenever +a comment for this host or service had a single quote. diff --git a/ChangeLog b/ChangeLog index 126a657..72ef6c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Multisite: * 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... WATO: * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index ee90cf1..4bcfc7f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -380,6 +380,7 @@ def paint_comments(what, row, tags, custom_vars): text = "" for c in comments: id, author, comment, ty, timestamp = c + comment = comment.replace("\n", "<br>").replace("'","'") text += "%s %s: \"%s\" \n" % (paint_age(timestamp, True, 0, 'abs')[1], author, comment) return link_to_view('<img class=icon title=\'%s\' ' \ 'src="images/icon_comment.gif">' %

10 years, 9 months

Check_MK Git: check_mk: strip_bad_chars(..): fixed bug in unicode conversion with s.translate

by Andreas Boesl

Module: check_mk Branch: master Commit: cd48c6ff4ad0df55511b3533a7727a670618a30f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd48c6ff4ad0df… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 9 12:24:44 2013 +0100 strip_bad_chars(..): fixed bug in unicode conversion with s.translate --- web/htdocs/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index d45e454..385dd1e 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -112,6 +112,7 @@ def strip_bad_chars(x): s = "".join([c for c in x if c > ' ' and c < 'z']) if type(x) == unicode: + s = unicode(s) return s.translate({ ord(u"'"): None, ord(u"&"): None,

10 years, 9 months

Check_MK Git: check_mk: Added config snippet folder to treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: 59a7d3de03e1d609824f6d0f73f2d71517603ac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59a7d3de03e1d6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 9 11:22:03 2013 +0100 Added config snippet folder to treasures --- doc/treasures/config_snippets/exchange.rules.mk | 64 +++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/doc/treasures/config_snippets/exchange.rules.mk b/doc/treasures/config_snippets/exchange.rules.mk new file mode 100644 index 0000000..7a18827 --- /dev/null +++ b/doc/treasures/config_snippets/exchange.rules.mk @@ -0,0 +1,64 @@ +# Written by WATO +# encoding: utf-8 + + +inventory_services_rules = [ + ( {'services': ['MSExchangeIS', 'MSExchangeMTA', 'MSExchangeSA', 'MSExchangeMGMT', 'MSSEARCH', 'RESvc', 'SMTPSVC']}, ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), +] + inventory_services_rules + + +host_groups = [ + ( 'exchange', ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), +] + host_groups + + +static_checks.setdefault('services', []) + +static_checks['services'] = [ + ( ('services', 'MSExchangeADTopology', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Active Directory Topology'} ), + ( ('services', 'MSExchangeAB', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Active Addressbook'} ), + ( ('services', 'MSExchangeAntispamUpdate', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Microsoft Exchange Anti-spam Update'} ), + ( ('services', 'MSExchangeEdgeSync', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange EdgeSync'} ), + ( ('services', 'MSExchangeFDS', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange File Distribution'} ), + ( ('services', 'MSExchangeFBA', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Forms-Based Authentication service'} ), + ( ('services', 'MSExchangeIS', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Information Store'} ), + ( ('services', 'MSExchangeMailSubmission', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Mail Submission'} ), + ( ('services', 'MSExchangeMailboxAssistants', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Mailbox Assistants'} ), + ( ('services', 'MSExchangeMailboxReplication', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Mailbox Replication'} ), + ( ('services', 'MSExchangeProtectedServiceHost', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Protected Service Host'} ), + ( ('services', 'MSExchangeRepl', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Replication'} ), + ( ('services', 'MSExchangeRPC', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange RPC Client Access'} ), + ( ('services', 'MSExchangeSearch', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Search Indexer'} ), + ( ('services', 'MSExchangeServiceHost', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Service Host'} ), + ( ('services', 'MSExchangeSA', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange System Attendant'} ), + ( ('services', 'MSExchangeThrottling', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Throttling'} ), + ( ('services', 'MSExchangeTransport', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Transport'} ), + ( ('services', 'MSExchangeTransportLogSearch', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Exchange Transport Log Search'} ), + ( ('services', 'NetTcpActivator', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Net.Tcp Listener Adapter'} ), + ( ('services', 'NetTcpPortSharing', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Net.Tcp Port Sharing Service'} ), + ( ('services', 'NetPipeActivator', {'states': [('running', 'auto', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Net.Pipe Listener Adapter'} ), + ( ('services', 'msftesql-Exchange', {'states': [(None, 'demand', 0)], 'else': 2}), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS, {'comment': u'Microsoft Search (Exchange)'} ), +] + static_checks['services'] + + +static_checks.setdefault('wmic_process', []) + +static_checks['wmic_process'] = [ + ( ('wmic_process', 'Exchange Active Directory Topology', ('MSExchangeADTopologyService.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Address Book', ('Microsoft.Exchange.AddressBook.Service.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Anti-spam Update', ('Microsoft.Exchange.AntispamUpdateSvc.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange EdgeSync', ('Microsoft.Exchange.EdgeSyncSvc.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange File Distribution', ('MsExchangeFDS.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Mailbox Assistants', ('MSExchangeMailboxAssistants.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Mailbox Replication', ('MSExchangeMailboxReplication.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Mail Submission', ('MSExchangeMailSubmission.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Protected Service Host', ('Microsoft.Exchange.ProtectedServiceHost.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Replication', ('msexchangerepl.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange RPC Client Access', ('Microsoft.Exchange.RpcClientAccess.Service.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Search', ('Microsoft.Exchange.Search.ExSearch.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Service Host', ('Microsoft.Exchange.ServiceHost.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Throttling', ('MSExchangeThrottling.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Transport', ('MSExchangeTransport.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), + ( ('wmic_process', 'Exchange Transport Log Search', ('MSExchangeTransportLogSearch.exe', 0, 0, 50, 90, 80.0, 90.0)), ['/' + FOLDER_PATH + '/+'], ALL_HOSTS ), +] + static_checks['wmic_process'] +

10 years, 9 months

Check_MK Git: check_mk: FIX apache_status: Fixed exception when agent reports HTML code as apache-status data

by Lars Michelsen

Module: check_mk Branch: master Commit: 9cb2388bdb560ea57e3f468569a34e02ecc7360d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cb2388bdb560e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 10:31:19 2013 +0100 FIX apache_status: Fixed exception when agent reports HTML code as apache-status data When the apache-status module is not enabled or the webserver is somehow missconfigured, the agents HTTP request to the apache-status URL might return HTML code instead of the expected textual response. Added code to detect HTML code and skip the webserver instance in this case. --- .werks/305 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/apache_status | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/305 b/.werks/305 new file mode 100644 index 0000000..9bacd05 --- /dev/null +++ b/.werks/305 @@ -0,0 +1,11 @@ +Title: apache_status: Fixed exception when agent reports HTML code as apache-status data +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386581355 +Class: fix + +When the apache-status module is not enabled or the webserver is somehow missconfigured, +the agents HTTP request to the apache-status URL might return HTML code instead of the +expected textual response. Added code to detect HTML code and skip the webserver instance +in this case. diff --git a/ChangeLog b/ChangeLog index 1a67109..89a7192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 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... + * 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 79d9de3..f2bd8fa 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -20,7 +20,7 @@ import os, sys, urllib2, re -config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") +config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") config_file = config_dir + "/apache_status.conf" if not os.path.exists(config_file): config_file = config_dir + "/apache_status.cfg" @@ -116,6 +116,9 @@ for server in servers: for line in fd.read().split('\n'): if not line.strip(): continue + if line.lstrip()[0] == '<': + # seems to be html output. Skip this server. + break print address, port, line except urllib2.HTTPError, e: sys.stderr.write('HTTP-Error (%s:%d): %s %s\n' % (address, port, e.code, e))

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2095

by Lars Michelsen

Module: check_mk Branch: master Commit: 17a62af3595bc00c8dc0d595855b768d1e748b79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17a62af3595bc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 11:08:47 2013 +0100 Updated bug entries #2095 --- .bugs/2095 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2095 b/.bugs/2095 new file mode 100644 index 0000000..734b2f0 --- /dev/null +++ b/.bugs/2095 @@ -0,0 +1,13 @@ +Title: Add mechanism to cleanup a users profile +Component: multisite +State: open +Date: 2013-12-09 11:06:47 +Targetversion: 1.2.3i6 +Class: feature + +below var/check_mk/web/<user>/, there are several files being created during +working with multisite. For example the file sidebar.mk is being created once +the user starts customizing the sidebar. It should be possible to remove the +customized sidebar to use the default sidebar again. + +Same for other files like buttoncounts, treestates, view options, ...

10 years, 9 months

Check_MK Git: check_mk: esx_vsphere_counters: added missing ramdisk levels sfcbtickets

by Lars Michelsen

Module: check_mk Branch: master Commit: 843069f0e5853afed21b57397e39ff50a15e9d64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=843069f0e5853a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 10:36:46 2013 +0100 esx_vsphere_counters: added missing ramdisk levels sfcbtickets --- .werks/306 | 8 ++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 1 + 3 files changed, 10 insertions(+) diff --git a/.werks/306 b/.werks/306 new file mode 100644 index 0000000..c41d4aa --- /dev/null +++ b/.werks/306 @@ -0,0 +1,8 @@ +Title: esx_vsphere_counters: added missing ramdisk levels sfcbtickets +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386581787 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 89a7192..126a657 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.3i8: Checks & Agents: + * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets * 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/esx_vsphere_counters b/checks/esx_vsphere_counters index d3c822e..58f7385 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -293,6 +293,7 @@ esx_vsphere_counters_ramdisk_sizes = { 'snmptraps': 1, 'upgradescratch': 300, 'ibmscratch': 300, + 'sfcbtickets': 1, } def inventory_esx_vsphere_counters_ramdisk(info):

10 years, 9 months

Check_MK Git: check_mk: veeam_client: now handles cases when agent parameters have no value

by Götz Golla

Module: check_mk Branch: master Commit: e5934a5fefda4bd7590ba9a8732d0b9adea74169 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5934a5fefda4b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Dec 9 10:25:01 2013 +0100 veeam_client: now handles cases when agent parameters have no value --- checks/veeam_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/veeam_client b/checks/veeam_client index 08625f0..e7928bb 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -88,7 +88,7 @@ def check_veeam_client(item, params, info): stopstate = 0 stopsym = "" infotxt += line[0] + ":" + line[1] + stopsym + " " - else: + elif len(line) == 2: infotxt += line[0] + ":" + line[1] + " " status = max(state[result], stopstate)

10 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
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