From c16cc8398b4313cdee12a1332a268c8979481ac7 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Tue, 20 Oct 2015 17:31:09 -0400
Subject: Adding delta feature to zbx_item
---
roles/lib_zabbix/library/zbx_item.py | 2 ++
roles/lib_zabbix/tasks/create_template.yml | 1 +
roles/os_zabbix/vars/template_app_zabbix_server.yml | 2 ++
3 files changed, 5 insertions(+)
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
index caca2df52..2cd00dd27 100644
--- a/roles/lib_zabbix/library/zbx_item.py
+++ b/roles/lib_zabbix/library/zbx_item.py
@@ -126,6 +126,7 @@ def main():
zabbix_type=dict(default=2, type='int'),
value_type=dict(default='int', type='str'),
interval=dict(default=60, type='int'),
+ delta=dict(default=0, type='int'),
multiplier=dict(default=None, type='str'),
description=dict(default=None, type='str'),
units=dict(default=None, type='str'),
@@ -191,6 +192,7 @@ def main():
'description': module.params['description'],
'units': module.params['units'],
'delay': module.params['interval'],
+ 'delta': module.params['delta'],
}
# Remove any None valued params
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index df7888a95..d5168a9f4 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -40,6 +40,7 @@
applications: "{{ item.applications }}"
zabbix_type: "{{ item.zabbix_type | default(2, True) }}"
interval: "{{ item.interval | default(60, True) }}"
+ delta: "{{ item.delta | default(0, True) }}"
with_items: template.zitems
register: created_items
when: template.zitems is defined
diff --git a/roles/os_zabbix/vars/template_app_zabbix_server.yml b/roles/os_zabbix/vars/template_app_zabbix_server.yml
index 185ed7ecd..aeec16254 100644
--- a/roles/os_zabbix/vars/template_app_zabbix_server.yml
+++ b/roles/os_zabbix/vars/template_app_zabbix_server.yml
@@ -244,6 +244,8 @@ g_template_app_zabbix_server:
units: ''
value_type: float
zabbix_type: 5
+ delta: 1 # speed per second
+
ztriggers:
- description: "There has been unexpected output while running the housekeeping script\
\ on the Zabbix. There are only three kinds of lines we expect to see in the output,\
--
cgit v1.2.3