Merge pull request #1529 from joelddiaz/generic-remote-actions

make heal remote actions generic for all [HEAL] triggers

2 files changed, 31 insertions, 31 deletions

diff --git a/roles/os_zabbix/vars/template_openshift_node.yml b/roles/os_zabbix/vars/template_openshift_node.yml
index e6daee8e4..7032fd127 100644
--- a/roles/os_zabbix/vars/template_openshift_node.yml
+++ b/roles/os_zabbix/vars/template_openshift_node.yml
@@ -68,34 +68,3 @@ g_template_openshift_node:
     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
-
-  zactions:
-  - name: '[HEAL] OVS may not be running on {HOST.NAME}'
-    status: disabled
-    escalation_time: 60
-    conditions_filter:
-      calculation_type: "and/or"
-      conditions:
-      - conditiontype: maintenance status
-        operator: not in
-      - conditiontype: trigger name
-        operator: like
-        value: "[HEAL] OVS may not be running on"
-      - conditiontype: trigger value
-        operator: "="
-        value: PROBLEM
-    operations:
-    - esc_step_from: 1
-      esc_step_to: 1
-      esc_period: 0
-      operationtype: remote command
-      opcommand:
-        command: 'ssh -i /etc/openshift_tools/scriptrunner_id_rsa {{ ozb_scriptrunner_user }}@{{ ozb_scriptrunner_bastion_host }} remote-healer --host \"{HOST.NAME}\" --trigger \"{TRIGGER.NAME}\" --trigger-val \"{TRIGGER.VALUE}\"'
-        execute_on: "zabbix server"
-        type: 'custom script'
-      target_hosts:
-      - target_type: 'zabbix server'
-      opconditions:
-      - conditiontype: 'event acknowledged'
-        operator: '='
-        value: 'not acknowledged'
diff --git a/roles/os_zabbix/vars/template_ops_tools.yml b/roles/os_zabbix/vars/template_ops_tools.yml
index d1b8a2514..7ee567850 100644
--- a/roles/os_zabbix/vars/template_ops_tools.yml
+++ b/roles/os_zabbix/vars/template_ops_tools.yml
@@ -21,3 +21,34 @@ g_template_ops_tools:
     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
+
+  zactions:
+  - name: 'Remote command for [HEAL] triggers'
+    status: enabled
+    escalation_time: 60
+    conditions_filter:
+      calculation_type: "and/or"
+      conditions:
+      - conditiontype: maintenance status
+        operator: not in
+      - conditiontype: trigger name
+        operator: like
+        value: "[HEAL]"
+      - conditiontype: trigger value
+        operator: "="
+        value: PROBLEM
+    operations:
+    - esc_step_from: 1
+      esc_step_to: 1
+      esc_period: 0
+      operationtype: remote command
+      opcommand:
+        command: 'ssh -i /etc/openshift_tools/scriptrunner_id_rsa {{ ozb_scriptrunner_user }}@{{ ozb_scriptrunner_bastion_host }} remote-healer --host \"{HOST.NAME}\" --trigger \"{TRIGGER.NAME}\" --trigger-val \"{TRIGGER.VALUE}\"'
+        execute_on: "zabbix server"
+        type: 'custom script'
+      target_hosts:
+      - target_type: 'zabbix server'
+      opconditions:
+      - conditiontype: 'event acknowledged'
+        operator: '='
+        value: 'not acknowledged'