meta-facebook: update health metric config

Based on the updated config schema for health metric, change the config for Meta platforms. The storage metric exposes storage free rather than storage used, hence update the thresholds for lower bound accordingly. Related diff from phosphor-health-monitor - https://gerrit.openbmc.org/c/openbmc/phosphor-health-monitor/+/69592 Change-Id: I6703f47ed5baecfaf457e9f4069a5b4b778a55dd Signed-off-by: Jagpal Singh Gill <[email protected]>
ibm-openbmc · Feb 23, 2024 · b75ace6 · b75ace6
1 parent 1d053ae
commit b75ace6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/files/bmc_health_config.json b/meta-facebook/meta-yosemite4/recipes-phosphor/health/files/bmc_health_config.json
@@ -4,13 +4,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Upper":
         {
             "Value": "CPU_CRIT_VAL",
             "Log": true,
             "Target": ""
         },
-        "Warning":
+        "Warning_Upper":
         {
             "Value": "CPU_WARN_VAL",
             "Log": true,
@@ -23,13 +23,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Upper":
         {
             "Value": "MEM_CRIT_VAL",
             "Log": true,
             "Target": "MEM_CRIT_TGT"
         },
-        "Warning":
+        "Warning_Upper":
         {
             "Value": "MEM_WARN_VAL",
             "Log": true,
@@ -43,13 +43,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Lower":
         {
             "Value": "STORAGE_CRIT_VAL",
             "Log": true,
             "Target": "STORAGE_CRIT_TGT"
         },
-        "Warning":
+        "Warning_Lower":
         {
             "Value": "STORAGE_WARN_VAL",
             "Log": true,

diff --git a/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json b/meta-facebook/recipes-phosphor/health/files/bmc_health_config.json
@@ -4,13 +4,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Upper":
         {
             "Value": "CPU_CRIT_VAL",
             "Log": true,
             "Target": "CPU_CRIT_TGT"
         },
-        "Warning":
+        "Warning_Upper":
         {
             "Value": "CPU_WARN_VAL",
             "Log": true,
@@ -23,13 +23,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Upper":
         {
             "Value": "MEM_CRIT_VAL",
             "Log": true,
             "Target": "MEM_CRIT_TGT"
         },
-        "Warning":
+        "Warning_Upper":
         {
             "Value": "MEM_WARN_VAL",
             "Log": true,
@@ -43,13 +43,13 @@
     "Window_size": 120,
     "Threshold":
     {
-        "Critical":
+        "Critical_Lower":
         {
             "Value": "STORAGE_CRIT_VAL",
             "Log": true,
             "Target": "STORAGE_CRIT_TGT"
         },
-        "Warning":
+        "Warning_Lower":
         {
             "Value": "STORAGE_WARN_VAL",
             "Log": true,

diff --git a/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -12,9 +12,9 @@ MEM_CRIT_TGT ?= "reboot.target"
 MEM_WARN_VAL ?= "70.0"
 MEM_WARN_TGT ?= ""
 
-STORAGE_CRIT_VAL ?= "95.0"
+STORAGE_CRIT_VAL ?= "5.0"
 STORAGE_CRIT_TGT ?= ""
-STORAGE_WARN_VAL ?= "90.0"
+STORAGE_WARN_VAL ?= "10.0"
 STORAGE_WARN_TGT ?= ""
 
 do_install:prepend() {
@@ -32,4 +32,4 @@ do_install:prepend() {
     sed -i "s/STORAGE_CRIT_TGT/${STORAGE_CRIT_TGT}/g" ${WORKDIR}/bmc_health_config.json
     sed -i "s/\"STORAGE_WARN_VAL\"/${STORAGE_WARN_VAL}/g" ${WORKDIR}/bmc_health_config.json
     sed -i "s/STORAGE_WARN_TGT/${STORAGE_WARN_TGT}/g" ${WORKDIR}/bmc_health_config.json
-}
+}