diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2016-01-21 12:33:17 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2016-01-21 12:33:17 -0500 |
| commit | 9d4cc988d0fbb679f66995acb2b82ca74fe412da (patch) | |
| tree | 1732dbb203a85c2ea495af595ea94474df42453a /roles | |
| parent | 9410cdff9342fae80a3149c530b819e473996cce (diff) | |
| parent | bef3647b3b6db7e692b3306d83038b4eb8b71de2 (diff) | |
| download | openshift-9d4cc988d0fbb679f66995acb2b82ca74fe412da.tar.gz openshift-9d4cc988d0fbb679f66995acb2b82ca74fe412da.tar.bz2 openshift-9d4cc988d0fbb679f66995acb2b82ca74fe412da.tar.xz openshift-9d4cc988d0fbb679f66995acb2b82ca74fe412da.zip | |
Merge pull request #1256 from openshift/master
sync master -> prod branch
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/os_zabbix/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_config_loop.yml | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml index 7552086d4..1c8d88854 100644 --- a/roles/os_zabbix/tasks/main.yml +++ b/roles/os_zabbix/tasks/main.yml @@ -41,6 +41,10 @@ tags: - zagg_server +- include_vars: template_config_loop.yml + tags: + - config_loop + - name: Include Template Heartbeat include: ../../lib_zabbix/tasks/create_template.yml vars: @@ -150,3 +154,13 @@ password: "{{ ozb_password }}" tags: - zagg_server + +- name: Include Template Config Loop + include: ../../lib_zabbix/tasks/create_template.yml + vars: + template: "{{ g_template_config_loop }}" + server: "{{ ozb_server }}" + user: "{{ ozb_user }}" + password: "{{ ozb_password }}" + tags: + - config_loop diff --git a/roles/os_zabbix/vars/template_config_loop.yml b/roles/os_zabbix/vars/template_config_loop.yml new file mode 100644 index 000000000..823da1868 --- /dev/null +++ b/roles/os_zabbix/vars/template_config_loop.yml @@ -0,0 +1,14 @@ +--- +g_template_config_loop: + name: Template Config Loop + zitems: + - key: config_loop.run.exit_code + applications: + - Config Loop + value_type: int + + ztriggers: + - name: 'config_loop.run.exit_code not zero on {HOST.NAME}' + expression: '{Template Config Loop:config_loop.run.exit_code.min(#2)}>0' + url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_config_loop.asciidoc' + priority: average |