diff options
| author | eportnov <eportnov@ibs.ru> | 2022-08-25 17:37:46 +0300 |
|---|---|---|
| committer | eportnov <eportnov@ibs.ru> | 2022-08-25 17:38:42 +0300 |
| commit | 941c9a8be483f1600eff286eaa80df238ede4a3e (patch) | |
| tree | 70127c17ce8de460e0321149a9e575678e98ab5a /meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces | |
| parent | d9013c2c76e99c76103482746e66f9a04a02681f (diff) | |
| download | openbmc-941c9a8be483f1600eff286eaa80df238ede4a3e.tar.xz | |
fix telemetry missing data
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces')
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0009-fix-circular-buffer-telemetry.patch | 44 | ||||
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0009-fix-circular-buffer-telemetry.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0009-fix-circular-buffer-telemetry.patch new file mode 100644 index 0000000000..6031ad5134 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0009-fix-circular-buffer-telemetry.patch @@ -0,0 +1,44 @@ +From aac6e651d370269ef259d9bd29de73a83e5c5a52 Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Thu, 25 Aug 2022 17:25:01 +0300 +Subject: [PATCH] fix circular buffer telemetry + +--- + include/dbus_utility.hpp | 3 ++- + redfish-core/lib/metric_report.hpp | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp +index 647e9561..80c29d88 100644 +--- a/include/dbus_utility.hpp ++++ b/include/dbus_utility.hpp +@@ -26,7 +26,7 @@ + #include <tuple> + #include <variant> + #include <vector> +- ++#include <list> + namespace dbus + { + +@@ -55,6 +55,7 @@ using DbusVariantType = std::variant< + std::tuple<uint64_t, std::vector<std::tuple<std::string, std::string, double, uint64_t>>>, + std::tuple<uint32_t, std::vector<std::tuple<std::string, std::string, double, uint32_t>>>, + std::tuple<uint32_t, std::vector<std::tuple<std::string, double, uint32_t>>>, ++ std::tuple<uint32_t, std::list<std::tuple<std::string, double, uint32_t>>>, + std::vector<std::tuple<std::string, std::string>>, + std::vector<std::tuple<uint32_t, std::vector<uint32_t>>>, + std::vector<std::tuple<uint32_t, size_t>>, +diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp +index afd8e602..22fa0ae0 100644 +--- a/redfish-core/lib/metric_report.hpp ++++ b/redfish-core/lib/metric_report.hpp +@@ -33,7 +33,7 @@ constexpr const char* metricReportUri = + "/redfish/v1/TelemetryService/MetricReports"; + + using Readings = +- std::vector<std::tuple<std::string, double, uint32_t>>; ++ std::list<std::tuple<std::string, double, uint32_t>>; + using TimestampReadings = std::tuple<uint32_t, Readings>; + + inline nlohmann::json toMetricValues(const Readings& readings) diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend index 296a4c070b..1671177ac5 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -9,6 +9,7 @@ SRC_URI += "\ file://0006-fix-bug-empty-pcie-functions.patch \ file://0007-Removed-non-working-boot-override-modes.patch \ file://0008-Add-pcie-device-names.patch \ + file://0009-fix-circular-buffer-telemetry.patch \ " EXTRA_OEMESON += "\ |