From a6cdc712749f58dacf1dfeddb5a747987d582b9c Mon Sep 17 00:00:00 2001
From: Zhiming Zhang <zhizhang@use-tower1.ops.rhcloud.com>
Date: Tue, 22 Mar 2016 22:32:24 -0400
Subject: add dynamic pv count

---
 roles/os_zabbix/vars/template_openshift_master.yml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
index 705066b35..875c90df4 100644
--- a/roles/os_zabbix/vars/template_openshift_master.yml
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -279,6 +279,29 @@ g_template_openshift_master:
     applications:
     - Openshift Master Metrics
 
+  zdiscoveryrules:
+  - name: disc.pv
+    key: disc.pv
+    lifetime: 1
+    description: "Dynamically register the Persistent Volumes"
+
+  zitemprototypes:
+  - discoveryrule_key: disc.pv
+    name: "disc.pv.count.{#OSO_PV}"
+    key: "disc.pv.count[{#OSO_PV}]"
+    value_type: int
+    description: "Number of PV's of this size"
+    applications:
+    - Openshift Master
+
+  - discoveryrule_key: disc.pv
+    name: "disc.pv.count.available.{#OSO_PV}"
+    key: "disc.pv.count.available[{#OSO_PV}]"
+    value_type: int
+    description: "Number of PV's of this size that are available"
+    applications:
+    - Openshift Master
+
   ztriggers:
   - name: 'Openshift Master process not running on {HOST.NAME}'
     expression: '{Template Openshift Master:openshift.master.process.count.max(#3)}<1'
-- 
cgit v1.2.3


From a25d184021d72dfd3021f6bd59c4b510f05fb98f Mon Sep 17 00:00:00 2001
From: Zhiming Zhang <zhizhang@use-tower1.ops.rhcloud.com>
Date: Tue, 22 Mar 2016 22:40:02 -0400
Subject: add the total and available space item

---
 roles/os_zabbix/vars/template_openshift_master.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
index 875c90df4..e766d5324 100644
--- a/roles/os_zabbix/vars/template_openshift_master.yml
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -93,6 +93,18 @@ g_template_openshift_master:
     applications:
     - Openshift Master
 
+  - key: openshift.master.pv.space.total
+    description: Shows the total space of pv
+    value_type: int
+    applications:
+    - Openshift Master
+
+  - key: openshift.master.pv.space.availble
+    description: Shows the available space of pv
+    value_type: int
+    applications:
+    - Openshift Master
+
   - key: openshift.master.pv.total.count
     description: Total number of Persistent Volumes in the Openshift Cluster
     value_type: int
-- 
cgit v1.2.3


From 00f361c1e7b0c113b615967e5f9320c60adb4ff5 Mon Sep 17 00:00:00 2001
From: Zhiming Zhang <zhizhang@use-tower1.ops.rhcloud.com>
Date: Tue, 22 Mar 2016 22:50:50 -0400
Subject: fix some typo

---
 roles/os_zabbix/vars/template_openshift_master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
index e766d5324..1f2117b2c 100644
--- a/roles/os_zabbix/vars/template_openshift_master.yml
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -99,7 +99,7 @@ g_template_openshift_master:
     applications:
     - Openshift Master
 
-  - key: openshift.master.pv.space.availble
+  - key: openshift.master.pv.space.available
     description: Shows the available space of pv
     value_type: int
     applications:
-- 
cgit v1.2.3