4 files changed, 32 insertions, 3 deletions
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
index 2ccc21292..6faa82dfc 100644
--- a/roles/lib_zabbix/library/zbx_item.py
+++ b/roles/lib_zabbix/library/zbx_item.py
@@ -53,6 +53,8 @@ def get_value_type(value_type):
     vtype = 0
     if 'int' in value_type:
         vtype = 3
+    elif 'log' in value_type:
+        vtype = 2
     elif 'char' in value_type:
         vtype = 1
     elif 'str' in value_type:
diff --git a/roles/lib_zabbix/library/zbx_itemprototype.py b/roles/lib_zabbix/library/zbx_itemprototype.py
index 4ec1b8e02..e7fd6fa21 100644
--- a/roles/lib_zabbix/library/zbx_itemprototype.py
+++ b/roles/lib_zabbix/library/zbx_itemprototype.py
@@ -128,12 +128,12 @@ def get_status(status):
 
     return _status
 
-def get_app_ids(zapi, application_names):
+def get_app_ids(zapi, application_names, templateid):
     ''' get application ids from names
     '''
     app_ids = []
     for app_name in application_names:
-        content = zapi.get_content('application', 'get', {'search': {'name': app_name}})
+        content = zapi.get_content('application', 'get', {'filter': {'name': app_name}, 'templateids': templateid})
         if content.has_key('result'):
             app_ids.append(content['result'][0]['applicationid'])
     return app_ids
@@ -212,7 +212,7 @@ def main():
                   'ruleid': get_rule_id(zapi, module.params['discoveryrule_key'], template['templateid']),
                   'type': get_type(module.params['ztype']),
                   'value_type': get_value_type(module.params['value_type']),
-                  'applications': get_app_ids(zapi, module.params['applications']),
+                  'applications': get_app_ids(zapi, module.params['applications'], template['templateid']),
                   'description': module.params['description'],
                  }
 
diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py
index 21d0fcfd2..ab7731faa 100644
--- a/roles/lib_zabbix/library/zbx_trigger.py
+++ b/roles/lib_zabbix/library/zbx_trigger.py
@@ -86,6 +86,24 @@ def get_trigger_status(inc_status):
 
     return r_status
 
+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
+
 def main():
     '''
     Create a trigger in zabbix
@@ -117,6 +135,7 @@ def main():
             url=dict(default=None, type='str'),
             status=dict(default=None, type='str'),
             state=dict(default='present', type='str'),
+            template_name=dict(default=None, type='str'),
         ),
         #supports_check_mode=True
     )
@@ -132,11 +151,16 @@ def main():
     state = module.params['state']
     tname = module.params['name']
 
+    templateid = None
+    if module.params['template_name']:
+        templateid, _ = get_template_id(zapi, module.params['template_name'])
+
     content = zapi.get_content(zbx_class_name,
                                'get',
                                {'filter': {'description': tname},
                                 'expandExpression': True,
                                 'selectDependencies': 'triggerid',
+                                'templateids': templateid,
                                })
 
     # Get
diff --git a/roles/lib_zabbix/library/zbx_user_media.py b/roles/lib_zabbix/library/zbx_user_media.py
index 9ed838f81..8895c78c3 100644
--- a/roles/lib_zabbix/library/zbx_user_media.py
+++ b/roles/lib_zabbix/library/zbx_user_media.py
@@ -260,6 +260,9 @@ def main():
         for user in params['users']:
             diff['users']['userid'] = user['userid']
 
+        # Medias have no real unique key so therefore we need to make it like the incoming user's request
+        diff['medias'] = medias
+
         # We have differences and need to update
         content = zapi.get_content(zbx_class_name, 'updatemedia', diff)