Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: FIX Explicit communities were not written to config files in all cases

by Lars Michelsen

Module: check_mk Branch: master Commit: e72c284bb8cc84a6513809b949e2d6e4ffa9f3c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e72c284bb8cc84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 16:28:00 2013 +0100 FIX Explicit communities were not written to config files in all cases --- .werks/207 | 8 ++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/207 b/.werks/207 new file mode 100644 index 0000000..1af0e27 --- /dev/null +++ b/.werks/207 @@ -0,0 +1,8 @@ +Title: Explicit communities were not written to config files in all cases +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384183647 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 734c5d3..be3ca97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0048 FIX: Fixed locking issue on host diagnose page * 0033 FIX: WATO forms: incorrect handling of checkbox state * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... + * 0207 FIX: Explicit communities were not written to config files in all cases Notifications: * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 17e5c89..4f3b259 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -761,7 +761,7 @@ def save_hosts(folder = None): out.write(pprint.pformat(ipaddresses)) out.write(")\n") - if len(ipaddresses) > 0: + if len(explicit_snmp_communities) > 0: out.write("\n# Explicit SNMP communities\n") out.write("explicit_snmp_communities.update(") out.write(pprint.pformat(explicit_snmp_communities))

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed logwatch permission check when using liveproxy

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f2f88b61df403fc288def028b73f10eff81a88d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2f88b61df403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 16:15:27 2013 +0100 FIX Fixed logwatch permission check when using liveproxy When using the liveproxy daemon and logwatch together, the permission check for non administrative users always failed. As a result normal users could not access logfiles, which they should be allowed to see. --- .werks/206 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/livestatus.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/206 b/.werks/206 new file mode 100644 index 0000000..337f305 --- /dev/null +++ b/.werks/206 @@ -0,0 +1,11 @@ +Title: Fixed logwatch permission check when using liveproxy +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384182853 +Class: fix + +When using the liveproxy daemon and logwatch together, the +permission check for non administrative users always failed. +As a result normal users could not access logfiles, which +they should be allowed to see. diff --git a/ChangeLog b/ChangeLog index b7cdd8e..734c5d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... * 0203 FIX: Changed sidebar reload interval to be more random... * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... + * 0206 FIX: Fixed logwatch permission check when using liveproxy... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 8c5ba3b..f0de1c4 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -672,7 +672,7 @@ class MultiSiteConnection(Helpers): # Return connection to localhost (UNIX), if available def local_connection(self): for sitename, site, connection in self.connections: - if site["socket"].startswith("unix:"): + if site["socket"].startswith("unix:") and "liveproxy" not in site["socket"]: return connection raise MKLivestatusConfigError("No livestatus connection to local host")

10 years, 10 months

Check_MK Git: check_mk: FIX Allowing star chars in variable names to fix role/permission editing

by Lars Michelsen

Module: check_mk Branch: master Commit: cde628307e8e45613c5fea79f2e81f293deeacd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cde628307e8e45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 16:14:01 2013 +0100 FIX Allowing star chars in variable names to fix role/permission editing A security related change broke editing NagVis related permissions within WATO. This has been fixed now. --- .werks/205 | 9 +++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/205 b/.werks/205 new file mode 100644 index 0000000..76b1614 --- /dev/null +++ b/.werks/205 @@ -0,0 +1,9 @@ +Title: Allowing star chars in variable names to fix role/permission editing +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1384182766 +Class: fix + +A security related change broke editing NagVis related permissions within +WATO. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 6df9d74..b7cdd8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 0053 New rule for configuring the display_name of a service... * 0048 FIX: Fixed locking issue on host diagnose page * 0033 FIX: WATO forms: incorrect handling of checkbox state + * 0205 FIX: Allowing star chars in variable names to fix role/permission editing... Notifications: * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index c8082ec..81d42b1 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -3,7 +3,7 @@ import htmllib import os, time, config, weblib, re import defaults -varname_regex = re.compile('^[\w\d_.%+-]+$') +varname_regex = re.compile('^[\w\d_.%+-*]+$') class html_mod_python(htmllib.html):

10 years, 10 months

