summaryrefslogtreecommitdiff
path: root/meta-ibm
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ibm')
-rw-r--r--meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json24
-rw-r--r--meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json20
-rw-r--r--meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json36
-rw-r--r--meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json30
4 files changed, 70 insertions, 40 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
index 74bcfc425e..632c76b524 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/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,18 +12,20 @@
"sensors": [
{
"name": "fan0_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan0_1",
+ "threshold": 30,
"has_target": false
}
]
},
{
"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,
@@ -32,18 +34,20 @@
"sensors": [
{
"name": "fan1_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan1_1",
+ "threshold": 30,
"has_target": false
}
]
},
{
"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,
@@ -52,18 +56,20 @@
"sensors": [
{
"name": "fan2_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan2_1",
+ "threshold": 30,
"has_target": false
}
]
},
{
"inventory": "/system/chassis/motherboard/fan3",
- "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,
@@ -72,10 +78,12 @@
"sensors": [
{
"name": "fan3_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan3_1",
+ "threshold": 30,
"has_target": false
}
]
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 737cb3f3b8..eb519d9b40 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
}
]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
index 145e37f383..89b7744808 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/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,10 +12,12 @@
"sensors": [
{
"name": "fan0_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan0_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
@@ -24,8 +26,8 @@
},
{
"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,
@@ -34,10 +36,12 @@
"sensors": [
{
"name": "fan1_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan1_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
@@ -46,8 +50,8 @@
},
{
"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,
@@ -56,10 +60,12 @@
"sensors": [
{
"name": "fan2_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan2_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
@@ -68,8 +74,8 @@
},
{
"inventory": "/system/chassis/motherboard/fan3",
- "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,
@@ -78,10 +84,12 @@
"sensors": [
{
"name": "fan3_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan3_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
@@ -90,8 +98,8 @@
},
{
"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,
@@ -100,10 +108,12 @@
"sensors": [
{
"name": "fan4_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan4_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
@@ -112,8 +122,8 @@
},
{
"inventory": "/system/chassis/motherboard/fan5",
- "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,
@@ -122,10 +132,12 @@
"sensors": [
{
"name": "fan5_0",
+ "threshold": 30,
"has_target": true
},
{
"name": "fan5_1",
+ "threshold": 30,
"has_target": false,
"factor": 1.45,
"offset": -909
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
index 71a4899442..1bfb5378b8 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/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/fan3",
- "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,14 +63,15 @@
"sensors": [
{
"name": "fan3_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,
@@ -76,14 +80,15 @@
"sensors": [
{
"name": "fan4_0",
+ "threshold": 30,
"has_target": true
}
]
},
{
"inventory": "/system/chassis/motherboard/fan5",
- "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,
@@ -92,6 +97,7 @@
"sensors": [
{
"name": "fan5_0",
+ "threshold": 30,
"has_target": true
}
]