Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

by Bastian Kuhn

Module: check_mk Branch: master Commit: bd2b2cf970434a2a598705c0dc5990fe615028b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd2b2cf970434a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 20 11:33:54 2013 +0100 Fixed typo --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 3d4b34d..efb2a88 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1865,7 +1865,7 @@ group = "monconf/" + _("Various") register_rule(group, "clustered_services_mapping", TextAscii( - title = _("Explicit mapping of Clusterd Services"), + title = _("Explicit mapping of Clustered Services"), help = _( "It's possible to have overlaping nodes between multiple clusters." "With this rule the direct mapping of services from nodes to the " "favored Cluster can be done."),

10 years, 9 months

Check_MK Git: check_mk: FIX Backup & Restore: fixed bug when uploading legacy snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: 2f0a4f6e6a994c2b076c6172af41c8c64b7b2b2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f0a4f6e6a994c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 20 11:19:51 2013 +0100 FIX Backup & Restore: fixed bug when uploading legacy snapshots Uploaded legacy snapshots couldn't get classified correctly as tar.gz files, which resulted in an extraction error. --- .werks/249 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 2 +- web/htdocs/wato.py | 26 ++++++++++++++++---------- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.werks/249 b/.werks/249 new file mode 100644 index 0000000..b38d5e8 --- /dev/null +++ b/.werks/249 @@ -0,0 +1,11 @@ +Title: Backup & Restore: fixed bug when uploading legacy snapshots +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387534673 +Targetversion: future + +Uploaded legacy snapshots couldn't get classified correctly as tar.gz files, +which resulted in an extraction error. diff --git a/ChangeLog b/ChangeLog index 2f8830e..aa9aadf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 0248 FIX: Backup & Restore: Snapshot comments now support unicode character... * 0418 FIX: LDAP: Fixed broken role sync plugin with OpenLDAP... * 0419 FIX: LDAP: The default user profile roles are only assigned to users without roles... + * 0249 FIX: Backup & Restore: fixed bug when uploading legacy snapshots... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index a4a0204..8ad5098 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -131,7 +131,7 @@ def extract_domains(tar, domains): else: return check_exists_or_writable(path_tokens[:-1]) - # The complete tar.gz file never fits in stringIO buffer.. + # The complete tar file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b99c916..f30546b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5525,15 +5525,18 @@ def get_snapshot_status(name): file_info[name] = { "size" :info } status["files"] = file_info else: # tarfile is finished, read comment + # Determine snapshot type: legacy / new + is_legacy_snapshot = True + try: + tarfile.open(snapshot_dir + name, "r:gz") + except: + is_legacy_snapshot = False + # Legacy snapshots - if name.endswith(".tar.gz"): + if is_legacy_snapshot: status["type"] = "legacy" status["type_text"] = _("Snapshot created with old version") status["comment"] = _("Snapshot created with old version") - try: - tarfile.open(snapshot_dir + name, "r:gz").getmembers() - except: - raise # New snapshots else: status["files"] = multitar.list_tar_content(snapshot_dir + name) @@ -5548,10 +5551,12 @@ def get_snapshot_status(name): status["type"] = "legacy" status["type_text"] = _("Snapshot created with old version") status["comment"] = _("Snapshot created with old version") - try: - tarfile.open(snapshot_dir + name, "r").getmembers() - except: - raise + try: + # Simple validity check - try to read snapshot content + # Note: Opening it with "r" works on tar and tar.gz + tarfile.open(snapshot_dir + name, "r").getmembers() + except: + raise except: status["broken"] = True pass @@ -5756,7 +5761,8 @@ def mode_snapshot(phase): html.attrencode(snapshot_file) ) if c: - if snapshot_file.endswith(".tar.gz"): # Old snapshot type + status = get_snapshot_status(snapshot_file) + if status["type"] == "legacy": multitar.extract_from_file(snapshot_dir + snapshot_file, backup_paths) else: multitar.extract_from_file(snapshot_dir + snapshot_file, backup_domains)

10 years, 9 months

Check_MK Git: check_mk: Explicit mapping of clustered services can now be done with Wato.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 00a1654a397f1ae089792ec4fa48a878df4e094b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a1654a397f1a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 20 11:19:39 2013 +0100 Explicit mapping of clustered services can now be done with Wato. --- .werks/112 | 8 ++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/112 b/.werks/112 new file mode 100644 index 0000000..31e4e7c --- /dev/null +++ b/.werks/112 @@ -0,0 +1,8 @@ +Title: Explicit mapping of clustered services can now be done with Wato. +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1387534743 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2f8830e..21f9ab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ NOTE: Please refer to the migration notes! * 0244 New features for WATO page Backup & Restore... * 0382 Active HTTP check now supports multiline regexp matching... + * 0112 Explicit mapping of clustered services can now be done with Wato. * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e7f39d0..3d4b34d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1864,7 +1864,12 @@ group = "monconf/" + _("Various") register_rule(group, "clustered_services_mapping", - TextAscii( title = _("Clustered services of") ), + TextAscii( + title = _("Explicit mapping of Clusterd Services"), + help = _( "It's possible to have overlaping nodes between multiple clusters." + "With this rule the direct mapping of services from nodes to the " + "favored Cluster can be done."), + ), itemtype = "service", )

10 years, 9 months

Check_MK Git: check_mk: First proof of concept for clustered_service_of in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: 09f5dcdba82d4892d02ea049ba3e3a6f9649949e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f5dcdba82d48… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 20 10:38:54 2013 +0100 First proof of concept for clustered_service_of in wato --- modules/check_mk.py | 5 +++++ web/plugins/wato/check_mk_configuration.py | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 97e4228..92e4316 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -309,6 +309,7 @@ timeperiods = {} # needed for WATO clusters = {} clustered_services = [] clustered_services_of = {} # new in 1.1.4 +clustered_services_mapping = [] # new for 1.2.5i1 Wato Rule datasource_programs = [] service_aggregations = [] service_dependencies = [] @@ -944,6 +945,10 @@ def host_of_clustered_service(hostname, servicedesc): if not the_clusters: return hostname + cluster_mapping = service_extra_conf(hostname, servicedesc, clustered_services_mapping) + if cluster_mapping: + return cluster_mapping[0] + # 1. New style: explicitly assigned services for cluster, conf in clustered_services_of.items(): nodes = nodes_of(cluster) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7c75551..e7f39d0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1863,6 +1863,12 @@ register_rule(group, group = "monconf/" + _("Various") register_rule(group, + "clustered_services_mapping", + TextAscii( title = _("Clustered services of") ), + itemtype = "service", + ) + +register_rule(group, "extra_host_conf:service_period", TimeperiodSelection( title = _("Service period for hosts"),

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Roles/ Groups are now synced even if case of DNs do not match

by Lars Michelsen

Module: check_mk Branch: master Commit: ff84fdbd6285878d38d2058a8a9811e41929f240 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff84fdbd628587… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 09:17:37 2013 +0100 FIX LDAP: Roles/Groups are now synced even if case of DNs do not match Most LDAP related filters are case insentive. To match user expectations the distinguished name matching used during group / role sync has been changed to be case insensitive. --- .werks/420 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 9 +++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/420 b/.werks/420 new file mode 100644 index 0000000..ba10886 --- /dev/null +++ b/.werks/420 @@ -0,0 +1,12 @@ +Title: LDAP: Roles/Groups are now synced even if case of DNs do not match +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387527273 +Targetversion: future + +Most LDAP related filters are case insentive. To match user expectations +the distinguished name matching used during group / role sync has been +changed to be case insensitive. diff --git a/ChangeLog b/ChangeLog index 8e7c4fd..2f8830e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)... * 0436 FIX: Fix broken Site status switching via sidebar snapin... + * 0420 FIX: LDAP: Roles/Groups are now synced even if case of DNs do not match... 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 8fc4be0..9af7443 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -332,7 +332,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): for key, val in obj.iteritems(): # Convert all keys to lower case! new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] - result.append((dn, new_obj)) + result.append((dn.lower(), new_obj)) success = True except ldap.NO_SUCH_OBJECT, e: raise MKLDAPException(_('The given base object "%s" does not exist in LDAP (%s))') % (base, e)) @@ -585,7 +585,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): groups[dn] = { 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], + 'members' : [ m.encode('utf-8').lower() for m in obj.get(member_attr,[]) ], } else: # Special handling for OpenLDAP when searching for groups by DN @@ -593,7 +593,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): for dn, obj in ldap_search(ldap_replace_macros(f_dn), filt, ['cn', member_attr]): groups[f_dn] = { 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], + 'members' : [ m.encode('utf-8').lower() for m in obj.get(member_attr,[]) ], } else: @@ -622,7 +622,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): 'cn' : cn, } for user_dn, obj in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = ['dn']): - groups[dn]['members'].append(user_dn) + groups[dn]['members'].append(user_dn.lower) g_ldap_group_cache[cache_key] = groups return groups @@ -882,6 +882,7 @@ def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): for role_id, dn in params.items(): if not isinstance(dn, str): continue # skip non configured ones + dn = dn.lower() # lower case matching for DNs! # if group could be found and user is a member, add the role if dn in ldap_groups and ldap_user['dn'] in ldap_groups[dn]['members']:

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Fixed broken role sync plugin with OpenLDAP

