Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update(cmake): bump libs to 0.17.2 and sync merge 0.38.1 PRs #3252

Merged
merged 9 commits into from
Jun 17, 2024
Merged

update(cmake): bump libs to 0.17.2 and sync merge 0.38.1 PRs #3252

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1280c6
update(cmake): bump libs to 0.17.2
FedeDP Jun 17, 2024
9c712e3
fix(userspace/falco): fixed `falco_metrics::to_text` implementation w…
FedeDP May 31, 2024
ac30f37
chore(userspace/falco): more extra safety checks on stats collector too.
FedeDP May 31, 2024
247196c
fix(metrics): allow each metric output channel to be selected indepen…
incertum Jun 1, 2024
f994b6a
fix(metrics): fix sha256 metric names for prometheus
incertum Jun 1, 2024
c47b5d1
Revert "fix(engine): apply output substitutions for all sources"
mrgian Jun 4, 2024
96a160e
cleanup(falco): clarify that --print variants only affect syscalls
LucaGuerra Jun 5, 2024
e9e5681
update(engine): allow using -p to pass a format to plugin events
LucaGuerra Jun 6, 2024
2d6928a
new(metrics): enable plugins metrics
mrgian May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(metrics): fix sha256 metric names for prometheus 
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
  • Loading branch information
@incertum @FedeDP
incertum authored and FedeDP committed Jun 17, 2024
commit f994b6ab9a20b463ed4aa71c58cc79bc06789002
4 changes: 2 additions & 2 deletions userspace/falco/falco_metrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ std::string falco_metrics::to_text(const falco::app::state& state)
{
fs::path fs_path = item.first;
std::string metric_name_file_sha256 = fs_path.filename().stem();
metric_name_file_sha256 = "falco.sha256_rules_file." + falco::utils::sanitize_metric_name(metric_name_file_sha256);
metric_name_file_sha256 = "falco_sha256_rules_file_" + falco::utils::sanitize_metric_name(metric_name_file_sha256);
prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus(metric_name_file_sha256, "falcosecurity", "falco", {{metric_name_file_sha256, item.second}});
}

for (const auto& item : state.config.get()->m_loaded_configs_filenames_sha256sum)
{
fs::path fs_path = item.first;
std::string metric_name_file_sha256 = fs_path.filename().stem();
metric_name_file_sha256 = "falco.sha256_config_file." + falco::utils::sanitize_metric_name(metric_name_file_sha256);
metric_name_file_sha256 = "falco_sha256_config_file_" + falco::utils::sanitize_metric_name(metric_name_file_sha256);
prometheus_text += prometheus_metrics_converter.convert_metric_to_text_prometheus(metric_name_file_sha256, "falcosecurity", "falco", {{metric_name_file_sha256, item.second}});
}
#endif
Expand Down