diff --git a/inventory/host_vars/sundries01.rdu3.fedoraproject.org b/inventory/host_vars/sundries01.rdu3.fedoraproject.org index 053f78e19c..27bcfde2f3 100644 --- a/inventory/host_vars/sundries01.rdu3.fedoraproject.org +++ b/inventory/host_vars/sundries01.rdu3.fedoraproject.org @@ -16,7 +16,8 @@ virt_install_command: "{{ virt_install_command_one_nic }}" vmhost: vmhost-x86-03.rdu3.fedoraproject.org volgroup: /dev/vg_guests zabbix_macros: + CPU.UTIL.TIME: 45m # 90% of the 250000 factor between the 10Mb/s Zabbix thinks # it has, and the 25Gb/s the vmhost actually has 'IF.UTIL.MAX:"tun0"': 225000 - LOAD_AVG_PER_CPU.MAX.TIME: 30m + LOAD_AVG_PER_CPU.MAX.TIME: 45m diff --git a/roles/zabbix/zabbix_server/files/templates/linux-by-zabbix-agent-active.yml b/roles/zabbix/zabbix_server/files/templates/linux-by-zabbix-agent-active.yml index 15fd1fb510..b04fe74049 100644 --- a/roles/zabbix/zabbix_server/files/templates/linux-by-zabbix-agent-active.yml +++ b/roles/zabbix/zabbix_server/files/templates/linux-by-zabbix-agent-active.yml @@ -235,9 +235,9 @@ zabbix_export: value: cpu triggers: - uuid: e299778a6fcc4805bd5806f3b2ffe1c2 - expression: 'min(/Linux by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}' + expression: 'min(/Linux by Zabbix agent active/system.cpu.util,{$CPU.UTIL.TIME})>{$CPU.UTIL.CRIT}' name: 'Linux: High CPU utilization' - event_name: 'Linux: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)' + event_name: 'Linux: High CPU utilization (over {$CPU.UTIL.CRIT}% for {$CPU.UTIL.TIME})' opdata: 'Current utilization: {ITEM.LASTVALUE1}' priority: WARNING description: 'CPU utilization is too high. The system might be slow to respond.' @@ -1588,6 +1588,9 @@ zabbix_export: - macro: '{$CPU.UTIL.CRIT}' value: '90' description: 'Critical threshold of CPU utilization expressed in %.' + - macro: '{$CPU.UTIL.TIME}' + value: 5m + description: 'Time before warning of critical threshold of CPU utilization' - macro: '{$IF.ERRORS.WARN}' value: '2' description: 'Warning threshold of error packet rate. Can be used with interface name as context.'