Merge pull request #651 from twiest/cpr

added Template Ops Tools

4 files changed, 38 insertions, 5 deletions

diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 62259b680..41381e76c 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -9,7 +9,8 @@
 
 
 - set_fact:
-    lzbx_applications: "{{ template.zitems | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
+    lzbx_item_applications: "{{ template.zitems | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
+    lzbx_itemprototype_applications: "{{ template.zitemprototypes | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
 
 - name: Create Application
   zbx_application:
@@ -18,9 +19,11 @@
     zbx_password: "{{ password }}"
     name: "{{ item }}"
     template_name: "{{ template.name }}"
-  with_items: lzbx_applications
+  with_items:
+  - "{{ lzbx_item_applications }}"
+  - "{{ lzbx_itemprototype_applications }}"
   register: created_application
-  when: template.zitems is defined
+  when: template.zitems is defined or template.zitemprototypes is defined
 
 - name: Create Items
   zbx_item:
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 8347e9a61..28e900255 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -12,6 +12,7 @@
 - include_vars: template_docker.yml
 - include_vars: template_openshift_master.yml
 - include_vars: template_openshift_node.yml
+- include_vars: template_ops_tools.yml
 
 - name: Include Template Heartbeat
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -52,3 +53,11 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+
+- name: Include Template Ops Tools
+  include: ../../lib_zabbix/tasks/create_template.yml
+  vars:
+    template: "{{ g_template_ops_tools }}"
+    server: "{{ ozb_server }}"
+    user: "{{ ozb_user }}"
+    password: "{{ ozb_password }}"
diff --git a/roles/os_zabbix/vars/template_ops_tools.yml b/roles/os_zabbix/vars/template_ops_tools.yml
new file mode 100644
index 000000000..d1b8a2514
--- /dev/null
+++ b/roles/os_zabbix/vars/template_ops_tools.yml
@@ -0,0 +1,23 @@
+---
+g_template_ops_tools:
+  name: Template Operations Tools
+  zdiscoveryrules:
+  - name: disc.ops.runner
+    key: disc.ops.runner
+    lifetime: 1
+    description: "Dynamically register operations runner items"
+
+  zitemprototypes:
+  - discoveryrule_key: disc.ops.runner
+    name: "Exit code of ops-runner[{#OSO_COMMAND}]"
+    key: "disc.ops.runner.command.exitcode[{#OSO_COMMAND}]"
+    value_type: int
+    description: "The exit code of the command run from ops-runner"
+    applications:
+    - Ops Runner
+
+  ztriggerprototypes:
+  - name: 'ops-runner[{#OSO_COMMAND}]: non-zero exit code on {HOST.NAME}'
+    expression: '{Template Operations Tools:disc.ops.runner.command.exitcode[{#OSO_COMMAND}].last()}<>0'
+    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_ops_runner_command.asciidoc'
+    priority: average
diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml
index c81f39c58..70c3809bd 100644
--- a/roles/os_zabbix/vars/template_os_linux.yml
+++ b/roles/os_zabbix/vars/template_os_linux.yml
@@ -204,12 +204,10 @@ g_template_os_linux:
   - name: disc.filesys
     key: disc.filesys
     lifetime: 1
-    template_name: Template OS Linux
     description: "Dynamically register the filesystems"
 
   zitemprototypes:
   - discoveryrule_key: disc.filesys
-    template_name: Template OS Linux
     name: "disc.filesys.full.{#OSO_FILESYS}"
     key: "disc.filesys.full[{#OSO_FILESYS}]"
     value_type: float