From d39837b2be8ce6abfa8c69d7cc83f04c6130ccd5 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Tue, 1 Sep 2015 10:22:22 -0400
Subject: Fix for zbx applications
---
roles/lib_zabbix/library/zbx_application.py | 21 +++---
roles/lib_zabbix/library/zbx_item.py | 103 +++++++++++++++++++---------
roles/lib_zabbix/tasks/create_template.yml | 32 +++------
roles/os_zabbix/tasks/main.yml | 2 -
4 files changed, 93 insertions(+), 65 deletions(-)
(limited to 'roles')
diff --git a/roles/lib_zabbix/library/zbx_application.py b/roles/lib_zabbix/library/zbx_application.py
index d3d08c9dd..21e3d91f4 100644
--- a/roles/lib_zabbix/library/zbx_application.py
+++ b/roles/lib_zabbix/library/zbx_application.py
@@ -41,16 +41,17 @@ def exists(content, key='result'):
return True
-def get_template_ids(zapi, template_names):
+def get_template_ids(zapi, template_name):
'''
get related templates
'''
template_ids = []
# Fetch templates by name
- for template_name in template_names:
- content = zapi.get_content('template', 'get', {'search': {'host': template_name}})
- if content.has_key('result'):
- template_ids.append(content['result'][0]['templateid'])
+ content = zapi.get_content('template',
+ 'get',
+ {'search': {'host': template_name}})
+ if content.has_key('result'):
+ template_ids.append(content['result'][0]['templateid'])
return template_ids
def main():
@@ -63,8 +64,8 @@ def main():
zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
zbx_debug=dict(default=False, type='bool'),
- name=dict(default=None, type='str'),
- template_name=dict(default=None, type='list'),
+ name=dict(default=None, type='str', required=True),
+ template_name=dict(default=None, type='str'),
state=dict(default='present', type='str'),
),
#supports_check_mode=True
@@ -81,10 +82,11 @@ def main():
aname = module.params['name']
state = module.params['state']
# get a applicationid, see if it exists
+ tids = get_template_ids(zapi, module.params['template_name'])
content = zapi.get_content(zbx_class_name,
'get',
{'search': {'name': aname},
- 'selectHost': 'hostid',
+ 'templateids': tids[0],
})
if state == 'list':
module.exit_json(changed=False, results=content['result'], state="list")
@@ -97,9 +99,10 @@ def main():
module.exit_json(changed=True, results=content['result'], state="absent")
if state == 'present':
- params = {'hostid': get_template_ids(zapi, module.params['template_name'])[0],
+ params = {'hostid': tids[0],
'name': aname,
}
+
if not exists(content):
# if we didn't find it, create it
content = zapi.get_content(zbx_class_name, 'create', params)
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
index bcd389e47..388db31b9 100644
--- a/roles/lib_zabbix/library/zbx_item.py
+++ b/roles/lib_zabbix/library/zbx_item.py
@@ -60,18 +60,36 @@ def get_value_type(value_type):
return vtype
-def get_app_ids(zapi, application_names):
+def get_app_ids(application_names, app_name_ids):
''' get application ids from names
'''
- if isinstance(application_names, str):
- application_names = [application_names]
- app_ids = []
- for app_name in application_names:
- content = zapi.get_content('application', 'get', {'search': {'name': app_name}})
- if content.has_key('result'):
- app_ids.append(content['result'][0]['applicationid'])
- return app_ids
+ applications = []
+ if application_names:
+ for app in application_names:
+ applications.append(app_name_ids[app])
+ return applications
+
+def get_template_id(zapi, template_name):
+ '''
+ get related templates
+ '''
+ template_ids = []
+ app_ids = {}
+ # Fetch templates by name
+ content = zapi.get_content('template',
+ 'get',
+ {'search': {'host': template_name},
+ 'selectApplications': ['applicationid', 'name']})
+ if content.has_key('result'):
+ template_ids.append(content['result'][0]['templateid'])
+ for app in content['result'][0]['applications']:
+ app_ids[app['name']] = app['applicationid']
+
+ return template_ids, app_ids
+
+# The branches are needed for CRUD and error handling
+# pylint: disable=too-many-branches
def main():
'''
ansible zabbix module for zbx_item
@@ -88,7 +106,7 @@ def main():
template_name=dict(default=None, type='str'),
zabbix_type=dict(default=2, type='int'),
value_type=dict(default='int', type='str'),
- applications=dict(default=[], type='list'),
+ applications=dict(default=None, type='list'),
state=dict(default='present', type='str'),
),
#supports_check_mode=True
@@ -101,59 +119,74 @@ def main():
#Set the instance and the template for the rest of the calls
zbx_class_name = 'item'
- idname = "itemid"
state = module.params['state']
- key = module.params['key']
- template_name = module.params['template_name']
-
- content = zapi.get_content('template', 'get', {'search': {'host': template_name}})
- templateid = None
- if content['result']:
- templateid = content['result'][0]['templateid']
- else:
- module.exit_json(changed=False,
- results='Error: Could find template with name %s for item.' % template_name,
+
+ templateid, app_name_ids = get_template_id(zapi, module.params['template_name'])
+
+ # Fail if a template was not found matching the name
+ if not templateid:
+ module.exit_json(failed=True,
+ changed=False,
+ results='Error: Could find template with name %s for item.' % module.params['template_name'],
state="Unkown")
content = zapi.get_content(zbx_class_name,
'get',
- {'search': {'key_': key},
+ {'search': {'key_': module.params['key']},
'selectApplications': 'applicationid',
+ 'templateids': templateid,
})
+ # Get
if state == 'list':
module.exit_json(changed=False, results=content['result'], state="list")
+ # Delete
if state == 'absent':
if not exists(content):
module.exit_json(changed=False, state="absent")
- content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
+ content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['itemid']])
module.exit_json(changed=True, results=content['result'], state="absent")
+ # Create and Update
if state == 'present':
+
params = {'name': module.params.get('name', module.params['key']),
- 'key_': key,
- 'hostid': templateid,
+ 'key_': module.params['key'],
+ 'hostid': templateid[0],
'type': module.params['zabbix_type'],
'value_type': get_value_type(module.params['value_type']),
- 'applications': get_app_ids(zapi, module.params['applications']),
+ 'applications': get_app_ids(module.params['applications'], app_name_ids),
}
+ # Remove any None valued params
+ _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
+
+ #******#
+ # CREATE
+ #******#
if not exists(content):
- # if we didn't find it, create it
content = zapi.get_content(zbx_class_name, 'create', params)
+
+ if content.has_key('error'):
+ module.exit_json(failed=True, changed=True, results=content['error'], state="present")
+
module.exit_json(changed=True, results=content['result'], state='present')
- # already exists, we need to update it
- # let's compare properties
+
+
+ ########
+ # UPDATE
+ ########
+ _ = params.pop('hostid', None)
differences = {}
zab_results = content['result'][0]
for key, value in params.items():
if key == 'applications':
- zab_apps = set([item['applicationid'] for item in zab_results[key]])
- if zab_apps != set(value):
- differences[key] = zab_apps
+ app_ids = [item['applicationid'] for item in zab_results[key]]
+ if set(app_ids) != set(value):
+ differences[key] = value
elif zab_results[key] != value and zab_results[key] != str(value):
differences[key] = value
@@ -162,8 +195,12 @@ def main():
module.exit_json(changed=False, results=zab_results, state="present")
# We have differences and need to update
- differences[idname] = zab_results[idname]
+ differences['itemid'] = zab_results['itemid']
content = zapi.get_content(zbx_class_name, 'update', differences)
+
+ if content.has_key('error'):
+ module.exit_json(failed=True, changed=False, results=content['error'], state="present")
+
module.exit_json(changed=True, results=content['result'], state="present")
module.exit_json(failed=True,
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 444fd0a14..630d5dd70 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -1,6 +1,4 @@
---
-- debug: var=template
-
- name: Template Create Template
zbx_template:
zbx_server: "{{ server }}"
@@ -9,28 +7,20 @@
name: "{{ template.name }}"
register: created_template
-- debug: var=created_template
- set_fact:
lzbx_applications: "{{ template.zitems | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
-- debug: var=lzbx_applications
-
-#
-# twiest: This is commented out because it doesn't work correctly
-#
-#- name: Create Application
-# zbx_application:
-# zbx_server: "{{ server }}"
-# zbx_user: "{{ user }}"
-# zbx_password: "{{ password }}"
-# name: "{{ item }}"
-# template_name: "{{ template.name }}"
-# with_items: lzbx_applications
-# register: created_application
-# when: template.zitems is defined
-
-#- debug: var=created_application
+- name: Create Application
+ zbx_application:
+ zbx_server: "{{ server }}"
+ zbx_user: "{{ user }}"
+ zbx_password: "{{ password }}"
+ name: "{{ item }}"
+ template_name: "{{ template.name }}"
+ with_items: lzbx_applications
+ register: created_application
+ when: template.zitems is defined
- name: Create Items
zbx_item:
@@ -41,7 +31,7 @@
name: "{{ item.name | default(item.key, true) }}"
value_type: "{{ item.value_type | default('int') }}"
template_name: "{{ template.name }}"
-# applications: "{{ item.applications }}"
+ applications: "{{ item.applications }}"
with_items: template.zitems
register: created_items
when: template.zitems is defined
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index deb921e5a..f9672b9c4 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -7,8 +7,6 @@
state: list
register: templates
-- debug: var=templates
-
- include_vars: template_heartbeat.yml
- include_vars: template_os_linux.yml
- include_vars: template_docker.yml
--
cgit v1.2.3