summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-31 15:17:40 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-31 15:17:40 -0400
commitc22864a97062724a25b0a723b5e919a9e8a073c5 (patch)
treed22bfeca8fca618cd6ce5eae21943e683a9b9436 /roles/os_zabbix
parent201500abfd535266e54c9684c01e3f7ff462863d (diff)
parent3acccb3e51968744cbe9119fdbf1897739f3a94e (diff)
downloadopenshift-c22864a97062724a25b0a723b5e919a9e8a073c5.tar.gz
openshift-c22864a97062724a25b0a723b5e919a9e8a073c5.tar.bz2
openshift-c22864a97062724a25b0a723b5e919a9e8a073c5.tar.xz
openshift-c22864a97062724a25b0a723b5e919a9e8a073c5.zip
Merge pull request #541 from kwoodson/master_templ
app create in master template
Diffstat (limited to 'roles/os_zabbix')
-rw-r--r--roles/os_zabbix/tasks/main.yml8
-rw-r--r--roles/os_zabbix/vars/template_openshift_master.yml12
2 files changed, 20 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 5d6e67606..deb921e5a 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -12,6 +12,7 @@
- include_vars: template_heartbeat.yml
- include_vars: template_os_linux.yml
- include_vars: template_docker.yml
+- include_vars: template_openshift_master.yml
- name: Include Template Heartbeat
include: ../../lib_zabbix/tasks/create_template.yml
@@ -37,3 +38,10 @@
user: "{{ ozb_user }}"
password: "{{ ozb_password }}"
+- name: Include Template Openshift Master
+ include: ../../lib_zabbix/tasks/create_template.yml
+ vars:
+ template: "{{ g_template_openshift_master }}"
+ server: "{{ ozb_server }}"
+ user: "{{ ozb_user }}"
+ password: "{{ ozb_password }}"
diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
new file mode 100644
index 000000000..c4e4d1c94
--- /dev/null
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -0,0 +1,12 @@
+---
+g_template_openshift_master:
+ name: Template Openshift Master
+ zitems:
+ - name: create_app
+ applications:
+ - Openshift Master
+ key: create_app
+ ztriggers:
+ - description: 'Application creation has failed on {HOST.NAME}'
+ expression: '{Template Openshift Master:create_app.last(#1)}=1 and {Template Openshift Master:create_app.last(#2)}=1'
+ priority: avg