by Lars Michelsen

Module: check_mk Branch: master Commit: 64000bd2db818c8081d38a668b58b198ddf11848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64000bd2db818c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 08:56:51 2013 +0100 FIX LDAP: Fixed broken role sync plugin with OpenLDAP The role sync plugin simply did not sync the roles of users even if the group memberships in the OpenLDAP directory were OK. --- .werks/418 | 11 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 51 ++++++++++++++++++++++++++++++-------------- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/.werks/418 b/.werks/418 new file mode 100644 index 0000000..444b131 --- /dev/null +++ b/.werks/418 @@ -0,0 +1,11 @@ +Title: LDAP: Fixed broken role sync plugin with OpenLDAP +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387526157 +Targetversion: future + +The role sync plugin simply did not sync the roles of users even +if the group memberships in the OpenLDAP directory were OK. diff --git a/ChangeLog b/ChangeLog index 060a468..856a34c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled * 0416 FIX: When doing user sync on user page rendering, contact group memberships are shown correctly now... * 0417 FIX: LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP + * 0418 FIX: LDAP: Fixed broken role sync plugin with OpenLDAP... * 0419 FIX: LDAP: The default user profile roles are only assigned to users without roles... Notifications: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 5f85267..8fc4be0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -566,21 +566,36 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): if cache_key in g_ldap_group_cache: return g_ldap_group_cache[cache_key] - # When not searching for nested memberships, it is easy. Simply query the group - # for the memberships in one single query. + # When not searching for nested memberships, it is easy when using the an AD base LDAP. + # The group objects can be queried using the attribute distinguishedname. Therefor we + # create an alternating match filter to match that attribute when searching by DNs. + # In OpenLDAP the distinguishedname is no user attribute, therefor it can not be used + # as filter expression. We have to do one ldap query per group. Maybe, in the future, + # we change the role sync plugin parameters to snapins to make this part a little easier. if not nested: + groups = {} filt = ldap_filter('groups') - if filters: - add_filt = '(|%s)' % ''.join([ '(%s=%s)' % (filt_attr, f) for f in filters ]) - filt = '(&%s%s)' % (filt, add_filt) - member_attr = ldap_member_attr().lower() - groups = {} - for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): - groups[dn] = { - 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], - } + + if config.ldap_connection['type'] == 'ad' or filt_attr != 'distinguishedname': + if filters: + add_filt = '(|%s)' % ''.join([ '(%s=%s)' % (filt_attr, f) for f in filters ]) + filt = '(&%s%s)' % (filt, add_filt) + + for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): + groups[dn] = { + 'cn' : obj['cn'][0], + 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], + } + else: + # Special handling for OpenLDAP when searching for groups by DN + for f_dn in filters: + for dn, obj in ldap_search(ldap_replace_macros(f_dn), filt, ['cn', member_attr]): + groups[f_dn] = { + 'cn' : obj['cn'][0], + 'members' : [ m.encode('utf-8') for m in obj.get(member_attr,[]) ], + } + else: # Nested querying is more complicated. We have no option to simply do a query for group objects # to make them resolve the memberships here. So we need to query all users with the nested @@ -861,8 +876,7 @@ def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): ldap_groups = dict(ldap_group_members([ dn for role_id, dn in params.items() if isinstance(dn, str) ], filt_attr = 'distinguishedname', nested = params.get('nested', False))) - # Load default roles from default user profile - roles = config.default_user_profile['roles'][:] + roles = set([]) # Loop all roles mentioned in params (configured to be synchronized) for role_id, dn in params.items(): @@ -871,9 +885,14 @@ def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): # if group could be found and user is a member, add the role if dn in ldap_groups and ldap_user['dn'] in ldap_groups[dn]['members']: - roles.append(role_id) + roles.add(role_id) + + # Load default roles from default user profile when the user got no role + # by the role sync plugin + if not roles: + roles = config.default_user_profile['roles'][:] - return {'roles': roles} + return {'roles': list(roles)} def ldap_list_roles_with_group_dn(): elements = []

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: The default user profile roles are only assigned to users without roles