Check_MK Git: check_mk: FIX Reduced I/ O on logins with access time recording or failed login counts

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ed9eda63fbba1f6b4f181b764954acf989897f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ed9eda63fbba1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 09:28:02 2013 +0100 FIX Reduced I/O on logins with access time recording or failed login counts In previous versions, these optional features were loading the whole user configuration just to read / change one attribute of one user, which is kept in a single file. This mechanism has been recoded to only use this single custom attribute file. Should reduce I/O in large installations during multisite processing. --- .werks/204 | 12 +++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 55 +++++++++++++++++++++++++------------------------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/.werks/204 b/.werks/204 new file mode 100644 index 0000000..fbc2294 --- /dev/null +++ b/.werks/204 @@ -0,0 +1,12 @@ +Title: Reduced I/O on logins with access time recording or failed login counts +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384158368 +Class: fix + +In previous versions, these optional features were loading the whole user +configuration just to read / change one attribute of one user, which is kept +in a single file. This mechanism has been recoded to only use this single +custom attribute file. Should reduce I/O in large installations during +multisite processing. diff --git a/ChangeLog b/ChangeLog index 22dfc1f..6df9d74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0046 FIX: Allowing "-" chars in var names again... * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... * 0203 FIX: Changed sidebar reload interval to be more random... + * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index dab736f..794e64a 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -124,25 +124,14 @@ def user_locked(username): def update_user_access_time(): if not config.save_user_access_times: return - - users = load_users(lock = True) - users[html.user]['last_seen'] = time.time() - save_users(users) + save_custom_attr(html.user, 'last_seen', repr(time.time())) def on_succeeded_login(username): - users = load_users(lock = True) - changed = False + num_failed = load_custom_attr(username, 'num_failed', saveint) + if num_failed != None and num_failed != 0: + save_custom_attr(username, 'num_failed', '0') - if users[username].get('num_failed', 0) != 0: - users[username]["num_failed"] = 0 - changed = True - - if config.save_user_access_times: - users[username]['last_seen'] = time.time() - changed = True - - if changed: - save_users(users) + update_user_access_time() def on_failed_login(username): users = load_users(lock = True) @@ -303,12 +292,14 @@ def load_users(lock = False): id = d # read special values from own files - for val, conv_func in [ ('num_failed', saveint), ('last_seen', savefloat) ]: - if id in result: - try: - result[id][val] = conv_func(file(dir + d + '/' + val + '.mk').read().strip()) - except IOError: - pass + if id in result: + num_failed = load_custom_attr(d, 'num_failed', saveint) + if num_failed != None: + result[id]['num_failed'] = num_failed + + last_seen = load_custom_attr(d, 'last_seen', savefloat) + if last_seen != None: + result[id]['last_seen'] = last_seen # read automation secrets and add them to existing # users or create new users automatically @@ -327,6 +318,17 @@ def load_users(lock = False): return result +def load_custom_attr(userid, key, conv_func, default = None): + basedir = defaults.var_dir + "/web/" + userid + try: + return conv_func(file(basedir + '/' + key + '.mk').read().strip()) + except IOError: + return default + +def save_custom_attr(userid, key, val): + basedir = defaults.var_dir + "/web/" + userid + create_user_file('%s/%s.mk' % (basedir, key), 'w').write('%s\n' % val) + def get_online_user_ids(): online_threshold = time.time() - config.user_online_maxage users = [] @@ -422,17 +424,14 @@ def save_users(profiles): os.remove(auth_file) # Write out the users serial - serial_file = user_dir + '/serial.mk' - create_user_file(serial_file, 'w').write('%d\n' % user.get('serial', 0)) + save_custom_attr(id, 'serial', str(user.get('serial', 0))) # Write out the users number of failed login - failed_file = user_dir + '/num_failed.mk' - create_user_file(failed_file, 'w').write('%d\n' % user.get('num_failed', 0)) + save_custom_attr(id, 'num_failed', str(user.get('num_failed', 0))) # Write out the last seent time if 'last_seen' in user: - last_seen_file = user_dir + '/last_seen.mk' - create_user_file(last_seen_file, 'w').write(repr(user['last_seen']) + '\n') + save_custom_attr(id, 'last_seen', repr(user['last_seen'])) # Remove settings directories of non-existant users. # Beware: we removed this since it leads to violent destructions

