dbus event subscription: add MessageId
Use dbus property 'Message' for the redfish Message Id.
The dbus property is not documented to be used for this purpose in the
interface definition [1] but the design [3] uses it. If there is no
valid MessageId, the event filtering code will drop the event anyways.
Tested: The code was already tested in this form in
[2] but found to perhaps not be compliant to the redfish specification
References:
[1] https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Logging/Entry.interface.yaml[2] 6c58a03e1f6818c3cd0a521466f69ef9e869bf25
[3] https://github.com/openbmc/docs/blob/d886ce89fe66c128b3ab492e530ad48fa0c1b4eb/designs/event-logging.md?plain=1#L448
Change-Id: I4dfe0194e02dc657403d3c0c7162528ec7a597c2
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/redfish-core/src/dbus_log_watcher.cpp b/redfish-core/src/dbus_log_watcher.cpp
index 2c30ff2..a371f87 100644
--- a/redfish-core/src/dbus_log_watcher.cpp
+++ b/redfish-core/src/dbus_log_watcher.cpp
@@ -38,6 +38,15 @@
event.id = std::to_string(entry.Id);
event.timestamp = redfish::time_utils::getDateTimeUintMs(entry.Timestamp);
+ // This dbus property is not documented to contain the Redfish Message Id,
+ // but can be used as such. As a temporary solution that is sufficient,
+ // the event filtering code will drop the event anyways if event.messageId
+ // is not valid.
+ //
+ // This will need resolved before
+ // experimental-redfish-dbus-log-subscription is stabilized
+ event.messageId = entry.Message;
+
// The order of 'AdditionalData' is not what's specified in an e.g.
// busctl call to create the Event Log Entry. So it cannot be used
// to map to the message args. Leaving this branch here for it to be