andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-30 18:49:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

rollback changes to get_metrics_prometheus()

Browse Source
This commit is contained in:
proddy
2025-12-24 17:56:07 +01:00
parent 8a7511a941
commit 3bdc97d4d5
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/system.cpp
View File

@@ -1820,8 +1820,8 @@ std::string System::get_metrics_prometheus() {
bool has_nested_objects = false; bool has_nested_objects = false;
for (JsonPair p : obj) { for (JsonPair p : obj) {
std::string key = p.key().c_str(); std::string key = p.key().c_str();
// std::string path = prefix.empty() ? key : prefix + "." + key; std::string path = prefix.empty() ? key : prefix + "." + key;
std::string metric_name = prefix.empty() ? key : prefix + "_" + key; std::string metric_name = prefix.empty() ? key : prefix + "_" + key;
if (should_ignore(prefix, key)) { if (should_ignore(prefix, key)) {
@@ -1954,23 +1954,25 @@ std::string System::get_metrics_prometheus() {
if (!local_info_labels.empty() && !prefix.empty() && !has_nested_objects) { if (!local_info_labels.empty() && !prefix.empty() && !has_nested_objects) {
std::string info_metric = "emsesp_" + sanitize_name(prefix) + "_info"; std::string info_metric = "emsesp_" + sanitize_name(prefix) + "_info";
if (seen_metrics.find(info_metric) == seen_metrics.end()) { if (seen_metrics.find(info_metric) == seen_metrics.end()) {
result += "# HELP " + info_metric + " info\n# TYPE " + info_metric + " gauge\n"; result += "# HELP " + info_metric + " info\n";
result += "# TYPE " + info_metric + " gauge\n";
seen_metrics[info_metric] = true; seen_metrics[info_metric] = true;
} }
result += info_metric; result += info_metric;
result += '{'; if (!local_info_labels.empty()) {
for (size_t i = 0; i < local_info_labels.size(); ++i) { result += "{";
if (i > 0) { bool first = true;
result += ", "; for (const auto & label : local_info_labels) {
if (!first) {
result += ", ";
}
result += label.first + "=\"" + escape_label(label.second) + "\"";
first = false;
} }
const auto & label = local_info_labels[i]; result += "}";
result += label.first;
result += "=\"";
result += escape_label(label.second);
result += '"';
} }
result += "} 1\n"; result += " 1\n";
} }
}; };