summaryrefslogtreecommitdiffstats
path: root/roles/lib_zabbix
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-10-20 17:00:14 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-10-20 17:00:14 -0400
commitba80a2c5b19614c87d2ce0568ed8830c62d40f95 (patch)
tree09383cf6681c21852d91d874e865e5545a97f97f /roles/lib_zabbix
parenta6d3017291433413649c915cfb3de90b362175fa (diff)
downloadopenshift-ba80a2c5b19614c87d2ce0568ed8830c62d40f95.tar.gz
openshift-ba80a2c5b19614c87d2ce0568ed8830c62d40f95.tar.bz2
openshift-ba80a2c5b19614c87d2ce0568ed8830c62d40f95.tar.xz
openshift-ba80a2c5b19614c87d2ce0568ed8830c62d40f95.zip
Zabbix server stat fixes. enable the proper item types.
Diffstat (limited to 'roles/lib_zabbix')
-rw-r--r--roles/lib_zabbix/library/zbx_item.py2
-rw-r--r--roles/lib_zabbix/tasks/create_template.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
index 6faa82dfc..caca2df52 100644
--- a/roles/lib_zabbix/library/zbx_item.py
+++ b/roles/lib_zabbix/library/zbx_item.py
@@ -125,6 +125,7 @@ def main():
template_name=dict(default=None, type='str'),
zabbix_type=dict(default=2, type='int'),
value_type=dict(default='int', type='str'),
+ interval=dict(default=60, type='int'),
multiplier=dict(default=None, type='str'),
description=dict(default=None, type='str'),
units=dict(default=None, type='str'),
@@ -189,6 +190,7 @@ def main():
'multiplier': use_multiplier,
'description': module.params['description'],
'units': module.params['units'],
+ 'delay': module.params['interval'],
}
# Remove any None valued params
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 41381e76c..df7888a95 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -38,6 +38,8 @@
units: "{{ item.units | default('', True) }}"
template_name: "{{ template.name }}"
applications: "{{ item.applications }}"
+ zabbix_type: "{{ item.zabbix_type | default(2, True) }}"
+ interval: "{{ item.interval | default(60, True) }}"
with_items: template.zitems
register: created_items
when: template.zitems is defined