Merge pull request #977 from mwoodson/graphs

added graphs for openshift master and network in zabbix

4 files changed, 110 insertions, 0 deletions

diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
index 2992505bf..47749389e 100644
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ b/roles/lib_zabbix/tasks/create_template.yml
@@ -105,3 +105,27 @@
     description: "{{ item.description | default('', True) }}"
   with_items: template.ztriggerprototypes
   when: template.ztriggerprototypes is defined
+
+- name: Create Graphs
+  zbx_graph:
+    zbx_server: "{{ server }}"
+    zbx_user: "{{ user }}"
+    zbx_password: "{{ password }}"
+    name: "{{ item.name }}"
+    height: "{{ item.height }}"
+    width: "{{ item.width }}"
+    graph_items: "{{ item.graph_items }}"
+  with_items: template.zgraphs
+  when: template.zgraphs is defined
+
+- name: Create Graph Prototypes
+  zbx_graphprototype:
+    zbx_server: "{{ server }}"
+    zbx_user: "{{ user }}"
+    zbx_password: "{{ password }}"
+    name: "{{ item.name }}"
+    height: "{{ item.height }}"
+    width: "{{ item.width }}"
+    graph_items: "{{ item.graph_items }}"
+  with_items: template.zgraphprototypes
+  when: template.zgraphprototypes is defined
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 59c89bb02..d0b307a3d 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -8,15 +8,35 @@
   register: templates
 
 - include_vars: template_heartbeat.yml
+  tags:
+  - heartbeat
 - include_vars: template_os_linux.yml
+  tags:
+  - linux
 - include_vars: template_docker.yml
+  tags:
+  - docker
 - include_vars: template_openshift_master.yml
+  tags:
+  - openshift_master
 - include_vars: template_openshift_node.yml
+  tags:
+  - openshift_node
 - include_vars: template_ops_tools.yml
+  tags:
+  - ops_tools
 - include_vars: template_app_zabbix_server.yml
+  tags:
+  - zabbix_server
 - include_vars: template_app_zabbix_agent.yml
+  tags:
+  - zabbix_agent
 - include_vars: template_performance_copilot.yml
+  tags:
+  - pcp
 - include_vars: template_aws.yml
+  tags:
+  - aws
 
 - name: Include Template Heartbeat
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -25,6 +45,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - heartbeat
 
 - name: Include Template os_linux
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -33,6 +55,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - linux
 
 - name: Include Template docker
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -41,6 +65,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - docker
 
 - name: Include Template Openshift Master
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -49,6 +75,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - openshift_master
 
 - name: Include Template Openshift Node
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -57,6 +85,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - openshift_node
 
 - name: Include Template Ops Tools
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -65,6 +95,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - ops_tools
 
 - name: Include Template App Zabbix Server
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -73,6 +105,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - zabbix_server
 
 - name: Include Template App Zabbix Agent
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -81,6 +115,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - zabbix_agent
 
 - name: Include Template Performance Copilot
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -89,6 +125,8 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - pcp
 
 - name: Include Template AWS
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -97,3 +135,5 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+  tags:
+  - aws
diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
index 512adad4c..8236cf135 100644
--- a/roles/os_zabbix/vars/template_openshift_master.yml
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -244,3 +244,37 @@ g_template_openshift_master:
     expression: '{Template Openshift Master:openshift.master.etcd.ping.last(#1)}=0 and {Template Openshift Master:openshift.master.etcd.ping.last(#2)}=0'
     url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_etcd.asciidoc'
     priority: high
+
+  zgraphs:
+  - name: Openshift Master API Server Latency Pods LIST Quantiles
+    width: 900
+    height: 200
+    graph_items:
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.list.5
+      color: red
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.list.9
+      color: blue
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.list.99
+      color: orange
+
+  - name: Openshift Master API Server Latency Pods WATCHLIST Quantiles
+    width: 900
+    height: 200
+    graph_items:
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.watchlist.5
+      color: red
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.watchlist.9
+      color: blue
+    - item_name: openshift.master.apiserver.latency.summary.pods.quantile.watchlist.99
+      color: orange
+
+  - name: Openshift Master Scheduler End to End Latency Quantiles
+    width: 900
+    height: 200
+    graph_items:
+    - item_name: openshift.master.scheduler.e2e.scheduling.latency.quantile.5
+      color: red
+    - item_name: openshift.master.scheduler.e2e.scheduling.latency.quantile.9
+      color: blue
+    - item_name: openshift.master.scheduler.e2e.scheduling.latency.quantile.99
+      color: orange
diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml
index 04665be62..79d52ef9b 100644
--- a/roles/os_zabbix/vars/template_os_linux.yml
+++ b/roles/os_zabbix/vars/template_os_linux.yml
@@ -304,3 +304,15 @@ g_template_os_linux:
     description: 'CPU is less than 10% idle'
     dependencies:
     - 'CPU idle less than 5% on {HOST.NAME}'
+
+  zgraphprototypes:
+  - name: Network Interface Usage
+    width: 1000
+    height: 400
+    graph_items:
+    - item_name: "Bytes per second IN on network interface {#OSO_NET_INTERFACE}"
+      item_type: prototype
+      color: red
+    - item_name: "Bytes per second OUT on network interface {#OSO_NET_INTERFACE}"
+      item_type: prototype
+      color: blue