summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2016-01-19 12:14:25 -0500
committerMatt Woodson <mwoodson@gmail.com>2016-01-19 12:14:25 -0500
commit8191a89475126971a3f2258748b3d1e40bdc028e (patch)
treed4d7e3113f980c43fa95124fae660c16e8f85b6c /roles/os_zabbix
parent634cd3eb319f55ec593a395be64a796c04c074d4 (diff)
parent4a3d48da4ed98995f02a99ea59d38d5e84049b62 (diff)
downloadopenshift-8191a89475126971a3f2258748b3d1e40bdc028e.tar.gz
openshift-8191a89475126971a3f2258748b3d1e40bdc028e.tar.bz2
openshift-8191a89475126971a3f2258748b3d1e40bdc028e.tar.xz
openshift-8191a89475126971a3f2258748b3d1e40bdc028e.zip
Merge pull request #1227 from openshift/master
Merge master into prod
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'