diff options
author | eportnov <eportnov@ibs.ru> | 2022-09-08 14:39:01 +0300 |
---|---|---|
committer | eportnov <eportnov@ibs.ru> | 2022-09-08 14:39:01 +0300 |
commit | 496d54ef0db15fed5e696c5791aa925ac0ad2d1d (patch) | |
tree | 727fe8a053dd15954e265de7baacb38947937c0e /meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry | |
parent | e86746bc084fb4fd0460169e1ca12571112f5724 (diff) | |
download | openbmc-496d54ef0db15fed5e696c5791aa925ac0ad2d1d.tar.xz |
configure telemetry
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry')
-rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0004-configure-telemetry.patch | 121 | ||||
-rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend | 27 |
2 files changed, 148 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0004-configure-telemetry.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0004-configure-telemetry.patch new file mode 100644 index 0000000000..91b64d6e30 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry/0004-configure-telemetry.patch @@ -0,0 +1,121 @@ +From 00985aa2686a9277291b1fc744d78899a0e33807 Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Thu, 8 Sep 2022 14:26:35 +0300 +Subject: [PATCH] configure telemetry + +--- + meson_options.txt | 4 ++-- + src/metric.cpp | 2 +- + src/metric_value.hpp | 1 - + src/report.cpp | 6 +++--- + src/types/readings.hpp | 4 ++-- + src/utils/dbus_path_utils.hpp | 2 +- + 6 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index c8a46b8..0a50b7d 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,5 @@ + option('buildtest', type: 'boolean', value: true, description: 'Build tests') +-option('max-reports', type: 'integer', min: 0, value: 10, ++option('max-reports', type: 'integer', min: 0, value: 20, + description: 'Max number of Reports') + option('max-reading-parameters', type: 'integer', min: 0, value: 200, + description: 'Max number of metric properties in single report') +@@ -9,7 +9,7 @@ option('max-triggers', type: 'integer', min: 0, value: 10, + description: 'Max number of Triggers') + option('max-dbus-path-length', type: 'integer', min: 256, value: 4095, + description: 'Max length of dbus object path') +-option('max-append-limit', type: 'integer', min: 0, value: 256, ++option('max-append-limit', type: 'integer', min: 0, value: 2147483647, + description: 'Max AppendLimit value') + option('max-id-name-length', type: 'integer', min: 32, value: 256, + description: 'Max length of any "id" or "name" type field.') +diff --git a/src/metric.cpp b/src/metric.cpp +index d6b62d8..48fb7a7 100644 +--- a/src/metric.cpp ++++ b/src/metric.cpp +@@ -81,7 +81,7 @@ const std::vector<MetricValue>& Metric::getUpdatedReadings() + i = idx; + } + +- readings.emplace_back(id, sensors[i]->metadata(), *value, ++ readings.emplace_back(sensors[i]->metadata(), *value, + systemTimestamp); + } + } +diff --git a/src/metric_value.hpp b/src/metric_value.hpp +index d01ac4e..9dfc6ac 100644 +--- a/src/metric_value.hpp ++++ b/src/metric_value.hpp +@@ -5,7 +5,6 @@ + + struct MetricValue + { +- std::string id; + std::string metadata; + double value; + uint64_t timestamp; +diff --git a/src/report.cpp b/src/report.cpp +index 9ee60a4..624bdbc 100644 +--- a/src/report.cpp ++++ b/src/report.cpp +@@ -461,7 +461,7 @@ void Report::scheduleTimerForPeriodicReport(Milliseconds timerInterval) + + void Report::scheduleTimerForOnChangeReport() + { +- constexpr Milliseconds timerInterval{100}; ++ constexpr Milliseconds timerInterval{10000}; + + timer.expires_after(timerInterval); + timer.async_wait([this](boost::system::error_code ec) { +@@ -489,7 +489,7 @@ void Report::updateReadings() + break; + } + +- for (const auto& [id, metadata, value, timestamp] : ++ for (const auto& [metadata, value, timestamp] : + metric->getUpdatedReadings()) + { + if (reportUpdates == ReportUpdates::appendStopsWhenFull && +@@ -499,7 +499,7 @@ void Report::updateReadings() + reportIface->signal_property("Enabled"); + break; + } +- readingsBuffer.emplace(id, metadata, value, timestamp); ++ readingsBuffer.emplace(metadata, value, timestamp); + } + } + +diff --git a/src/types/readings.hpp b/src/types/readings.hpp +index 6749bbf..74566eb 100644 +--- a/src/types/readings.hpp ++++ b/src/types/readings.hpp +@@ -3,11 +3,11 @@ + #include "utils/labeled_tuple.hpp" + #include "utils/tstring.hpp" + +-using ReadingData = std::tuple<std::string, std::string, double, uint64_t>; ++using ReadingData = std::tuple<std::string, double, uint64_t>; + using Readings = std::tuple<uint64_t, std::vector<ReadingData>>; + + using LabeledReadingData = +- utils::LabeledTuple<ReadingData, utils::tstring::MetricId, ++ utils::LabeledTuple<ReadingData, + utils::tstring::MetricProperty, + utils::tstring::MetricValue, utils::tstring::Timestamp>; + +diff --git a/src/utils/dbus_path_utils.hpp b/src/utils/dbus_path_utils.hpp +index 3798d98..d0e1d24 100644 +--- a/src/utils/dbus_path_utils.hpp ++++ b/src/utils/dbus_path_utils.hpp +@@ -14,7 +14,7 @@ namespace constants + constexpr std::string_view triggerDirStr = + "/xyz/openbmc_project/Telemetry/Triggers/"; + constexpr std::string_view reportDirStr = +- "/xyz/openbmc_project/Telemetry/Reports/"; ++ "/xyz/openbmc_project/Telemetry/Reports/TelemetryService"; + + constexpr std::string_view allowedCharactersInPath = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_/"; diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend index 5119a9566b..e0169070a1 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/telemetry/telemetry_%.bbappend @@ -29,3 +29,30 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" # cp ${WORKDIR}/3017361610 ${D}/var/lib/telemetry/Reports # cp ${WORKDIR}/3017361611 ${D}/var/lib/telemetry/Reports #} +SRC_URI += "file://3017361602 \ + file://3017361603 \ + file://3017361604 \ + file://3017361605 \ + file://3017361606 \ + file://3017361607 \ + file://3017361608 \ + file://3017361609 \ + file://3017361610 \ + file://3017361611 \ + file://0004-configure-telemetry.patch \ + " + +do_install:append() { + install -d ${D}/var/lib/telemetry/Reports + + install -m 0744 ${WORKDIR}/3017361602 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361603 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361604 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361605 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361606 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361607 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361608 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361609 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361610 ${D}/var/lib/telemetry/Reports + install -m 0744 ${WORKDIR}/3017361611 ${D}/var/lib/telemetry/Reports +} |