valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39494 from mchugh19/conn_updates

Browse Source 
Allow states to declare _connection_ keys as documented
This commit is contained in:
Mike Place 2017-03-03 09:07:06 -07:00 committed by GitHub
commit d8396e444e
4 changed files with 131 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
salt/states/zabbix_host.py
View File

@ -62,6 +62,14 @@ def present(host, groups, interfaces, **kwargs):
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': host, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -130,7 +138,7 @@ def present(host, groups, interfaces, **kwargs):
groupids = []
for group in groups:
if isinstance(group, six.string_types):
groupid = __salt__['zabbix.hostgroup_get'](name=group)
groupid = __salt__['zabbix.hostgroup_get'](name=group, **connection_args)
try:
groupids.append(int(groupid[0]['groupid']))
except TypeError:
@ -140,16 +148,16 @@ def present(host, groups, interfaces, **kwargs):
groupids.append(group)
groups = groupids
host_exists = __salt__['zabbix.host_exists'](host)
host_exists = __salt__['zabbix.host_exists'](host, **connection_args)
if host_exists:
host = __salt__['zabbix.host_get'](name=host)[0]
host = __salt__['zabbix.host_get'](name=host, **connection_args)[0]
hostid = host['hostid']
update_hostgroups = False
update_interfaces = False
hostgroups = __salt__['zabbix.hostgroup_get'](hostids=hostid)
hostgroups = __salt__['zabbix.hostgroup_get'](hostids=hostid, **connection_args)
cur_hostgroups = list()
for hostgroup in hostgroups:
@ -158,7 +166,7 @@ def present(host, groups, interfaces, **kwargs):
if set(groups) != set(cur_hostgroups):
update_hostgroups = True
hostinterfaces = __salt__['zabbix.hostinterface_get'](hostids=hostid)
hostinterfaces = __salt__['zabbix.hostinterface_get'](hostids=hostid, **connection_args)
if hostinterfaces:
hostinterfaces = sorted(hostinterfaces, key=lambda k: k['main'])
@ -197,16 +205,17 @@ def present(host, groups, interfaces, **kwargs):
if update_hostgroups or update_interfaces:
if update_hostgroups:
hostupdate = __salt__['zabbix.host_update'](hostid, groups=groups)
hostupdate = __salt__['zabbix.host_update'](hostid, groups=groups, **connection_args)
ret['changes']['groups'] = str(groups)
if 'error' in hostupdate:
error.append(hostupdate['error'])
if update_interfaces:
if hostinterfaces:
for interface in hostinterfaces:
__salt__['zabbix.hostinterface_delete'](interfaceids=interface['interfaceid'])
__salt__['zabbix.hostinterface_delete'](interfaceids=interface['interfaceid'],
**connection_args)
hostid = __salt__['zabbix.host_get'](name=host)[0]['hostid']
hostid = __salt__['zabbix.host_get'](name=host, **connection_args)[0]['hostid']
for interface in interfaces_formated:
updatedint = __salt__['zabbix.hostinterface_create'](hostid=hostid,
@ -215,7 +224,8 @@ def present(host, groups, interfaces, **kwargs):
main=interface['main'],
type=interface['type'],
useip=interface['useip'],
port=interface['port'])
port=interface['port'],
**connection_args)
if 'error' in updatedint:
error.append(updatedint['error'])
@ -227,7 +237,7 @@ def present(host, groups, interfaces, **kwargs):
else:
ret['comment'] = comment_host_exists
else:
host_create = __salt__['zabbix.host_create'](host, groups, interfaces_formated, **kwargs)
host_create = __salt__['zabbix.host_create'](host, groups, interfaces_formated, **connection_args)
if 'error' not in host_create:
ret['result'] = True
@ -246,7 +256,7 @@ def present(host, groups, interfaces, **kwargs):
return ret
def absent(name):
def absent(name, **kwargs):
"""
Ensures that the host does not exists, eventually deletes host.
@ -273,8 +283,15 @@ def absent(name):
'new': 'Host {0} deleted.'.format(name),
}
}
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
host_exists = __salt__['zabbix.host_exists'](name)
host_exists = __salt__['zabbix.host_exists'](name, **connection_args)
# Dry run, test=true mode
if __opts__['test']:
@ -286,7 +303,7 @@ def absent(name):
ret['comment'] = comment_host_deleted
return ret
host_get = __salt__['zabbix.host_get'](name)
host_get = __salt__['zabbix.host_get'](name, **connection_args)
if not host_get:
ret['result'] = True
@ -294,7 +311,7 @@ def absent(name):
else:
try:
hostid = host_get[0]['hostid']
host_delete = __salt__['zabbix.host_delete'](hostid)
host_delete = __salt__['zabbix.host_delete'](hostid, **connection_args)
except KeyError:
host_delete = False
@ -325,11 +342,19 @@ def assign_templates(host, templates, **kwargs):
add_zabbix_templates_to_host:
zabbix_host.assign_templates:
- host: TestHost
- templates:
- "Template OS Linux"
- "Template App MySQL"
- templates:
- "Template OS Linux"
- "Template App MySQL"
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': host, 'changes': {}, 'result': False, 'comment': ''}
# Set comments
@ -342,7 +367,7 @@ def assign_templates(host, templates, **kwargs):
requested_template_ids = list()
hostid = ''
host_exists = __salt__['zabbix.host_exists'](host)
host_exists = __salt__['zabbix.host_exists'](host, **connection_args)
# Fail out if host does not exist
if not host_exists:
@ -350,7 +375,7 @@ def assign_templates(host, templates, **kwargs):
ret['comment'] = comment_host_templates_notupdated
return ret
host_info = __salt__['zabbix.host_get'](name=host)[0]
host_info = __salt__['zabbix.host_get'](name=host, **connection_args)[0]
hostid = host_info['hostid']
if not templates:
@ -358,14 +383,16 @@ def assign_templates(host, templates, **kwargs):
# Get current templateids for host
host_templates = __salt__['zabbix.host_get'](hostids=hostid,
output='[{"hostid"}]', selectParentTemplates='["templateid"]')
output='[{"hostid"}]',
selectParentTemplates='["templateid"]',
**connection_args)
for template_id in host_templates[0]['parentTemplates']:
curr_template_ids.append(template_id['templateid'])
# Get requested templateids
for template in templates:
try:
template_id = __salt__['zabbix.template_get'](host=template)[0]['templateid']
template_id = __salt__['zabbix.template_get'](host=template, **connection_args)[0]['templateid']
requested_template_ids.append(template_id)
except TypeError:
ret['result'] = False
@ -395,7 +422,7 @@ def assign_templates(host, templates, **kwargs):
# Attempt to perform update
ret['result'] = True
if update_host_templates:
update_output = __salt__['zabbix.host_update'](hostid, templates=(requested_template_ids))
update_output = __salt__['zabbix.host_update'](hostid, templates=(requested_template_ids), **connection_args)
if update_output is False:
ret['result'] = False
ret['comment'] = comment_host_templates_notupdated

29
salt/states/zabbix_hostgroup.py
View File

@ -15,7 +15,7 @@ def __virtual__():
return 'zabbix.hostgroup_create' in __salt__
def present(name):
def present(name, **kwargs):
'''
Ensures that the host group exists, eventually creates new host group.
@ -34,6 +34,13 @@ def present(name):
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -45,7 +52,7 @@ def present(name):
}
}
hostgroup_exists = __salt__['zabbix.hostgroup_exists'](name)
hostgroup_exists = __salt__['zabbix.hostgroup_exists'](name, **connection_args)
# Dry run, test=true mode
if __opts__['test']:
@ -62,7 +69,7 @@ def present(name):
ret['result'] = True
ret['comment'] = comment_hostgroup_exists
else:
hostgroup_create = __salt__['zabbix.hostgroup_create'](name)
hostgroup_create = __salt__['zabbix.hostgroup_create'](name, **connection_args)
if 'error' not in hostgroup_create:
ret['result'] = True
@ -75,7 +82,7 @@ def present(name):
return ret
def absent(name):
def absent(name, **kwargs):
'''
Ensures that the host group does not exist, eventually delete host group.
@ -105,7 +112,15 @@ def absent(name):
}
}
hostgroup_exists = __salt__['zabbix.hostgroup_exists'](name)
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
hostgroup_exists = __salt__['zabbix.hostgroup_exists'](name, **connection_args)
# Dry run, test=true mode
if __opts__['test']:
@ -118,7 +133,7 @@ def absent(name):
ret['changes'] = changes_hostgroup_deleted
return ret
hostgroup_get = __salt__['zabbix.hostgroup_get'](name)
hostgroup_get = __salt__['zabbix.hostgroup_get'](name, **connection_args)
if not hostgroup_get:
ret['result'] = True
@ -126,7 +141,7 @@ def absent(name):
else:
try:
groupid = hostgroup_get[0]['groupid']
hostgroup_delete = __salt__['zabbix.hostgroup_delete'](groupid)
hostgroup_delete = __salt__['zabbix.hostgroup_delete'](groupid, **connection_args)
except KeyError:
hostgroup_delete = False

41
salt/states/zabbix_user.py
View File

@ -64,6 +64,14 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
- sendto: '+42032132588568'
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': alias, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -125,16 +133,16 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
'severity': severity})
return medias_list
user_exists = __salt__['zabbix.user_exists'](alias)
user_exists = __salt__['zabbix.user_exists'](alias, **connection_args)
if user_exists:
user = __salt__['zabbix.user_get'](alias)[0]
user = __salt__['zabbix.user_get'](alias, **connection_args)[0]
userid = user['userid']
update_usrgrps = False
update_medias = False
usergroups = __salt__['zabbix.usergroup_get'](userids=userid)
usergroups = __salt__['zabbix.usergroup_get'](userids=userid, **connection_args)
cur_usrgrps = list()
for usergroup in usergroups:
@ -143,7 +151,7 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
if set(cur_usrgrps) != set(usrgrps):
update_usrgrps = True
user_medias = __salt__['zabbix.user_getmedia'](userid)
user_medias = __salt__['zabbix.user_getmedia'](userid, **connection_args)
medias_formated = _media_format(medias)
if user_medias:
@ -179,8 +187,8 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
ret['comment'] = comment_user_updated
if update_usrgrps:
__salt__['zabbix.user_update'](userid, usrgrps=usrgrps)
updated_groups = __salt__['zabbix.usergroup_get'](userids=userid)
__salt__['zabbix.user_update'](userid, usrgrps=usrgrps, **connection_args)
updated_groups = __salt__['zabbix.usergroup_get'](userids=userid, **connection_args)
cur_usrgrps = list()
for usergroup in updated_groups:
@ -194,7 +202,7 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
ret['changes']['usrgrps'] = str(updated_groups)
if password_reset:
updated_password = __salt__['zabbix.user_update'](userid, passwd=passwd)
updated_password = __salt__['zabbix.user_update'](userid, passwd=passwd, **connection_args)
if 'error' in updated_password:
error.append(updated_groups['error'])
else:
@ -202,7 +210,7 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
if update_medias:
for user_med in user_medias:
deletedmed = __salt__['zabbix.user_deletemedia'](user_med['mediaid'])
deletedmed = __salt__['zabbix.user_deletemedia'](user_med['mediaid'], **connection_args)
if 'error' in deletedmed:
error.append(deletedmed['error'])
@ -212,7 +220,8 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
mediatypeid=media['mediatypeid'],
period=media['period'],
sendto=media['sendto'],
severity=media['severity'])
severity=media['severity'],
**connection_args)
if 'error' in updatemed:
error.append(updatemed['error'])
@ -241,7 +250,7 @@ def present(alias, passwd, usrgrps, medias, password_reset=False, **kwargs):
return ret
def absent(name):
def absent(name, **kwargs):
'''
Ensures that the user does not exist, eventually delete user.
@ -258,6 +267,14 @@ def absent(name):
zabbix_user.absent
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -269,7 +286,7 @@ def absent(name):
}
}
user_get = __salt__['zabbix.user_get'](name)
user_get = __salt__['zabbix.user_get'](name, **connection_args)
# Dry run, test=true mode
if __opts__['test']:
@ -287,7 +304,7 @@ def absent(name):
else:
try:
userid = user_get[0]['userid']
user_delete = __salt__['zabbix.user_delete'](userid)
user_delete = __salt__['zabbix.user_delete'](userid, **connection_args)
except KeyError:
user_delete = False

41
salt/states/zabbix_usergroup.py
View File

@ -38,6 +38,14 @@ def present(name, **kwargs):
- users_status: 0
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -50,10 +58,10 @@ def present(name, **kwargs):
}
}
usergroup_exists = __salt__['zabbix.usergroup_exists'](name)
usergroup_exists = __salt__['zabbix.usergroup_exists'](name, **connection_args)
if usergroup_exists:
usergroup = __salt__['zabbix.usergroup_get'](name)[0]
usergroup = __salt__['zabbix.usergroup_get'](name, **connection_args)[0]
usrgrpid = int(usergroup['usrgrpid'])
update_debug_mode = False
update_gui_access = False
@ -93,21 +101,27 @@ def present(name, **kwargs):
ret['comment'] = comment_usergroup_updated
if update_debug_mode:
updated_debug = __salt__['zabbix.usergroup_update'](usrgrpid, debug_mode=kwargs['debug_mode'])
updated_debug = __salt__['zabbix.usergroup_update'](usrgrpid,
debug_mode=kwargs['debug_mode'],
**connection_args)
if 'error' in updated_debug:
error.append(updated_debug['error'])
else:
ret['changes']['debug_mode'] = kwargs['debug_mode']
if update_gui_access:
updated_gui = __salt__['zabbix.usergroup_update'](usrgrpid, gui_access=kwargs['gui_access'])
updated_gui = __salt__['zabbix.usergroup_update'](usrgrpid,
gui_access=kwargs['gui_access'],
**connection_args)
if 'error' in updated_gui:
error.append(updated_gui['error'])
else:
ret['changes']['gui_access'] = kwargs['gui_access']
if update_users_status:
updated_status = __salt__['zabbix.usergroup_update'](usrgrpid, users_status=kwargs['users_status'])
updated_status = __salt__['zabbix.usergroup_update'](usrgrpid,
users_status=kwargs['users_status'],
**connection_args)
if 'error' in updated_status:
error.append(updated_status['error'])
else:
@ -136,7 +150,7 @@ def present(name, **kwargs):
return ret
def absent(name):
def absent(name, **kwargs):
'''
Ensures that the user group does not exist, eventually delete user group.
@ -152,8 +166,15 @@ def absent(name):
delete_thai_monks_usrgrp:
zabbix_usergroup.absent:
- name: 'Thai monks'
'''
connection_args = {}
if '_connection_user' in kwargs:
connection_args['_connection_user'] = kwargs['_connection_user']
if '_connection_password' in kwargs:
connection_args['_connection_password'] = kwargs['_connection_password']
if '_connection_url' in kwargs:
connection_args['_connection_url'] = kwargs['_connection_url']
ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''}
# Comment and change messages
@ -165,7 +186,7 @@ def absent(name):
}
}
usergroup_exists = __salt__['zabbix.usergroup_exists'](name)
usergroup_exists = __salt__['zabbix.usergroup_exists'](name, **connection_args)
# Dry run, test=true mode
if __opts__['test']:
@ -177,7 +198,7 @@ def absent(name):
ret['comment'] = comment_usergroup_deleted
return ret
usergroup_get = __salt__['zabbix.usergroup_get'](name)
usergroup_get = __salt__['zabbix.usergroup_get'](name, **connection_args)
if not usergroup_get:
ret['result'] = True
@ -185,7 +206,7 @@ def absent(name):
else:
try:
usrgrpid = usergroup_get[0]['usrgrpid']
usergroup_delete = __salt__['zabbix.usergroup_delete'](usrgrpid)
usergroup_delete = __salt__['zabbix.usergroup_delete'](usrgrpid, **connection_args)
except KeyError:
usergroup_delete = False