diff options
author | Joel Diaz <jdiaz@redhat.com> | 2016-02-24 15:37:24 -0500 |
---|---|---|
committer | Joel Diaz <jdiaz@redhat.com> | 2016-02-24 15:37:24 -0500 |
commit | 72d7e9478812655d6034edcf7e41bec4129fc70b (patch) | |
tree | e28ddb2fde46028357a8bcf789b758cc198ecbfa /roles | |
parent | dcb8bfae310e313761e5fc9cc9103650b3bd4011 (diff) | |
parent | 51b33151b6265d6049b9b39cbb25b6a4522ef7e5 (diff) | |
download | openshift-72d7e9478812655d6034edcf7e41bec4129fc70b.tar.gz openshift-72d7e9478812655d6034edcf7e41bec4129fc70b.tar.bz2 openshift-72d7e9478812655d6034edcf7e41bec4129fc70b.tar.xz openshift-72d7e9478812655d6034edcf7e41bec4129fc70b.zip |
Merge pull request #1467 from joelddiaz/remote-heal-action
remote heal action for OVS down
Diffstat (limited to 'roles')
-rw-r--r-- | roles/lib_zabbix/tasks/create_template.yml | 14 | ||||
-rw-r--r-- | roles/os_zabbix/vars/template_openshift_node.yml | 31 |
2 files changed, 44 insertions, 1 deletions
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml index 61344357a..783249c3a 100644 --- a/roles/lib_zabbix/tasks/create_template.yml +++ b/roles/lib_zabbix/tasks/create_template.yml @@ -61,6 +61,20 @@ with_items: template.ztriggers when: template.ztriggers is defined +- name: Create Actions + zbx_action: + zbx_server: "{{ server }}" + zbx_user: "{{ user }}" + zbx_password: "{{ password }}" + state: "{{ item.state | default('present', True) }}" + name: "{{ item.name }}" + status: "{{ item.status | default('enabled', True) }}" + escalation_time: "{{ item.escalation_time }}" + conditions_filter: "{{ item.conditions_filter }}" + operations: "{{ item.operations }}" + with_items: template.zactions + when: template.zactions is defined + - name: Create Discoveryrules zbx_discoveryrule: zbx_server: "{{ server }}" diff --git a/roles/os_zabbix/vars/template_openshift_node.yml b/roles/os_zabbix/vars/template_openshift_node.yml index c36c593df..e6daee8e4 100644 --- a/roles/os_zabbix/vars/template_openshift_node.yml +++ b/roles/os_zabbix/vars/template_openshift_node.yml @@ -69,4 +69,33 @@ g_template_openshift_node: 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' |