Add ServiceProviderNotify
Add ServiceProviderNotify property that can be used to indicate that
this event log should be notified to the service provider, if that is
implemented on the system.
ServiceProviderNotify is an enum.
Supported options are - "NotSupported", "Notify" and "Inhibit".
The dbus interface and all implementations have been moved to an enum
with the default value of NotSupported. When the value is NotSupported,
this property is left off Redfish.
For more details refer to
https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/47683
Tested: Manually tested on the system, Run Redfish validator. Found no
error.
'''
curl -k
https://$bmc/redfish/v1/Systems/system/LogServices/EventLog/Entries
{
"@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog/Entries",
"@odata.type": "#LogEntryCollection.LogEntryCollection",
"Description": "Collection of System Event Log Entries",
"Members": [
{
"@odata.id":
"/redfish/v1/Systems/system/LogServices/EventLog/Entries/1",
"@odata.type": "#LogEntry.v1_9_0.LogEntry",
"AdditionalDataURI":
"/redfish/v1/Systems/system/LogServices/EventLog/Entries/1/attachment",
"Created": "1970-01-01T00:04:20.865+00:00",
"EntryType": "Event",
"Id": "1",
"Message": "xyz.openbmc_project.Software.Image.Error.ImageFailure",
"Modified": "1970-01-01T00:04:20.865+00:00",
"Name": "System Event Log Entry",
"Resolved": false,
"Severity": "Critical"
},
....
....
],
"Members@odata.count": 49,
"Name": "System Event Log Entries"
}
'''
busctl set-property xyz.openbmc_project.Logging
/xyz/openbmc_project/logging/entry/99
xyz.openbmc_project.Logging.Entry ServiceProviderNotify s
xyz.openbmc_project.Logging.Entry.Notify.Notify
busctl get-property xyz.openbmc_project.Logging
/xyz/openbmc_project/logging/entry/99
xyz.openbmc_project.Logging.Entry ServiceProviderNotify
Entry ServiceProviderNotify
Signed-off-by: Abhishek Patel <Abhishek.Patel@ibm.com>
Change-Id: I774bfec157481ccc9b4966bf5e8cc8f7d9a06fd0
Signed-off-by: Lakshmi Yadlapati <lakshmiy@us.ibm.com>
diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 01aa745..307f2e2 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -140,6 +140,21 @@
return "";
}
+inline std::optional<bool> getProviderNotifyAction(const std::string& notify)
+{
+ std::optional<bool> notifyAction;
+ if (notify == "xyz.openbmc_project.Logging.Entry.Notify.Notify")
+ {
+ notifyAction = true;
+ }
+ else if (notify == "xyz.openbmc_project.Logging.Entry.Notify.Inhibit")
+ {
+ notifyAction = false;
+ }
+
+ return notifyAction;
+}
+
inline static int getJournalMetadata(sd_journal* journal,
const std::string_view& field,
std::string_view& contents)
@@ -1540,6 +1555,8 @@
const std::string* filePath = nullptr;
const std::string* resolution = nullptr;
bool resolved = false;
+ const std::string* notify = nullptr;
+
for (const auto& interfaceMap : objectPath.second)
{
if (interfaceMap.first ==
@@ -1587,6 +1604,17 @@
}
resolved = *resolveptr;
}
+ else if (propertyMap.first ==
+ "ServiceProviderNotify")
+ {
+ notify = std::get_if<std::string>(
+ &propertyMap.second);
+ if (notify == nullptr)
+ {
+ messages::internalError(asyncResp->res);
+ return;
+ }
+ }
}
if (id == nullptr || message == nullptr ||
severity == nullptr)
@@ -1631,6 +1659,12 @@
{
thisEntry["Resolution"] = *resolution;
}
+ std::optional<bool> notifyAction =
+ getProviderNotifyAction(*notify);
+ if (notifyAction)
+ {
+ thisEntry["ServiceProviderNotified"] = *notifyAction;
+ }
thisEntry["EntryType"] = "Event";
thisEntry["Severity"] =
translateSeverityDbusToRedfish(*severity);
@@ -1709,12 +1743,14 @@
const std::string* filePath = nullptr;
const std::string* resolution = nullptr;
bool resolved = false;
+ const std::string* notify = nullptr;
const bool success = sdbusplus::unpackPropertiesNoThrow(
dbus_utils::UnpackErrorPrinter(), resp, "Id", id, "Timestamp",
timestamp, "UpdateTimestamp", updateTimestamp, "Severity",
severity, "Message", message, "Resolved", resolved,
- "Resolution", resolution, "Path", filePath);
+ "Resolution", resolution, "Path", filePath,
+ "ServiceProviderNotify", notify);
if (!success)
{
@@ -1723,11 +1759,13 @@
}
if (id == nullptr || message == nullptr || severity == nullptr ||
- timestamp == nullptr || updateTimestamp == nullptr)
+ timestamp == nullptr || updateTimestamp == nullptr ||
+ notify == nullptr)
{
messages::internalError(asyncResp->res);
return;
}
+
asyncResp->res.jsonValue["@odata.type"] =
"#LogEntry.v1_9_0.LogEntry";
asyncResp->res.jsonValue["@odata.id"] =
@@ -1737,6 +1775,12 @@
asyncResp->res.jsonValue["Id"] = std::to_string(*id);
asyncResp->res.jsonValue["Message"] = *message;
asyncResp->res.jsonValue["Resolved"] = resolved;
+ std::optional<bool> notifyAction = getProviderNotifyAction(*notify);
+ if (notifyAction)
+ {
+ asyncResp->res.jsonValue["ServiceProviderNotified"] =
+ *notifyAction;
+ }
if ((resolution != nullptr) && (!(*resolution).empty()))
{
asyncResp->res.jsonValue["Resolution"] = *resolution;