diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-19 12:14:25 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-19 12:14:25 -0500 |
| commit | 8191a89475126971a3f2258748b3d1e40bdc028e (patch) | |
| tree | d4d7e3113f980c43fa95124fae660c16e8f85b6c | |
| parent | 634cd3eb319f55ec593a395be64a796c04c074d4 (diff) | |
| parent | 4a3d48da4ed98995f02a99ea59d38d5e84049b62 (diff) | |
| download | openshift-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
| -rw-r--r-- | roles/lib_zabbix/tasks/create_template.yml | 1 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_docker.yml | 2 | ||||
| -rw-r--r-- | roles/oso_monitoring_tools/tasks/main.yml | 1 |
3 files changed, 4 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' diff --git a/roles/oso_monitoring_tools/tasks/main.yml b/roles/oso_monitoring_tools/tasks/main.yml index b165f9a45..c90fc56e2 100644 --- a/roles/oso_monitoring_tools/tasks/main.yml +++ b/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 |