From a073f179b26c0d110aa6a8b7fc560ca061e4dc5c Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Tue, 11 Aug 2015 15:52:38 -0400
Subject: Zabbix Idempotency

---
 playbooks/adhoc/zabbix_setup/create_template.yml | 30 +++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'playbooks/adhoc/zabbix_setup/create_template.yml')

diff --git a/playbooks/adhoc/zabbix_setup/create_template.yml b/playbooks/adhoc/zabbix_setup/create_template.yml
index b055e78eb..60fb27666 100644
--- a/playbooks/adhoc/zabbix_setup/create_template.yml
+++ b/playbooks/adhoc/zabbix_setup/create_template.yml
@@ -2,16 +2,14 @@
 - debug: var=ctp_template
 
 - name: Create Template
-  zbxapi:
+  zbx_template:
     server: "{{ ctp_zserver }}"
     user: "{{ ctp_zuser }}"
     password: "{{ ctp_zpassword }}"
-    zbx_class: Template
-    state: present
-    params: "{{ ctp_template.params }}"
-  register: ctp_created_templates
+    name: "{{ ctp_template.name }}"
+  register: ctp_created_template
 
-- debug: var=ctp_created_templates
+- debug: var=ctp_created_template
 
 #- name: Create Application
 #  zbxapi:
@@ -22,7 +20,7 @@
 #    state: present
 #    params:
 #      name: "{{ ctp_template.application.name}}"
-#      hostid: "{{ ctp_created_templates.results[0].templateid }}"
+#      hostid: "{{ ctp_created_template.results[0].templateid }}"
 #      search:
 #        name: "{{ ctp_template.application.name}}"
 #  register: ctp_created_application
@@ -30,28 +28,28 @@
 #- debug: var=ctp_created_application
 
 - name: Create Items
-  zbxapi:
+  zbx_item:
     server: "{{ ctp_zserver }}"
     user: "{{ ctp_zuser }}"
     password: "{{ ctp_zpassword }}"
-    zbx_class: Item
-    state: present
-    params: "{{ item | oo_set_zbx_item_hostid(ctp_created_templates.results) }}"
+    name: "{{ item.name }}"
+    key: "{{ item.key }}"
+    value_type: "{{ item.value_type | default('int') }}"
+    template_name: "{{ ctp_template.name }}"
   with_items: ctp_template.zitems
   register: ctp_created_items
 
 #- debug: var=ctp_created_items
 
 - name: Create Triggers
-  zbxapi:
+  zbx_trigger:
     server: "{{ ctp_zserver }}"
     user: "{{ ctp_zuser }}"
     password: "{{ ctp_zpassword }}"
-    zbx_class: Trigger
-    state: present
-    params: "{{ item }}"
+    description: "{{ item.description }}"
+    expression: "{{ item.expression }}"
+    priority: "{{ item.priority }}"
   with_items: ctp_template.ztriggers
-  register: ctp_created_triggers
   when: ctp_template.ztriggers is defined
 
 #- debug: var=ctp_created_triggers
-- 
cgit v1.2.3