10 years, 10 months

Check_MK Git: check_mk: FIX Changed sidebar reload interval to be more random

by Lars Michelsen

Module: check_mk Branch: master Commit: 1973e8ad61b8c7e8eb1b30ad4b3e2b86c44a5a9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1973e8ad61b8c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 08:39:01 2013 +0100 FIX Changed sidebar reload interval to be more random The sidebar is refreshed every 30 seconds. In the past, the sidebar has been refreshed at the 0th and 30th second of a minute. With many users, there occured load peaks during sidebar refresh. This changes the reload to be more random. --- .werks/203 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/203 b/.werks/203 new file mode 100644 index 0000000..bc06b38 --- /dev/null +++ b/.werks/203 @@ -0,0 +1,11 @@ +Title: Changed sidebar reload interval to be more random +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384155428 +Class: fix + +The sidebar is refreshed every 30 seconds. In the past, the +sidebar has been refreshed at the 0th and 30th second of a +minute. With many users, there occured load peaks during +sidebar refresh. This changes the reload to be more random. diff --git a/ChangeLog b/ChangeLog index aefd5d7..22dfc1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles * 0046 FIX: Allowing "-" chars in var names again... * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... + * 0203 FIX: Changed sidebar reload interval to be more random... WATO: * 0053 New rule for configuring the display_name of a service...

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed check-mk-automation call on each new created apache thread

by Lars Michelsen

