summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Diaz <jdiaz@redhat.com>2016-03-01 15:01:25 -0500
committerJoel Diaz <jdiaz@redhat.com>2016-03-01 15:01:25 -0500
commite0448bd5e230fc8fbdf5785d8e6e9371efd1ed17 (patch)
treed8984d059a48874390d0a26baa570363f001b8da
parentedfb3811262c60f40bfe5bf7dbf21614e323aa41 (diff)
parent21b0ebbd6ff9f7d3220ef191373297110b8c22e8 (diff)
downloadopenshift-e0448bd5e230fc8fbdf5785d8e6e9371efd1ed17.tar.gz
openshift-e0448bd5e230fc8fbdf5785d8e6e9371efd1ed17.tar.bz2
openshift-e0448bd5e230fc8fbdf5785d8e6e9371efd1ed17.tar.xz
openshift-e0448bd5e230fc8fbdf5785d8e6e9371efd1ed17.zip
Merge pull request #1530 from joelddiaz/zbx-action-Heal
change [HEAL] to [Heal] to match with v2
-rw-r--r--roles/os_zabbix/vars/template_openshift_node.yml2
-rw-r--r--roles/os_zabbix/vars/template_ops_tools.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/os_zabbix/vars/template_openshift_node.yml b/roles/os_zabbix/vars/template_openshift_node.yml
index 7032fd127..66bd3a147 100644
--- a/roles/os_zabbix/vars/template_openshift_node.yml
+++ b/roles/os_zabbix/vars/template_openshift_node.yml
@@ -59,7 +59,7 @@ g_template_openshift_node:
url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
priority: high
- - name: '[HEAL] OVS may not be running on {HOST.NAME}'
+ - name: '[Heal] OVS may not be running on {HOST.NAME}'
expression: '{Template Openshift Node:openshift.node.ovs.pids.count.last(#1)}<>4 and {Template Openshift Node:openshift.node.ovs.pids.count.last(#2)}<>4'
url: 'https://github.com/openshift/ops-sop/blob/node/V3/Alerts/openshift_node.asciidoc'
priority: high
diff --git a/roles/os_zabbix/vars/template_ops_tools.yml b/roles/os_zabbix/vars/template_ops_tools.yml
index 7ee567850..a0a5a4d03 100644
--- a/roles/os_zabbix/vars/template_ops_tools.yml
+++ b/roles/os_zabbix/vars/template_ops_tools.yml
@@ -23,7 +23,7 @@ g_template_ops_tools:
priority: average
zactions:
- - name: 'Remote command for [HEAL] triggers'
+ - name: 'Remote command for [Heal] triggers'
status: enabled
escalation_time: 60
conditions_filter:
@@ -33,7 +33,7 @@ g_template_ops_tools:
operator: not in
- conditiontype: trigger name
operator: like
- value: "[HEAL]"
+ value: "[Heal]"
- conditiontype: trigger value
operator: "="
value: PROBLEM