by Lars Michelsen

Module: check_mk Branch: master Commit: 88b5b03fb10dfdbf3f2b6a213b711fb059a2157a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88b5b03fb10dfd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 20 08:58:04 2013 +0100 FIX LDAP: The default user profile roles are only assigned to users without roles In previous releases the roles of the default user profile were assigned to all users synced with LDAP. This was not correct and has now been changed. Only users which do not get a role assigned by the role sync plugin get the default role(s). --- .werks/419 | 12 ++++++++++++ ChangeLog | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/419 b/.werks/419 new file mode 100644 index 0000000..7387eac --- /dev/null +++ b/.werks/419 @@ -0,0 +1,12 @@ +Title: LDAP: The default user profile roles are only assigned to users without roles +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387526213 +Targetversion: future + +In previous releases the roles of the default user profile were assigned to all +users synced with LDAP. This was not correct and has now been changed. Only users +which do not get a role assigned by the role sync plugin get the default role(s). diff --git a/ChangeLog b/ChangeLog index ba499b9..060a468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled * 0416 FIX: When doing user sync on user page rendering, contact group memberships are shown correctly now... * 0417 FIX: LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP + * 0419 FIX: LDAP: The default user profile roles are only assigned to users without roles... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands...

10 years, 9 months

Check_MK Git: check_mk: FIX Backup & Restore: Snapshot comments now support unicode character

