1 files changed, 51 insertions, 14 deletions
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 022ca52f2..41381e76c 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,12 +7,10 @@
     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
+    lzbx_item_applications: "{{ template.zitems | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
+    lzbx_itemprototype_applications: "{{ template.zitemprototypes | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
 
 - name: Create Application
   zbx_application:
@@ -23,11 +19,11 @@
     zbx_password: "{{ password }}"
     name: "{{ item }}"
     template_name: "{{ template.name }}"
-  with_items: lzbx_applications
+  with_items:
+  - "{{ lzbx_item_applications }}"
+  - "{{ lzbx_itemprototype_applications }}"
   register: created_application
-  when: template.zitems is defined
-
-- debug: var=created_application
+  when: template.zitems is defined or template.zitemprototypes is defined
 
 - name: Create Items
   zbx_item:
@@ -37,25 +33,66 @@
     key: "{{ item.key }}"
     name: "{{ item.name | default(item.key, true) }}"
     value_type: "{{ item.value_type | default('int') }}"
+    description: "{{ item.description | default('', True) }}"
+    multiplier: "{{ item.multiplier | default('', True) }}"
+    units: "{{ item.units | default('', True) }}"
     template_name: "{{ template.name }}"
     applications: "{{ item.applications }}"
   with_items: template.zitems
   register: created_items
   when: template.zitems is defined
 
-#- debug: var=ctp_created_items
-
 - name: Create Triggers
   zbx_trigger:
     zbx_server: "{{ server }}"
     zbx_user: "{{ user }}"
     zbx_password: "{{ password }}"
-    description: "{{ item.description }}"
+    name: "{{ item.name }}"
+    description: "{{ item.description | default('', True) }}"
+    dependencies: "{{ item.dependencies | default([], True) }}"
     expression: "{{ item.expression }}"
     priority: "{{ item.priority }}"
+    url: "{{ item.url | default(None, True) }}"
   with_items: template.ztriggers
   when: template.ztriggers is defined
 
-#- debug: var=ctp_created_triggers
+- name: Create Discoveryrules
+  zbx_discoveryrule:
+    zbx_server: "{{ server }}"
+    zbx_user: "{{ user }}"
+    zbx_password: "{{ password }}"
+    name: "{{ item.name }}"
+    key: "{{ item.key }}"
+    lifetime: "{{ item.lifetime }}"
+    template_name: "{{ template.name }}"
+    description: "{{ item.description | default('', True) }}"
+  with_items: template.zdiscoveryrules
+  when: template.zdiscoveryrules is defined
 
+- name: Create Item Prototypes
+  zbx_itemprototype:
+    zbx_server: "{{ server }}"
+    zbx_user: "{{ user }}"
+    zbx_password: "{{ password }}"
+    name: "{{ item.name }}"
+    key: "{{ item.key }}"
+    discoveryrule_key: "{{ item.discoveryrule_key }}"
+    value_type: "{{ item.value_type }}"
+    template_name: "{{ template.name }}"
+    applications: "{{ item.applications }}"
+    description: "{{ item.description | default('', True) }}"
+  with_items: template.zitemprototypes
+  when: template.zitemprototypes is defined
 
+- name: Create Trigger Prototypes
+  zbx_triggerprototype:
+    zbx_server: "{{ server }}"
+    zbx_user: "{{ user }}"
+    zbx_password: "{{ password }}"
+    name: "{{ item.name }}"
+    expression: "{{ item.expression }}"
+    url: "{{ item.url | default('', True) }}"
+    priority: "{{ item.priority | default('average', True) }}"
+    description: "{{ item.description | default('', True) }}"
+  with_items: template.ztriggerprototypes
+  when: template.ztriggerprototypes is defined