commit 5665db2ba19be6ec245bb32d88a1027de2f16953
author Cheng C Yang <cheng.c.yang@linux.intel.com> Fri Jul 12 00:57:30 2019 +0800
committer James Feist <james.feist@linux.intel.com> Fri Jul 12 16:15:43 2019 +0000
tree 623673fe5bb8064d9dcdf7bf7fb7e9d6e4a20341
parent b6c0b914438d89d689ea98b64f4243e8f0c6d3bc

Trigger Redfish Log in PSU Event

When PSU Event is asserted, trigger Redfish Log.

Tested:
Plug out AC cable on PSU2, we can see below in Redfish Log Entries.
{

    "@odata.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
data.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
    "@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog/
Entries/#1562158096",
    "@odata.type": "#LogEntry.v1_4_0.LogEntry",
    "Created": "2019-07-03T12:48:16+00:00",
    "EntryType": "Event",
    "Id": "1562158096",
    "Message": "Power supply PSU2 AC power lost.",
    "MessageArgs": [
        "PSU2"
    ],
    "MessageId": "OpenBMC.0.1.PowerSupplyACLost",
    "Name": "System Event Log Entry",
    "Severity": "Critical"
},

Signed-off-by: Cheng C Yang <cheng.c.yang@linux.intel.com>
Change-Id: I406dbf2047e82ccf523dcea91dce48600341aaee

include/PSUEvent.hpp

diff --git a/include/PSUEvent.hpp b/include/PSUEvent.hpp
index f7834e2..104b910 100644
--- a/include/PSUEvent.hpp
+++ b/include/PSUEvent.hpp
@@ -26,7 +26,7 @@
                 const std::string& eventName,
                 std::shared_ptr<std::set<std::string>> asserts,
                 std::shared_ptr<std::set<std::string>> combineEvent,
-                std::shared_ptr<bool> state);
+                std::shared_ptr<bool> state, const std::string& psuName);
     ~PSUSubEvent();
 
     std::shared_ptr<sdbusplus::asio::dbus_interface> eventInterface;
@@ -47,6 +47,9 @@
     boost::asio::posix::stream_descriptor inputDev;
     static constexpr unsigned int eventPollMs = 1000;
     static constexpr size_t warnAfterErrorCount = 10;
+    std::string psuName;
+    std::string fanName;
+    std::string messageID = "";
 };
 
 class PSUCombineEvent

src/PSUEvent.cpp

diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index 84b7097..fd929b3 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -14,6 +14,8 @@
 // limitations under the License.
 */
 
+#include <systemd/sd-journal.h>
+
 #include <PSUEvent.hpp>
 #include <iostream>
 #include <sdbusplus/asio/connection.hpp>
@@ -51,7 +53,7 @@
             std::shared_ptr<bool> state = std::make_shared<bool>(false);
             events[eventPSUName].emplace_back(std::make_unique<PSUSubEvent>(
                 eventInterface, path, io, eventName, assert, combineEvent,
-                state));
+                state, psuName));
             asserts.emplace_back(assert);
             states.emplace_back(state);
         }
@@ -64,18 +66,39 @@
     objServer.remove_interface(eventInterface);
 }
 
+static boost::container::flat_map<std::string, std::string> logID = {
+    {"PredictiveFailure", "OpenBMC.0.1.PowerSupplyFailurePredicted"},
+    {"Failure", "OpenBMC.0.1.PowerSupplyFailed"},
+    {"ACLost", "OpenBMC.0.1.PowerSupplyACLost"},
+    {"FanFault", "OpenBMC.0.1.PowerSupplyFanFailed"}};
+
 PSUSubEvent::PSUSubEvent(
     std::shared_ptr<sdbusplus::asio::dbus_interface> eventInterface,
     const std::string& path, boost::asio::io_service& io,
     const std::string& eventName,
     std::shared_ptr<std::set<std::string>> asserts,
     std::shared_ptr<std::set<std::string>> combineEvent,
-    std::shared_ptr<bool> state) :
+    std::shared_ptr<bool> state, const std::string& psuName) :
     eventInterface(eventInterface),
     inputDev(io, open(path.c_str(), O_RDONLY)), waitTimer(io), errCount(0),
     path(path), eventName(eventName), assertState(state), asserts(asserts),
-    combineEvent(combineEvent)
+    combineEvent(combineEvent), psuName(psuName)
 {
+    auto found = logID.find(eventName);
+    if (found == logID.end())
+    {
+        messageID.clear();
+    }
+    else
+    {
+        messageID = found->second;
+    }
+
+    auto fanPos = path.find("fan");
+    if (fanPos != std::string::npos)
+    {
+        fanName = path.substr(fanPos);
+    }
     setupRead();
 }
 
@@ -189,6 +212,26 @@
         if (*assertState == false)
         {
             *assertState = true;
+            if (!messageID.empty())
+            {
+                // Fan Failed has two args
+                std::string sendMessage = eventName + " assert";
+                if (messageID == "OpenBMC.0.1.PowerSupplyFanFailed")
+                {
+                    sd_journal_send("MESSAGE=%s", sendMessage.c_str(),
+                                    "PRIORITY=%i", LOG_ERR,
+                                    "REDFISH_MESSAGE_ID=%s", messageID.c_str(),
+                                    "REDFISH_MESSAGE_ARGS=%s,%s",
+                                    psuName.c_str(), fanName.c_str(), NULL);
+                }
+                else
+                {
+                    sd_journal_send(
+                        "MESSAGE=%s", sendMessage.c_str(), "PRIORITY=%i",
+                        LOG_ERR, "REDFISH_MESSAGE_ID=%s", messageID.c_str(),
+                        "REDFISH_MESSAGE_ARGS=%s", psuName.c_str(), NULL);
+                }
+            }
             if ((*combineEvent).empty())
             {
                 eventInterface->set_property("functional", false);