summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix
diff options
context:
space:
mode:
authorJoel Diaz <jdiaz@redhat.com>2016-01-19 11:54:20 -0500
committerJoel Diaz <jdiaz@redhat.com>2016-01-19 11:54:20 -0500
commit8d2a69f3f91c1948bccea193f86c78ce1d6bce31 (patch)
tree070869a85a9e431b38c6519fe167852893b20308 /roles/os_zabbix
parent6a386ddd39579d2cad9ca4052c9f726b47c7f419 (diff)
parent6526f9c0ef7bccac4eef78364f74e82a996def26 (diff)
downloadopenshift-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
Diffstat (limited to 'roles/os_zabbix')
-rw-r--r--roles/os_zabbix/vars/template_docker.yml2
1 files changed, 2 insertions, 0 deletions
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'