diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-10-20 17:05:10 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-10-20 17:05:10 -0400 |
| commit | 0b89d53ad9c0c83c42db3ee1642c005474c3cc58 (patch) | |
| tree | 54a649dfa81d9d9b9f9eba89ced401ec75d38b95 /roles/lib_zabbix | |
| parent | abb8c470ce4452373c44e224add5eb4a5ec21578 (diff) | |
| parent | ba80a2c5b19614c87d2ce0568ed8830c62d40f95 (diff) | |
| download | openshift-0b89d53ad9c0c83c42db3ee1642c005474c3cc58.tar.gz openshift-0b89d53ad9c0c83c42db3ee1642c005474c3cc58.tar.bz2 openshift-0b89d53ad9c0c83c42db3ee1642c005474c3cc58.tar.xz openshift-0b89d53ad9c0c83c42db3ee1642c005474c3cc58.zip | |
Merge pull request #714 from kwoodson/zabb
Adding zabbix agent bits zabbix-server
Diffstat (limited to 'roles/lib_zabbix')
| -rw-r--r-- | roles/lib_zabbix/library/zbx_item.py | 2 | ||||
| -rw-r--r-- | roles/lib_zabbix/tasks/create_template.yml | 2 |
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 |