meta-ibm: simplify phosphor-health-monitor config
The latest phosphor-health-monitor code has a default config and merges
it with the provided config. Therefore you do not need to express
configs that do not need changes.
The only change the IBM systems have is that they monitor `/var` instead
of `/run/initramfs/rw`, due to the flash layout differences. Provide
the minimal config for that.
Tested:
Modify phosphor-health-monitor to point at this config file and ran it
on my desktop. Observed the expected dbus sensor tree.
```
$ busctl --user tree xyz.openbmc_project.HealthMon
└─ /xyz
└─ /xyz/openbmc_project
└─ /xyz/openbmc_project/metric
└─ /xyz/openbmc_project/metric/bmc
├─ /xyz/openbmc_project/metric/bmc/cpu
│ ├─ /xyz/openbmc_project/metric/bmc/cpu/kernel
│ ├─ /xyz/openbmc_project/metric/bmc/cpu/total
│ └─ /xyz/openbmc_project/metric/bmc/cpu/user
├─ /xyz/openbmc_project/metric/bmc/memory
│ ├─ /xyz/openbmc_project/metric/bmc/memory/available
│ ├─ /xyz/openbmc_project/metric/bmc/memory/buffered_and_cached
│ ├─ /xyz/openbmc_project/metric/bmc/memory/free
│ ├─ /xyz/openbmc_project/metric/bmc/memory/shared
│ └─ /xyz/openbmc_project/metric/bmc/memory/total
└─ /xyz/openbmc_project/metric/bmc/storage
├─ /xyz/openbmc_project/metric/bmc/storage/rw
└─ /xyz/openbmc_project/metric/bmc/storage/tmp
```
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0ff8528fbb8d9cbf2ad4c6672d5a1dc11cf5a970
diff --git a/meta-ibm/recipes-phosphor/health/files/bmc_health_config.json b/meta-ibm/recipes-phosphor/health/files/bmc_health_config.json
index bb6e6e3..49bdbe1 100644
--- a/meta-ibm/recipes-phosphor/health/files/bmc_health_config.json
+++ b/meta-ibm/recipes-phosphor/health/files/bmc_health_config.json
@@ -1,63 +1,14 @@
{
- "CPU" : {
- "Frequency" : 1,
- "Window_size": 120,
- "Threshold":
- {
- "Critical_Upper":
- {
- "Value": 90.0,
- "Log": true,
- "Target": ""
- },
- "Warning_Upper":
- {
- "Value": 80.0,
- "Log": false,
- "Target": ""
+ "Storage_RW": {
+ "Path": "/var",
+ "Frequency": 1,
+ "Window_size": 120,
+ "Threshold": {
+ "Critical_Lower": {
+ "Value": 15.0,
+ "Log": true,
+ "Target": ""
+ }
}
}
- },
- "Memory" : {
- "Frequency" : 1,
- "Window_size": 120,
- "Threshold":
- {
- "Critical_Upper":
- {
- "Value": 85.0,
- "Log": true,
- "Target": ""
- }
- }
- },
- "Storage_VAR" : {
- "Path" : "/var",
- "Frequency" : 1,
- "Window_size": 120,
- "Threshold":
- {
- "Critical_Lower":
- {
- "Value": 15.0,
- "Log": true,
- "Target": ""
- }
- }
- },
- "Storage_TMP" : {
- "Path" : "/tmp",
- "Frequency" : 1,
- "Window_size":120,
- "Threshold":
- {
- "Critical_Lower":
- {
- "Value": 15.0,
- "Log": true,
- "Target": ""
- }
- }
- }
}
-