github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-08-07 01:03:53 +00:00
Code Issues Projects Releases Wiki Activity

cleanup(metrics): fix build for non linux

Browse Source 
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
This commit is contained in:
Melissa Kilby 2024-03-14 00:01:38 +00:00 committed by poiana
parent 7762d0cd84
commit 3b7b3439ec
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
userspace/falco/stats_writer.cpp
View File

@ -319,11 +319,11 @@ void stats_writer::collector::get_metrics_output_fields_wrapper(
/* Wrapper fields useful for statistical analyses and attributions. Always enabled. */ /* Wrapper fields useful for statistical analyses and attributions. Always enabled. */
output_fields["evt.time"] = now; /* Some ETLs may prefer a consistent timestamp within output_fields. */ output_fields["evt.time"] = now; /* Some ETLs may prefer a consistent timestamp within output_fields. */
output_fields["evt.hostname"] = machine_info->hostname; /* Explicitly add hostname to log msg in case hostname rule output field is disabled. */
output_fields["falco.version"] = FALCO_VERSION; output_fields["falco.version"] = FALCO_VERSION;
output_fields["falco.start_ts"] = agent_info->start_ts_epoch; output_fields["falco.start_ts"] = agent_info->start_ts_epoch;
output_fields["falco.duration_sec"] = (uint64_t)((now - agent_info->start_ts_epoch) / ONE_SECOND_IN_NS); output_fields["falco.duration_sec"] = (uint64_t)((now - agent_info->start_ts_epoch) / ONE_SECOND_IN_NS);
output_fields["falco.kernel_release"] = agent_info->uname_r; output_fields["falco.kernel_release"] = agent_info->uname_r;
output_fields["evt.hostname"] = machine_info->hostname; /* Explicitly add hostname to log msg in case hostname rule output field is disabled. */
output_fields["falco.host_boot_ts"] = machine_info->boot_ts_epoch; output_fields["falco.host_boot_ts"] = machine_info->boot_ts_epoch;
output_fields["falco.host_num_cpus"] = machine_info->num_cpus; output_fields["falco.host_num_cpus"] = machine_info->num_cpus;
output_fields["falco.outputs_queue_num_drops"] = m_writer->m_outputs->get_outputs_queue_num_drops(); output_fields["falco.outputs_queue_num_drops"] = m_writer->m_outputs->get_outputs_queue_num_drops();
@ -353,7 +353,7 @@ void stats_writer::collector::get_metrics_output_fields_additional(
nlohmann::json& output_fields, nlohmann::json& output_fields,
double stats_snapshot_time_delta_sec) double stats_snapshot_time_delta_sec)
{ {
#if !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__) #if defined(__linux__) and !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__)
if (m_writer->m_libs_metrics_collector && m_writer->m_output_rule_metrics_converter) if (m_writer->m_libs_metrics_collector && m_writer->m_output_rule_metrics_converter)
{ {
// Refresh / New snapshot // Refresh / New snapshot
@ -462,7 +462,7 @@ void stats_writer::collector::collect(const std::shared_ptr<sinsp>& inspector, c
{ {
if (m_writer->has_output()) if (m_writer->has_output())
{ {
#if defined(__linux__) and !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__)
if(!m_writer->m_libs_metrics_collector) if(!m_writer->m_libs_metrics_collector)
{ {
uint32_t flags = m_writer->m_config->m_metrics_flags; uint32_t flags = m_writer->m_config->m_metrics_flags;
@ -485,7 +485,7 @@ void stats_writer::collector::collect(const std::shared_ptr<sinsp>& inspector, c
{ {
m_writer->m_output_rule_metrics_converter = std::make_unique<libs::metrics::output_rule_metrics_converter>(); m_writer->m_output_rule_metrics_converter = std::make_unique<libs::metrics::output_rule_metrics_converter>();
} }
#endif
/* Collect stats / metrics once per ticker period. */ /* Collect stats / metrics once per ticker period. */
auto tick = stats_writer::get_ticker(); auto tick = stats_writer::get_ticker();
if (tick != m_last_tick) if (tick != m_last_tick)

7
userspace/falco/stats_writer.h
View File

@ -146,11 +146,12 @@ private:
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
tbb::concurrent_bounded_queue<stats_writer::msg> m_queue; tbb::concurrent_bounded_queue<stats_writer::msg> m_queue;
#endif #endif
std::shared_ptr<falco_outputs> m_outputs; #if defined(__linux__) and !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__)
std::shared_ptr<const falco_configuration> m_config;
std::unique_ptr<libs::metrics::libs_metrics_collector> m_libs_metrics_collector; std::unique_ptr<libs::metrics::libs_metrics_collector> m_libs_metrics_collector;
std::unique_ptr<libs::metrics::output_rule_metrics_converter> m_output_rule_metrics_converter; std::unique_ptr<libs::metrics::output_rule_metrics_converter> m_output_rule_metrics_converter;
#endif
std::shared_ptr<falco_outputs> m_outputs;
std::shared_ptr<const falco_configuration> m_config;
// note: in this way, only collectors can push into the queue // note: in this way, only collectors can push into the queue
friend class stats_writer::collector; friend class stats_writer::collector;
}; };