Module: check_mk Branch: master Commit: d19d616b50afd4972947496b790fd5c4e6863217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d19d616b50afd4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 14:39:10 2013 +0100 FIX Fixed check-mk-automation call on each new created apache thread Especially for large installation, with a lot of active users, this could really lead into performance problems --- .werks/49 | 9 +++++++++ ChangeLog | 3 ++- web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/49 b/.werks/49 new file mode 100644 index 0000000..d06b2f0 --- /dev/null +++ b/.werks/49 @@ -0,0 +1,9 @@ +Title: Fixed check-mk-automation call on each new created apache thread +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1383917888 +Class: fix + +Especially for large installation, with a lot of active users, this +could really lead into performance problems diff --git a/ChangeLog b/ChangeLog index 83964bd..6c7c4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,10 +18,11 @@ * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles * 0046 FIX: Allowing "-" chars in var names again... + * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... WATO: * 0053 New rule for configuring the display_name of a service... - * 0048 FIX: Fixed locking issue on host diagnose page... + * 0048 FIX: Fixed locking issue on host diagnose page Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f769830..819720a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1493,7 +1493,7 @@ def get_snmp_checktypes(): types = [ (cn, (c['title'] != cn and '%s: ' % cn or '') + c['title']) for (cn, c) in checks.items() if c['snmp'] ] types.sort() - return types + return [ (None, _('All SNMP Checks')) ] + types register_rule(group, "snmp_check_interval", @@ -1505,7 +1505,7 @@ register_rule(group, elements = [ DropdownChoice( title = _("Checktype"), - choices = [ (None, _('All SNMP Checks')) ] + get_snmp_checktypes(), + choices = get_snmp_checktypes, ), Integer( title = _("Do check every"),

10 years, 10 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 269713647b1ce7ae803592f200e487d5989cc1e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=269713647b1ce7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 08:37:03 2013 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bb2ee19..964480f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -203 +213

10 years, 10 months

Check_MK Git: check_mk: fixed my werk ids...

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8b97cdf23fd61814c88f40f9eb5d26f62ce9b3fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b97cdf23fd618… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Sat Nov 9 15:26:10 2013 +0100 fixed my werk ids... --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0b2a2c0..bb2ee19 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1190 +203

10 years, 10 months

Check_MK Git: check_mk: FIX veeam_jobs: check behaviour improved when backup is in progress

by Götz Golla

Module: check_mk Branch: master Commit: 5b067aab1669f74568f714cd2a72acc251c9160f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b067aab1669f7… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 8 22:34:13 2013 +0100 FIX veeam_jobs: check behaviour improved when backup is in progress --- .werks/66 | 8 ++++++++ ChangeLog | 1 + checkman/veeam_jobs | 3 ++- checks/veeam_jobs | 6 ++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/66 b/.werks/66 new file mode 100644 index 0000000..842f528 --- /dev/null +++ b/.werks/66 @@ -0,0 +1,8 @@ +Title: veeam_jobs: check behaviour improved when backup is in progress +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383946426 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 733fee5..439e2c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 0091 apc_ats_output: new check for output measurements on APC ATS devices * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress + * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checkman/veeam_jobs b/checkman/veeam_jobs index e9121e3..fe1dbe2 100644 --- a/checkman/veeam_jobs +++ b/checkman/veeam_jobs @@ -10,7 +10,8 @@ description: comment section of the two Veeam agent plugin scripts on how to install the scripts. - This check is {OK} if the result of the backup is {Success}. + This check is {OK} if the result of the backup is {Success} or the state + of the backup is {Working}.. It is {CRIT} if the result of the backup is {Failed}. It is {UNKNOWN} in all other cases. diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 491cef9..a64fcd9 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -24,17 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -state = { "Success": 0, "Failed": 2, "Warning":1, "InProgress":0, "Pending":0 } def inventory_veeam_jobs(info): return [ (x[0], None) for x in info ] - def check_veeam_jobs(item, params, info): for line in info: if line[0] == item: if line[3] == "Success": state = 0 + elif line[2] =="Working": + state = 0 + line.pop(7) + line.pop(6) elif line[3] == "Failed": state = 2 else:

10 years, 10 months

Check_MK Git: check_mk: FIX veeam_client: check behaviour improved when backup is in progress

by Götz Golla

Module: check_mk Branch: master Commit: d4d9c1a3f22a57ac348faa14b67d647d008bfb62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4d9c1a3f22a57… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 8 22:33:13 2013 +0100 FIX veeam_client: check behaviour improved when backup is in progress --- .werks/65 | 8 ++++++++ ChangeLog | 3 ++- checkman/veeam_client | 3 ++- checks/veeam_client | 7 +++++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/65 b/.werks/65 new file mode 100644 index 0000000..cc554a8 --- /dev/null +++ b/.werks/65 @@ -0,0 +1,8 @@ +Title: veeam_client: check behaviour improved when backup is in progress +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383946322 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 83964bd..733fee5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 0080 Added new checks for Brocade NetIron MLX switching / routing devices... * 0091 apc_ats_output: new check for output measurements on APC ATS devices * 0024 FIX: cisco_wlc: removed configuration parameter ap_model + * 0065 FIX: veeam_client: check behaviour improved when backup is in progress Multisite: * 0001 New filters for selecting several host/service-groups at once... @@ -21,7 +22,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... - * 0048 FIX: Fixed locking issue on host diagnose page... + * 0048 FIX: Fixed locking issue on host diagnose page Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/checkman/veeam_client b/checkman/veeam_client index e7d54cb..83ce3fb 100644 --- a/checkman/veeam_client +++ b/checkman/veeam_client @@ -23,4 +23,5 @@ inventory: perfdata: Total Size, duration and the average speed of the backup will be recorded - as performance data. + as performance data. Duration will not be recorded if the status of the backup + is {Pending} or {InProgress}. diff --git a/checks/veeam_client b/checks/veeam_client index 3513189..2b11b8f 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -43,7 +43,7 @@ def check_veeam_client(item, params, info): if line[0] == "Status": result = line[1] infotxt += line[0] + ":" + line[1] + " " - elif line[0] == "DurationDDHHMMSS": + elif line[0] == "DurationDDHHMMSS" and result != "InProgress" and result != "Pending": duration_string = line[1] spur = map(saveint, duration_string.split(":") ) if len(spur) == 4: @@ -58,7 +58,10 @@ def check_veeam_client(item, params, info): totalsize = saveint(line[1]) perfdata.append(("totalsize", totalsize, 0, 0, 0)) else: - infotxt += line[0] + ":" + line[1] + " " + if (result == "InProgress" or result == "Pending") and line[0] == "StopTime": + infotxt += line[0] + ": - " + else: + infotxt += line[0] + ":" + line[1] + " " return (state[result], infotxt, perfdata)

10 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013