Merge pull request #1227 from openshift/master

Merge master into prod

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
 

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'

roles/oso_monitoring_tools/tasks/main.yml

@@ -7,6 +7,7 @@
   with_items:
     - openshift-tools-scripts-monitoring-zagg-client
     - python-openshift-tools-monitoring-zagg
+    - python-openshift-tools-monitoring-zabbix
 
 - debug: var=g_zagg_client_config