diff options
| author | Joel Diaz <jdiaz@redhat.com> | 2016-01-19 11:54:20 -0500 |
|---|---|---|
| committer | Joel Diaz <jdiaz@redhat.com> | 2016-01-19 11:54:20 -0500 |
| commit | 8d2a69f3f91c1948bccea193f86c78ce1d6bce31 (patch) | |
| tree | 070869a85a9e431b38c6519fe167852893b20308 | |
| parent | 6a386ddd39579d2cad9ca4052c9f726b47c7f419 (diff) | |
| parent | 6526f9c0ef7bccac4eef78364f74e82a996def26 (diff) | |
| download | openshift-8d2a69f3f91c1948bccea193f86c78ce1d6bce31.tar.gz openshift-8d2a69f3f91c1948bccea193f86c78ce1d6bce31.tar.bz2 openshift-8d2a69f3f91c1948bccea193f86c78ce1d6bce31.tar.xz openshift-8d2a69f3f91c1948bccea193f86c78ce1d6bce31.zip | |
Merge pull request #1225 from joelddiaz/disable-new-dns
add ability to disable ztriggers and disable new container dns check
| -rw-r--r-- | roles/lib_zabbix/tasks/create_template.yml | 1 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_docker.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml index 47749389e..61344357a 100644 --- a/roles/lib_zabbix/tasks/create_template.yml +++ b/roles/lib_zabbix/tasks/create_template.yml @@ -57,6 +57,7 @@ expression: "{{ item.expression }}" priority: "{{ item.priority }}" url: "{{ item.url | default(None, True) }}" + status: "{{ item.status | default('', True) }}" with_items: template.ztriggers when: template.ztriggers is defined diff --git a/roles/os_zabbix/vars/template_docker.yml b/roles/os_zabbix/vars/template_docker.yml index a05e552e3..dd13e76f7 100644 --- a/roles/os_zabbix/vars/template_docker.yml +++ b/roles/os_zabbix/vars/template_docker.yml @@ -72,10 +72,12 @@ g_template_docker: url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_docker_ping.asciidoc' priority: high + # Re-enable for OpenShift 3.1.1 (https://bugzilla.redhat.com/show_bug.cgi?id=1292971#c6) - name: 'docker.container.dns.resolution failed on {HOST.NAME}' expression: '{Template Docker:docker.container.dns.resolution.min(#3)}>0' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_docker_dns.asciidoc' priority: average + status: disabled - name: 'docker.container.existing.dns.resolution.failed on {HOST.NAME}' expression: '{Template Docker:docker.container.existing.dns.resolution.failed.min(#3)}>0' |