From 00b35cfd81a0d7a76a88a566e6154dc49bc6af71 Mon Sep 17 00:00:00 2001 From: Leonardo Di Giovanna Date: Fri, 20 Sep 2024 16:51:16 +0200 Subject: [PATCH] fix(falco_metrics)!: use full name for configs and rules files Signed-off-by: Leonardo Di Giovanna --- userspace/falco/falco_metrics.cpp | 4 ++-- userspace/falco/stats_writer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/userspace/falco/falco_metrics.cpp b/userspace/falco/falco_metrics.cpp index 4b02be21..7ff70364 100644 --- a/userspace/falco/falco_metrics.cpp +++ b/userspace/falco/falco_metrics.cpp @@ -102,13 +102,13 @@ std::string falco_metrics::to_text(const falco::app::state& state) for (const auto& item : state.config.get()->m_loaded_rules_filenames_sha256sum) { fs::path fs_path = item.first; - prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus("sha256_rules_files", "falcosecurity", "falco", {{"file_name", fs_path.filename().stem()}, {"sha256", item.second}}); + prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus("sha256_rules_files", "falcosecurity", "falco", {{"file_name", fs_path.filename()}, {"sha256", item.second}}); } for (const auto& item : state.config.get()->m_loaded_configs_filenames_sha256sum) { fs::path fs_path = item.first; - prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus("sha256_config_files", "falcosecurity", "falco", {{"file_name", fs_path.filename().stem()}, {"sha256", item.second}}); + prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus("sha256_config_files", "falcosecurity", "falco", {{"file_name", fs_path.filename()}, {"sha256", item.second}}); } static std::string ifinfo_json_escaped; diff --git a/userspace/falco/stats_writer.cpp b/userspace/falco/stats_writer.cpp index 7e2a6303..851f46ea 100644 --- a/userspace/falco/stats_writer.cpp +++ b/userspace/falco/stats_writer.cpp @@ -345,7 +345,7 @@ void stats_writer::collector::get_metrics_output_fields_wrapper( for (const auto& item : m_writer->m_config->m_loaded_rules_filenames_sha256sum) { fs::path fs_path = item.first; - std::string metric_name_file_sha256 = fs_path.filename().stem(); + std::string metric_name_file_sha256 = fs_path.filename(); metric_name_file_sha256 = "falco.sha256_rules_file." + falco::utils::sanitize_rule_name(metric_name_file_sha256); output_fields[metric_name_file_sha256] = item.second; } @@ -353,7 +353,7 @@ void stats_writer::collector::get_metrics_output_fields_wrapper( for (const auto& item : m_writer->m_config->m_loaded_configs_filenames_sha256sum) { fs::path fs_path = item.first; - std::string metric_name_file_sha256 = fs_path.filename().stem(); + std::string metric_name_file_sha256 = fs_path.filename(); metric_name_file_sha256 = "falco.sha256_config_file." + falco::utils::sanitize_rule_name(metric_name_file_sha256); output_fields[metric_name_file_sha256] = item.second; }