Add sensor health support
Read through the thresolds and determine if any are
crossed. If so, change the status of the sensor.
Tested: Used sensor override to modify a sensor value,
asserting the threshold.
Change-Id: Id56e036449ca019a5e9563df68af0f590c693045
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
index 8309610..2a8c870 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
@@ -404,6 +404,86 @@
}
/**
+ * @brief Retrieves the health from a sensor .
+ * @param interfacesDict Map of all sensor interfaces
+ */
+
+static std::string getHealth(
+ const boost::container::flat_map<
+ std::string, boost::container::flat_map<std::string, SensorVariant>>&
+ interfacesDict)
+{
+ auto criticalThresholdIt =
+ interfacesDict.find("xyz.openbmc_project.Sensor.Threshold.Critical");
+ if (criticalThresholdIt != interfacesDict.end())
+ {
+ auto thresholdHighIt =
+ criticalThresholdIt->second.find("CriticalAlarmHigh");
+ auto thresholdLowIt =
+ criticalThresholdIt->second.find("CriticalAlarmLow");
+ if (thresholdHighIt != criticalThresholdIt->second.end())
+ {
+ const bool* asserted = std::get_if<bool>(&thresholdHighIt->second);
+ if (asserted == nullptr)
+ {
+ BMCWEB_LOG_ERROR << "Illegal sensor threshold";
+ }
+ else if (*asserted)
+ {
+ return "Critical";
+ }
+ }
+ if (thresholdLowIt != criticalThresholdIt->second.end())
+ {
+ const bool* asserted = std::get_if<bool>(&thresholdLowIt->second);
+ if (asserted == nullptr)
+ {
+ BMCWEB_LOG_ERROR << "Illegal sensor threshold";
+ }
+ else if (*asserted)
+ {
+ return "Critical";
+ }
+ }
+ }
+
+ auto warningThresholdIt =
+ interfacesDict.find("xyz.openbmc_project.Sensor.Threshold.Warning");
+ if (warningThresholdIt != interfacesDict.end())
+ {
+ auto thresholdHighIt =
+ warningThresholdIt->second.find("WarningAlarmHigh");
+ auto thresholdLowIt =
+ warningThresholdIt->second.find("WarningAlarmLow");
+ if (thresholdHighIt != warningThresholdIt->second.end())
+ {
+ const bool* asserted = std::get_if<bool>(&thresholdHighIt->second);
+ if (asserted == nullptr)
+ {
+ BMCWEB_LOG_ERROR << "Illegal sensor threshold";
+ }
+ else if (*asserted)
+ {
+ return "Warning";
+ }
+ }
+ if (thresholdLowIt != warningThresholdIt->second.end())
+ {
+ const bool* asserted = std::get_if<bool>(&thresholdLowIt->second);
+ if (asserted == nullptr)
+ {
+ BMCWEB_LOG_ERROR << "Illegal sensor threshold";
+ }
+ else if (*asserted)
+ {
+ return "Warning";
+ }
+ }
+ }
+ return "OK";
+}
+
+/**
* @brief Builds a json sensor representation of a sensor.
* @param sensorName The name of the sensor to be built
* @param sensorType The type (temperature, fan_tach, etc) of the sensor to
@@ -445,7 +525,7 @@
sensor_json["Name"] = boost::replace_all_copy(sensorName, "_", " ");
sensor_json["Status"]["State"] = "Enabled";
- sensor_json["Status"]["Health"] = "OK";
+ sensor_json["Status"]["Health"] = getHealth(interfacesDict);
// Parameter to set to override the type we get from dbus, and force it to
// int, regardless of what is available. This is used for schemas like fan,