summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-01-21 12:24:24 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-01-21 12:24:24 -0500
commitbef3647b3b6db7e692b3306d83038b4eb8b71de2 (patch)
tree1732dbb203a85c2ea495af595ea94474df42453a
parentc6e6a4bfb359add31c3677df18d5f92220d25a68 (diff)
parent8170207c20642eb1db973f2d570b0deb7b2add8e (diff)
downloadopenshift-bef3647b3b6db7e692b3306d83038b4eb8b71de2.tar.gz
openshift-bef3647b3b6db7e692b3306d83038b4eb8b71de2.tar.bz2
openshift-bef3647b3b6db7e692b3306d83038b4eb8b71de2.tar.xz
openshift-bef3647b3b6db7e692b3306d83038b4eb8b71de2.zip
Merge pull request #1254 from twiest/pr
Added template for config loop.
-rw-r--r--roles/os_zabbix/tasks/main.yml14
-rw-r--r--roles/os_zabbix/vars/template_config_loop.yml14
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