Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitor

moved vswitch from master to node

2 files changed, 26 insertions, 24 deletions

diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml
index cbbc79075..4ae918ec6 100644
--- a/roles/os_zabbix/vars/template_openshift_master.yml
+++ b/roles/os_zabbix/vars/template_openshift_master.yml
@@ -25,18 +25,6 @@ g_template_openshift_master:
     applications:
     - Openshift Master
 
-  - key: openshift.master.ovs.ports.count
-    description: Shows number of OVS ports defined
-    type: int
-    applications:
-    - Openshift Master
-
-  - key: openshift.master.ovs.pids.count
-    description: Shows number of ovs process ids running
-    type: int
-    applications:
-    - Openshift Master
-
   ztriggers:
   - name: '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'
@@ -58,13 +46,3 @@ g_template_openshift_master:
     url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_master.asciidoc'
     priority: info
 
-  - name: 'OVS may not be running on {HOST.NAME}'
-    expression: '{Template Openshift Master:openshift.master.ovs.pids.count.last()}<>4'
-    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_master.asciidoc'
-    priority: high
-    
-  - name: 'Number of OVS ports is 0 on {HOST.NAME}'
-    expression: '{Template Openshift Master:openshift.master.ovs.ports.count.last()}=0'
-    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_master.asciidoc'
-    priority: high
-    
diff --git a/roles/os_zabbix/vars/template_openshift_node.yml b/roles/os_zabbix/vars/template_openshift_node.yml
index 36f9cc4a3..ce28b1048 100644
--- a/roles/os_zabbix/vars/template_openshift_node.yml
+++ b/roles/os_zabbix/vars/template_openshift_node.yml
@@ -8,13 +8,37 @@ g_template_openshift_node:
     applications:
     - Openshift Node
 
+  - key: openshift.node.ovs.pids.count
+    description: Shows number of ovs process ids running
+    type: int
+    applications:
+    - Openshift Node
+
+  - key: openshift.node.ovs.ports.count
+    description: Shows number of OVS ports defined
+    type: int
+    applications:
+    - Openshift Node
+
   ztriggers:
   - name: 'Openshift Node process not running on {HOST.NAME}'
     expression: '{Template Openshift Node:openshift.node.process.count.max(#3)}<1'
-    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_node.asciidoc'
+    url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
     priority: high
 
   - name: 'Too many Openshift Node processes running on {HOST.NAME}'
     expression: '{Template Openshift Node:openshift.node.process.count.min(#3)}>1'
-    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_node.asciidoc'
+    url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
+    priority: high
+
+  - name: 'OVS may not be running on {HOST.NAME}'
+    expression: '{Template Openshift Node:openshift.node.ovs.pids.count.last()}<>4'
+    url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
     priority: high
+
+  - name: 'Number of OVS ports is 0 on {HOST.NAME}'
+    expression: '{Template Openshift Node:openshift.node.ovs.ports.count.last()}=0'
+    url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
+    priority: high
+
+