From bb8713bbc1c4594366fc735c04910edbf4c61aab Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 31 Mar 2021 14:59:21 +0200 Subject: Merging upstream version 1.30.0. Signed-off-by: Daniel Baumann --- health/health.d/cgroups.conf | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'health/health.d/cgroups.conf') diff --git a/health/health.d/cgroups.conf b/health/health.d/cgroups.conf index 79ece53f9..c0a16f154 100644 --- a/health/health.d/cgroups.conf +++ b/health/health.d/cgroups.conf @@ -11,7 +11,7 @@ template: cgroup_10min_cpu_usage warn: $this > (($status >= $WARNING) ? (75) : (85)) crit: $this > (($status == $CRITICAL) ? (85) : (95)) delay: down 15m multiplier 1.5 max 1h - info: cpu utilization for the last 10 minutes + info: average cgroup CPU utilization over the last 10 minutes to: sysadmin template: cgroup_ram_in_use @@ -24,18 +24,5 @@ template: cgroup_ram_in_use warn: $this > (($status >= $WARNING) ? (80) : (90)) crit: $this > (($status == $CRITICAL) ? (90) : (98)) delay: down 15m multiplier 1.5 max 1h - info: RAM used by cgroup - to: sysadmin - -template: cgroup_ram_and_swap_in_use - on: cgroup.mem_usage - os: linux - hosts: * - calc: ($ram + $swap) * 100 / $memory_and_swap_limit - units: % - every: 10s - warn: $this > (($status >= $WARNING) ? (80) : (90)) - crit: $this > (($status == $CRITICAL) ? (90) : (98)) - delay: down 15m multiplier 1.5 max 1h - info: RAM and Swap used by cgroup + info: cgroup memory utilization to: sysadmin -- cgit v1.2.3