From 4e5ddae5018ebab6cba0ba83de2702adfabeb478 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 10 Sep 2015 11:25:08 -0400
Subject: Adding capability to have descriptions on triggers

---
 roles/lib_zabbix/library/zbx_trigger.py    | 8 +++++---
 roles/lib_zabbix/tasks/create_template.yml | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'roles/lib_zabbix')

diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py
index c384f6fa3..a05de7e68 100644
--- a/roles/lib_zabbix/library/zbx_trigger.py
+++ b/roles/lib_zabbix/library/zbx_trigger.py
@@ -98,6 +98,7 @@ def main():
             zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
             zbx_debug=dict(default=False, type='bool'),
             expression=dict(default=None, type='str'),
+            name=dict(default=None, type='str'),
             description=dict(default=None, type='str'),
             dependencies=dict(default=[], type='list'),
             priority=dict(default='avg', type='str'),
@@ -116,11 +117,11 @@ def main():
     zbx_class_name = 'trigger'
     idname = "triggerid"
     state = module.params['state']
-    description = module.params['description']
+    tname = module.params['name']
 
     content = zapi.get_content(zbx_class_name,
                                'get',
-                               {'filter': {'description': description},
+                               {'filter': {'description': tname},
                                 'expandExpression': True,
                                 'selectDependencies': 'triggerid',
                                })
@@ -138,7 +139,8 @@ def main():
 
     # Create and Update
     if state == 'present':
-        params = {'description': description,
+        params = {'description': tname,
+                  'comments':  module.params['description'],
                   'expression':  module.params['expression'],
                   'dependencies': get_deps(zapi, module.params['dependencies']),
                   'priority': get_priority(module.params['priority']),
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 6307bf57a..fd0cdd46f 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -44,8 +44,9 @@
     zbx_server: "{{ server }}"
     zbx_user: "{{ user }}"
     zbx_password: "{{ password }}"
-    description: "{{ item.description }}"
-    dependencies: "{{ item.dependencies | default([], true) }}"
+    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) }}"
-- 
cgit v1.2.3