From 402dfb01f6c12510c39597d40bc282e34ca0a660 Mon Sep 17 00:00:00 2001
From: Matt Spinler <spinler@us.ibm.com>
Date: Thu, 6 May 2021 11:12:06 -0500
Subject: ibm: fans: Switch to the 'count' fault method

Switch over to the 'count' method of determining fan faults.  As a
starting point, use a count interval of 1 and a threshold of 30.  This
is the preferred method as it is better at catching flakey fans.

See docs/monitor/method.md in the phosphor-fan-presence repo for more
info on how this works.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I153d05779a5a7af854f351c1be3a3448b85fc461
---
 .../p10bmc/rainier-1s4u/config.json                  | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json')

diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
index 737cb3f3b..eb519d9b4 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
@@ -2,8 +2,8 @@
    "fans": [
       {
          "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -12,14 +12,15 @@
          "sensors": [
             {
                "name": "fan0_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -28,14 +29,15 @@
          "sensors": [
             {
                "name": "fan1_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -44,14 +46,15 @@
          "sensors": [
             {
                "name": "fan2_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan4",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -60,6 +63,7 @@
          "sensors": [
             {
                "name": "fan4_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
-- 
cgit v1.2.3