diff options
author | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
---|---|---|
committer | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
commit | a706860af853be6d8bc77ea38593467e827ed527 (patch) | |
tree | aaaa4997ba9da249ef09f2f509b4b1a25500993c /roles/os_zabbix/vars | |
parent | 5758fdc75659bdd9a02cc56efb7255d677233ad2 (diff) | |
parent | 63b19e964fcc09e60562fd253d725edcc2ec4aef (diff) | |
download | openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.gz openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.bz2 openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.xz openshift-a706860af853be6d8bc77ea38593467e827ed527.zip |
Merge pull request #790 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/os_zabbix/vars')
-rw-r--r-- | roles/os_zabbix/vars/template_os_linux.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index 3ae1500bc..aeeec4b8d 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -246,15 +246,15 @@ g_template_os_linux: # CPU Utilization # - name: 'CPU idle less than 5% on {HOST.NAME}' - expression: '{Template OS Linux:kernel.all.cpu.idle.last()}<5 and {Template OS Linux:kernel.all.cpu.idle.last(#2)}<5' + expression: '{Template OS Linux:kernel.all.cpu.idle.max(#5)}<5' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_cpu_idle.asciidoc' priority: average description: 'CPU is less than 5% idle' - name: 'CPU idle less than 10% on {HOST.NAME}' - expression: '{Template OS Linux:kernel.all.cpu.idle.last()}<10 and {Template OS Linux:kernel.all.cpu.idle.last(#2)}<10' + expression: '{Template OS Linux:kernel.all.cpu.idle.max(#5)}<10' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_cpu_idle.asciidoc' - priority: warn + priority: average description: 'CPU is less than 10% idle' dependencies: - 'CPU idle less than 5% on {HOST.NAME}' |