by Andreas Boesl

Module: check_mk Branch: master Commit: ab71768bdfb2de77f70e15363f80b9ee7fad2076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab71768bdfb2de… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 18:46:51 2013 +0100 FIX Backup & Restore: Snapshot comments now support unicode character Unicode comments got truncated in the snapshot file because of an incorrect byte count in the original unicode string. --- .werks/248 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 7 +++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/248 b/.werks/248 new file mode 100644 index 0000000..cd24873 --- /dev/null +++ b/.werks/248 @@ -0,0 +1,11 @@ +Title: Backup & Restore: Snapshot comments now support unicode character +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387475087 +Targetversion: future + +Unicode comments got truncated in the snapshot file because +of an incorrect byte count in the original unicode string. diff --git a/ChangeLog b/ChangeLog index ba499b9..f8fe10f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled * 0416 FIX: When doing user sync on user page rendering, contact group memberships are shown correctly now... * 0417 FIX: LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP + * 0248 FIX: Backup & Restore: Snapshot comments now support unicode character... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/modules/automation.py b/modules/automation.py index 9b321b4..cc86a98 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -781,7 +781,7 @@ def automation_create_snapshot(args): if domain: statusinfo[domain] = infotext statusfile = file(filename_status, "w") - statusfile.write("comment:%s\n" % data.get("comment"," ")) + statusfile.write("comment:%s\n" % data.get("comment"," ").encode("utf-8")) status_list = list(statusinfo.items()) status_list.sort() for status in status_list: @@ -849,8 +849,8 @@ def automation_create_snapshot(args): # Add comment to tar file if data.get("comment"): tarinfo = get_basic_tarinfo("comment") - tarinfo.size = len(data.get("comment")) - tar_in_progress.addfile(tarinfo, cStringIO.StringIO(data.get("comment"))) + tarinfo.size = len(data.get("comment").encode("utf-8")) + tar_in_progress.addfile(tarinfo, cStringIO.StringIO(data.get("comment").encode("utf-8"))) if data.get("created_by"): tarinfo = get_basic_tarinfo("created_by") @@ -895,4 +895,3 @@ def automation_create_snapshot(args): except Exception, e: raise MKAutomationError(str(e)) -

10 years, 9 months

