commit f2552a50fde35d665b5fc3ac6852f2f6bb229cae
author Jason M. Bills <jason.m.bills@linux.intel.com> Thu Mar 28 11:54:48 2019 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Apr 09 23:59:52 2019 +0000
tree 1960b1d944ae1312045b3acd8c19f48f3fd830d0
parent afbaa098237acec7946dd247e88284cef511fcda

Use the Resource Event Message Registry for threshold events

The Redfish standard Resource Event Message Registry has messages
defined for threshold events, so use those instead of our custom
messages.

Tested:
Verified that threshold events are logged with the proper MessageId
and MessageArgs for the ResourceEvent threshold messages.

Change-Id: I8e0f16d50a7df2738174ea7322ec8a0b22ab42d5
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

include/threshold_event_monitor.hpp

diff --git a/include/threshold_event_monitor.hpp b/include/threshold_event_monitor.hpp
index b2473ef..b29717d 100644
--- a/include/threshold_event_monitor.hpp
+++ b/include/threshold_event_monitor.hpp
@@ -31,7 +31,7 @@
 static constexpr const uint8_t thresholdEventDataTriggerReadingByte2 = (1 << 6);
 static constexpr const uint8_t thresholdEventDataTriggerReadingByte3 = (1 << 4);
 
-static const std::string openBMCMessageRegistryVersion("0.1");
+static const std::string resourceEventMessageRegistryVersion("1.0");
 
 inline static sdbusplus::bus::match::match startThresholdEventMonitor(
     std::shared_ptr<sdbusplus::asio::connection> conn)
@@ -201,21 +201,20 @@
 
         std::string threshold;
         std::string direction;
-        std::string redfishMessageID;
+        std::string redfishMessageID =
+            "ResourceEvent." + resourceEventMessageRegistryVersion;
         if (event == "CriticalLow")
         {
             threshold = "critical low";
             if (assert)
             {
                 direction = "low";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdCriticalLowGoingLow";
+                redfishMessageID += ".ResourceErrorThresholdExceeded";
             }
             else
             {
                 direction = "high";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdCriticalLowGoingHigh";
+                redfishMessageID += ".ResourceErrorThresholdCleared";
             }
         }
         else if (event == "WarningLow")
@@ -224,14 +223,12 @@
             if (assert)
             {
                 direction = "low";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdWarningLowGoingLow";
+                redfishMessageID += ".ResourceWarningThresholdExceeded";
             }
             else
             {
                 direction = "high";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdWarningLowGoingHigh";
+                redfishMessageID += ".ResourceWarningThresholdCleared";
             }
         }
         else if (event == "WarningHigh")
@@ -240,14 +237,12 @@
             if (assert)
             {
                 direction = "high";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdWarningHighGoingHigh";
+                redfishMessageID += ".ResourceWarningThresholdExceeded";
             }
             else
             {
                 direction = "low";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdWarningHighGoingLow";
+                redfishMessageID += ".ResourceWarningThresholdCleared";
             }
         }
         else if (event == "CriticalHigh")
@@ -256,14 +251,12 @@
             if (assert)
             {
                 direction = "high";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdCriticalHighGoingHigh";
+                redfishMessageID += ".ResourceErrorThresholdExceeded";
             }
             else
             {
                 direction = "low";
-                redfishMessageID = "OpenBMC." + openBMCMessageRegistryVersion +
-                                   ".SensorThresholdCriticalHighGoingLow";
+                redfishMessageID += ".ResourceErrorThresholdCleared";
             }
         }
 
@@ -278,7 +271,7 @@
                            redfishMessageID.length(), redfishMessageID.data(),
                            "REDFISH_MESSAGE_ARG_1=%.*s", sensorName.length(),
                            sensorName.data(), "REDFISH_MESSAGE_ARG_2=%f",
-                           sensorVal, "REDFISH_MESSAGE_ARG_3=%f", thresholdVal);
+                           thresholdVal);
     };
     sdbusplus::bus::match::match thresholdEventMatcher(
         static_cast<sdbusplus::bus::bus &>(*conn),