Check_MK Git: check_mk: fixing syntax error in module "myBoss", check cisco_fantray, occured while creating so called "blessed checks"

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: fb44ebdbc8c988efa9b9582c14d0f8cff9119185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb44ebdbc8c988… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 19 18:43:15 2013 +0100 fixing syntax error in module "myBoss", check cisco_fantray, occured while creating so called "blessed checks" --- checks/cisco_fantray | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/cisco_fantray b/checks/cisco_fantray index 752ea1c..d5f8c5b 100644 --- a/checks/cisco_fantray +++ b/checks/cisco_fantray @@ -26,10 +26,10 @@ cisco_fantray_state_names = { - '1': 3, "status is reported as 'unknown'", - '2': 0, "powered on", - '3': 2, "powered down", - '4': 2, "partial failure, needs replacement as soon as possible." + '1': (3, "status is reported as 'unknown'"), + '2': (0, "powered on"), + '3': (2, "powered down"), + '4': (2, "partial failure, needs replacement as soon as possible.") } def inventory_cisco_fantray(info):

10 years, 9 months

Check_MK Git: check_mk: fixed catalog entries for HNAS checks

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 3e1626bda5f702a8f0e079aa97d43d6f27a695fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e1626bda5f702… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 19 18:21:06 2013 +0100 fixed catalog entries for HNAS checks --- checkman/hitachi_hnas_cpu | 2 +- checkman/hitachi_hnas_fan | 2 +- checkman/hitachi_hnas_fpga | 2 +- checkman/hitachi_hnas_pnode | 2 +- checkman/hitachi_hnas_psu | 2 +- checkman/hitachi_hnas_quorumdevice | 2 +- checkman/hitachi_hnas_temp | 2 +- checkman/hitachi_hnas_vnode | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checkman/hitachi_hnas_cpu b/checkman/hitachi_hnas_cpu index 9920f83..5780302 100644 --- a/checkman/hitachi_hnas_cpu +++ b/checkman/hitachi_hnas_cpu @@ -1,6 +1,6 @@ title: Hitachi HNAS: CPU Utilization of PNodes agents: snmp -catalog: hw/network/brocade +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_fan b/checkman/hitachi_hnas_fan index 3434c5e..0c4e970 100644 --- a/checkman/hitachi_hnas_fan +++ b/checkman/hitachi_hnas_fan @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status and Speed of Fans agents: snmp -catalog: hw/network/brocade +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_fpga b/checkman/hitachi_hnas_fpga index 22dcd45..a3d66f5 100644 --- a/checkman/hitachi_hnas_fpga +++ b/checkman/hitachi_hnas_fpga @@ -1,6 +1,6 @@ title: Hitachi HNAS: Utilization of Field Programmable Gate Arrays (FPGAs) agents: snmp -catalog: hw/network/brocade +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_pnode b/checkman/hitachi_hnas_pnode index b5d009a..c18cf4f 100644 --- a/checkman/hitachi_hnas_pnode +++ b/checkman/hitachi_hnas_pnode @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status of Physical Nodes (PNodes) agents: snmp -catalog: hw/storage/hitachi +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_psu b/checkman/hitachi_hnas_psu index 0f1a3d0..5d8e950 100644 --- a/checkman/hitachi_hnas_psu +++ b/checkman/hitachi_hnas_psu @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status of Power Supplies (PSUs) agents: snmp -catalog: hw/storage/hitachi +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_quorumdevice b/checkman/hitachi_hnas_quorumdevice index bd7f752..c0a4456 100644 --- a/checkman/hitachi_hnas_quorumdevice +++ b/checkman/hitachi_hnas_quorumdevice @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status of Quorum Device agents: snmp -catalog: hw/storage/hitachi +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_temp b/checkman/hitachi_hnas_temp index 33e23f9..f8cc2b5 100644 --- a/checkman/hitachi_hnas_temp +++ b/checkman/hitachi_hnas_temp @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status and Measured Value of Temperature Sensors agents: snmp -catalog: hw/network/brocade +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description: diff --git a/checkman/hitachi_hnas_vnode b/checkman/hitachi_hnas_vnode index 92c1136..3e13c8e 100644 --- a/checkman/hitachi_hnas_vnode +++ b/checkman/hitachi_hnas_vnode @@ -1,6 +1,6 @@ title: Hitachi HNAS: Status of Virtual Nodes (VNodes or EVS) agents: snmp -catalog: hw/storage/hitachi +catalog: hw/storagehw/hitachi license: GPL distribution: check_mk description:

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits