From a63ea5a04eb815a9960d4c61fc9af5562cfcdefc Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 27 Mar 2024 12:46:10 -0700 Subject: [PATCH] Btest updates due to recent changes --- .../canonified_loaded_scripts.log | 1 + .../canonified_loaded_scripts.log | 1 + testing/btest/Baseline/plugins.hooks/output | 66 ++----------------- .../out | 32 ++++----- .../out | 4 +- .../out | 6 +- .../telemetry.log | 2 +- .../base/frameworks/telemetry/basic.zeek | 8 +-- testing/btest/scripts/base/utils/json.test | 4 +- .../frameworks/telemetry/log-prefixes.zeek | 2 +- 10 files changed, 37 insertions(+), 89 deletions(-) diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log index f7ca9ce013..aee483157a 100644 --- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log +++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log @@ -144,6 +144,7 @@ scripts/base/init-frameworks-and-bifs.zeek scripts/base/utils/site.zeek scripts/base/utils/patterns.zeek scripts/base/frameworks/files/magic/__load__.zeek + scripts/base/frameworks/telemetry/options.zeek build/scripts/base/bif/__load__.zeek build/scripts/base/bif/telemetry.bif.zeek build/scripts/base/bif/zeekygen.bif.zeek diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log index a34d335a26..40a1c5b84c 100644 --- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log +++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log @@ -144,6 +144,7 @@ scripts/base/init-frameworks-and-bifs.zeek scripts/base/utils/site.zeek scripts/base/utils/patterns.zeek scripts/base/frameworks/files/magic/__load__.zeek + scripts/base/frameworks/telemetry/options.zeek build/scripts/base/bif/__load__.zeek build/scripts/base/bif/telemetry.bif.zeek build/scripts/base/bif/zeekygen.bif.zeek diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output index a44457830e..297bdb3584 100644 --- a/testing/btest/Baseline/plugins.hooks/output +++ b/testing/btest/Baseline/plugins.hooks/output @@ -18,18 +18,8 @@ 0.000000 MetaHookPost CallFunction(Analyzer::register_for_port, , (Analyzer::ANALYZER_HTTP, 81/tcp)) -> 0.000000 MetaHookPost CallFunction(Analyzer::register_for_port, , (Analyzer::ANALYZER_HTTP, 8888/tcp)) -> 0.000000 MetaHookPost CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_HTTP, {80<...>/tcp})) -> -0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_endpoint_name, , ()) -> -0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_interval, , (1.0 sec)) -> -0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_prefixes, , ([])) -> -0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_topic, , ()) -> -0.000000 MetaHookPost CallFunction(Broker::__set_metrics_import_topics, , ([])) -> 0.000000 MetaHookPost CallFunction(Broker::__subscribe, , (zeek/supervisor)) -> 0.000000 MetaHookPost CallFunction(Broker::subscribe, , (zeek/supervisor)) -> -0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_endpoint_name, , (Broker::metrics_export_endpoint_name, )) -> -0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_interval, , (Broker::metrics_export_interval, 1.0 sec)) -> -0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_prefixes, , (Broker::metrics_export_prefixes, [])) -> -0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_topic, , (Broker::metrics_export_topic, )) -> -0.000000 MetaHookPost CallFunction(Broker::update_metrics_import_topics, , (Broker::metrics_import_topics, [])) -> 0.000000 MetaHookPost CallFunction(Cluster::is_enabled, , ()) -> 0.000000 MetaHookPost CallFunction(Cluster::is_enabled, , ()) -> 0.000000 MetaHookPost CallFunction(Cluster::register_pool, , ([topic=zeek<...>/logger, node_type=Cluster::LOGGER, max_nodes=, exclusive=F])) -> @@ -118,16 +108,6 @@ 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Analyzer::Logging::ignore_analyzers, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Analyzer::Logging::include_confirmations, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Analyzer::Logging::include_confirmations, lambda_<15261139872714441626>{ if (Analyzer::Logging::new_value) enable_event_group(Analyzer::Logging::include_confirmations)elsedisable_event_group(Analyzer::Logging::include_confirmations)return (Analyzer::Logging::new_value)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Broker::update_metrics_export_prefixes{ Broker::__set_metrics_export_prefixes(Broker::filter)return (Broker::filter)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Broker::update_metrics_export_topic{ Broker::__set_metrics_export_topic(Broker::val)return (Broker::val)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_import_topics, Broker::update_metrics_import_topics{ Broker::__set_metrics_import_topics(Broker::topics)return (Broker::topics)}, 0)) -> -0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_import_topics, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::peer_counts_as_iosource, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> 0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::default_extract, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -> @@ -594,6 +574,7 @@ 0.000000 MetaHookPost LoadFile(0, base<...>/null, <...>/null) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/numbers, <...>/numbers.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/option.bif, <...>/option.bif.zeek) -> -1 +0.000000 MetaHookPost LoadFile(0, base<...>/options, <...>/options.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/packet_analysis.bif, <...>/packet_analysis.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/pbb, <...>/pbb) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/plugins, <...>/plugins) -> -1 @@ -887,6 +868,7 @@ 0.000000 MetaHookPost LoadFileExtended(0, base<...>/null, <...>/null) -> (-1, ) 0.000000 MetaHookPost LoadFileExtended(0, base<...>/numbers, <...>/numbers.zeek) -> (-1, ) 0.000000 MetaHookPost LoadFileExtended(0, base<...>/option.bif, <...>/option.bif.zeek) -> (-1, ) +0.000000 MetaHookPost LoadFileExtended(0, base<...>/options, <...>/options.zeek) -> (-1, ) 0.000000 MetaHookPost LoadFileExtended(0, base<...>/packet_analysis.bif, <...>/packet_analysis.bif.zeek) -> (-1, ) 0.000000 MetaHookPost LoadFileExtended(0, base<...>/pbb, <...>/pbb) -> (-1, ) 0.000000 MetaHookPost LoadFileExtended(0, base<...>/plugins, <...>/plugins) -> (-1, ) @@ -952,18 +934,8 @@ 0.000000 MetaHookPre CallFunction(Analyzer::register_for_port, , (Analyzer::ANALYZER_HTTP, 81/tcp)) 0.000000 MetaHookPre CallFunction(Analyzer::register_for_port, , (Analyzer::ANALYZER_HTTP, 8888/tcp)) 0.000000 MetaHookPre CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_HTTP, {80<...>/tcp})) -0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_endpoint_name, , ()) -0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_interval, , (1.0 sec)) -0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_prefixes, , ([])) -0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_topic, , ()) -0.000000 MetaHookPre CallFunction(Broker::__set_metrics_import_topics, , ([])) 0.000000 MetaHookPre CallFunction(Broker::__subscribe, , (zeek/supervisor)) 0.000000 MetaHookPre CallFunction(Broker::subscribe, , (zeek/supervisor)) -0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_endpoint_name, , (Broker::metrics_export_endpoint_name, )) -0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_interval, , (Broker::metrics_export_interval, 1.0 sec)) -0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_prefixes, , (Broker::metrics_export_prefixes, [])) -0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_topic, , (Broker::metrics_export_topic, )) -0.000000 MetaHookPre CallFunction(Broker::update_metrics_import_topics, , (Broker::metrics_import_topics, [])) 0.000000 MetaHookPre CallFunction(Cluster::is_enabled, , ()) 0.000000 MetaHookPre CallFunction(Cluster::is_enabled, , ()) 0.000000 MetaHookPre CallFunction(Cluster::register_pool, , ([topic=zeek<...>/logger, node_type=Cluster::LOGGER, max_nodes=, exclusive=F])) @@ -1052,16 +1024,6 @@ 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Analyzer::Logging::ignore_analyzers, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Analyzer::Logging::include_confirmations, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Analyzer::Logging::include_confirmations, lambda_<15261139872714441626>{ if (Analyzer::Logging::new_value) enable_event_group(Analyzer::Logging::include_confirmations)elsedisable_event_group(Analyzer::Logging::include_confirmations)return (Analyzer::Logging::new_value)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Broker::update_metrics_export_prefixes{ Broker::__set_metrics_export_prefixes(Broker::filter)return (Broker::filter)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Broker::update_metrics_export_topic{ Broker::__set_metrics_export_topic(Broker::val)return (Broker::val)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_import_topics, Broker::update_metrics_import_topics{ Broker::__set_metrics_import_topics(Broker::topics)return (Broker::topics)}, 0)) -0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_import_topics, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::peer_counts_as_iosource, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) 0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Conn::default_extract, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100)) @@ -1528,6 +1490,7 @@ 0.000000 MetaHookPre LoadFile(0, base<...>/null, <...>/null) 0.000000 MetaHookPre LoadFile(0, base<...>/numbers, <...>/numbers.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/option.bif, <...>/option.bif.zeek) +0.000000 MetaHookPre LoadFile(0, base<...>/options, <...>/options.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/packet_analysis.bif, <...>/packet_analysis.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/pbb, <...>/pbb) 0.000000 MetaHookPre LoadFile(0, base<...>/plugins, <...>/plugins) @@ -1821,6 +1784,7 @@ 0.000000 MetaHookPre LoadFileExtended(0, base<...>/null, <...>/null) 0.000000 MetaHookPre LoadFileExtended(0, base<...>/numbers, <...>/numbers.zeek) 0.000000 MetaHookPre LoadFileExtended(0, base<...>/option.bif, <...>/option.bif.zeek) +0.000000 MetaHookPre LoadFileExtended(0, base<...>/options, <...>/options.zeek) 0.000000 MetaHookPre LoadFileExtended(0, base<...>/packet_analysis.bif, <...>/packet_analysis.bif.zeek) 0.000000 MetaHookPre LoadFileExtended(0, base<...>/pbb, <...>/pbb) 0.000000 MetaHookPre LoadFileExtended(0, base<...>/plugins, <...>/plugins) @@ -1886,18 +1850,8 @@ 0.000000 | HookCallFunction Analyzer::register_for_port(Analyzer::ANALYZER_HTTP, 81/tcp) 0.000000 | HookCallFunction Analyzer::register_for_port(Analyzer::ANALYZER_HTTP, 8888/tcp) 0.000000 | HookCallFunction Analyzer::register_for_ports(Analyzer::ANALYZER_HTTP, {80<...>/tcp}) -0.000000 | HookCallFunction Broker::__set_metrics_export_endpoint_name() -0.000000 | HookCallFunction Broker::__set_metrics_export_interval(1.0 sec) -0.000000 | HookCallFunction Broker::__set_metrics_export_prefixes([]) -0.000000 | HookCallFunction Broker::__set_metrics_export_topic() -0.000000 | HookCallFunction Broker::__set_metrics_import_topics([]) 0.000000 | HookCallFunction Broker::__subscribe(zeek/supervisor) 0.000000 | HookCallFunction Broker::subscribe(zeek/supervisor) -0.000000 | HookCallFunction Broker::update_metrics_export_endpoint_name(Broker::metrics_export_endpoint_name, ) -0.000000 | HookCallFunction Broker::update_metrics_export_interval(Broker::metrics_export_interval, 1.0 sec) -0.000000 | HookCallFunction Broker::update_metrics_export_prefixes(Broker::metrics_export_prefixes, []) -0.000000 | HookCallFunction Broker::update_metrics_export_topic(Broker::metrics_export_topic, ) -0.000000 | HookCallFunction Broker::update_metrics_import_topics(Broker::metrics_import_topics, []) 0.000000 | HookCallFunction Cluster::is_enabled() 0.000000 | HookCallFunction Cluster::register_pool([topic=zeek<...>/logger, node_type=Cluster::LOGGER, max_nodes=, exclusive=F]) 0.000000 | HookCallFunction Cluster::register_pool([topic=zeek<...>/proxy, node_type=Cluster::PROXY, max_nodes=, exclusive=F]) @@ -1985,16 +1939,6 @@ 0.000000 | HookCallFunction Option::set_change_handler(Analyzer::Logging::ignore_analyzers, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) 0.000000 | HookCallFunction Option::set_change_handler(Analyzer::Logging::include_confirmations, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) 0.000000 | HookCallFunction Option::set_change_handler(Analyzer::Logging::include_confirmations, lambda_<15261139872714441626>{ if (Analyzer::Logging::new_value) enable_event_group(Analyzer::Logging::include_confirmations)elsedisable_event_group(Analyzer::Logging::include_confirmations)return (Analyzer::Logging::new_value)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_endpoint_name, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_interval, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_prefixes, Broker::update_metrics_export_prefixes{ Broker::__set_metrics_export_prefixes(Broker::filter)return (Broker::filter)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_prefixes, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_topic, Broker::update_metrics_export_topic{ Broker::__set_metrics_export_topic(Broker::val)return (Broker::val)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_topic, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_import_topics, Broker::update_metrics_import_topics{ Broker::__set_metrics_import_topics(Broker::topics)return (Broker::topics)}, 0) -0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_import_topics, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) 0.000000 | HookCallFunction Option::set_change_handler(Broker::peer_counts_as_iosource, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) 0.000000 | HookCallFunction Option::set_change_handler(Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) 0.000000 | HookCallFunction Option::set_change_handler(Conn::default_extract, Config::config_option_changed{ if ( == Config::location) return (Config::new_value)Config::log = Config::Info($ts=network_time(), $id=Config::ID, $old_value=Config::format_value(lookup_ID(Config::ID)), $new_value=Config::format_value(Config::new_value))if ( != Config::location) Config::log$location = Config::locationLog::write(Config::LOG, to_any_coerce Config::log)return (Config::new_value)}, -100) @@ -2473,6 +2417,7 @@ 0.000000 | HookLoadFile base<...>/null <...>/null 0.000000 | HookLoadFile base<...>/numbers <...>/numbers.zeek 0.000000 | HookLoadFile base<...>/option.bif <...>/option.bif.zeek +0.000000 | HookLoadFile base<...>/options <...>/options.zeek 0.000000 | HookLoadFile base<...>/packet_analysis.bif <...>/packet_analysis.bif.zeek 0.000000 | HookLoadFile base<...>/pbb <...>/pbb 0.000000 | HookLoadFile base<...>/plugins <...>/plugins @@ -2766,6 +2711,7 @@ 0.000000 | HookLoadFileExtended base<...>/null <...>/null 0.000000 | HookLoadFileExtended base<...>/numbers <...>/numbers.zeek 0.000000 | HookLoadFileExtended base<...>/option.bif <...>/option.bif.zeek +0.000000 | HookLoadFileExtended base<...>/options <...>/options.zeek 0.000000 | HookLoadFileExtended base<...>/packet_analysis.bif <...>/packet_analysis.bif.zeek 0.000000 | HookLoadFileExtended base<...>/pbb <...>/pbb 0.000000 | HookLoadFileExtended base<...>/plugins <...>/plugins diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out b/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out index 65b7fb8fbf..7fb9ba5a25 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out +++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out @@ -1,25 +1,25 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### zeek_session_metrics |2| -Telemetry::INT_GAUGE, zeek, active_sessions, [protocol], [tcp], 500.0 +Telemetry::INT_COUNTER, zeek, zeek_total_sessions_total, [protocol], [tcp], 500.0 count_value, 500 -Telemetry::INT_COUNTER, zeek, total_sessions, [protocol], [tcp], 500.0 +Telemetry::INT_GAUGE, zeek, zeek_active_sessions, [protocol], [tcp], 500.0 count_value, 500 ### bt* metrics |5| -Telemetry::DOUBLE_COUNTER, btest, a_test, [x, y], [a, b], 1.0 -Telemetry::DOUBLE_COUNTER, btest, a_test, [x, y], [a, c], 2.0 -Telemetry::DOUBLE_COUNTER, btest, b_test, [x, y], [a, b], 10.0 -Telemetry::DOUBLE_COUNTER, btest, b_test, [x, y], [a, c], 20.0 -Telemetry::DOUBLE_COUNTER, btest, c_test, [x, y], [a, b], 200.0 +Telemetry::DOUBLE_COUNTER, btest, btest_a_test_total, [x, y], [a, b], 1.0 +Telemetry::DOUBLE_COUNTER, btest, btest_b_test_total, [x, y], [a, b], 10.0 +Telemetry::DOUBLE_COUNTER, btest, btest_c_test_total, [x, y], [a, b], 200.0 +Telemetry::DOUBLE_COUNTER, btest, btest_a_test_total, [x, y], [a, c], 2.0 +Telemetry::DOUBLE_COUNTER, btest, btest_b_test_total, [x, y], [a, c], 20.0 ### btest_a_metrics |2| -Telemetry::DOUBLE_COUNTER, btest, a_test, [x, y], [a, b], 1.0 -Telemetry::DOUBLE_COUNTER, btest, a_test, [x, y], [a, c], 2.0 +Telemetry::DOUBLE_COUNTER, btest, btest_a_test_total, [x, y], [a, b], 1.0 +Telemetry::DOUBLE_COUNTER, btest, btest_a_test_total, [x, y], [a, c], 2.0 ### btest_b_metrics |2| -Telemetry::DOUBLE_COUNTER, btest, b_test, [x, y], [a, b], 10.0 -Telemetry::DOUBLE_COUNTER, btest, b_test, [x, y], [a, c], 20.0 +Telemetry::DOUBLE_COUNTER, btest, btest_b_test_total, [x, y], [a, b], 10.0 +Telemetry::DOUBLE_COUNTER, btest, btest_b_test_total, [x, y], [a, c], 20.0 ### system_metrics |3| -Telemetry::DOUBLE_GAUGE, system, sensor_temperature, [name], [cpu0], 43.0 -Telemetry::DOUBLE_GAUGE, system, sensor_temperature, [name], [cpu1], 44.1 -Telemetry::DOUBLE_GAUGE, system, sensor_temperature, [name], [cpu3], 42.2 +Telemetry::DOUBLE_GAUGE, system, system_sensor_temperature_celsius, [name], [cpu0], 43.0 +Telemetry::DOUBLE_GAUGE, system, system_sensor_temperature_celsius, [name], [cpu1], 44.1 +Telemetry::DOUBLE_GAUGE, system, system_sensor_temperature_celsius, [name], [cpu3], 42.2 ### btest_histogram_metrics |2| -Telemetry::DOUBLE_HISTOGRAM, btest, sample_histogram, [1.0, 2.0, 3.0, 4.0, 5.0, inf], [dim], [a], [2.0, 2.0, 0.0, 0.0, 0.0, 1.0], 11.5, 5.0 -Telemetry::DOUBLE_HISTOGRAM, btest, sample_histogram, [1.0, 2.0, 3.0, 4.0, 5.0, inf], [dim], [b], [1.0, 0.0, 0.0, 0.0, 0.0, 1.0], 7.5, 2.0 +Telemetry::DOUBLE_HISTOGRAM, btest, btest_sample_histogram, [1.0, 2.0, 3.0, 4.0, 5.0, inf], [dim], [a], [2.0, 2.0, 0.0, 0.0, 0.0, 1.0], 11.5, 5.0 +Telemetry::DOUBLE_HISTOGRAM, btest, btest_sample_histogram, [1.0, 2.0, 3.0, 4.0, 5.0, inf], [dim], [b], [1.0, 0.0, 0.0, 0.0, 0.0, 1.0], 7.5, 2.0 diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.conn-duration-histogram/out b/testing/btest/Baseline/scripts.base.frameworks.telemetry.conn-duration-histogram/out index 6857acd723..bc2bad3ffd 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.conn-duration-histogram/out +++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.conn-duration-histogram/out @@ -1,11 +1,11 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Telemetry::DOUBLE_HISTOGRAM, zeek, connection_duration +Telemetry::DOUBLE_HISTOGRAM, zeek, zeek_connection_duration_seconds [] [] [2.0, 3.0, 4.0, 5.0, 6.0, 10.0, inf] [0.0, 322.0, 90.0, 5.0, 76.0, 7.0, 0.0] 500.0, 1650.264644 -Telemetry::DOUBLE_HISTOGRAM, zeek, realistic_connection_duration +Telemetry::DOUBLE_HISTOGRAM, zeek, zeek_realistic_connection_duration_seconds [proto] [tcp] [0.1, 1.0, 10.0, 30.0, 60.0, 120.0, 300.0, 900.0, 1800.0, inf] diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out b/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out index 792488e7af..e3207ca1d6 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out +++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -zeek, event_handler_invocations, [zeek_init], 1 -zeek, event_handler_invocations, [connection_state_remove], 500 -zeek, event_handler_invocations, [zeek_done], 1 +zeek, zeek_event_handler_invocations_total, [zeek_done], 1 +zeek, zeek_event_handler_invocations_total, [connection_state_remove], 500 +zeek, zeek_event_handler_invocations_total, [zeek_init], 1 diff --git a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log-prefixes/telemetry.log b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log-prefixes/telemetry.log index df759bf7a1..d79fef633b 100644 --- a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log-prefixes/telemetry.log +++ b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log-prefixes/telemetry.log @@ -7,5 +7,5 @@ #open XXXX-XX-XX-XX-XX-XX #fields ts peer metric_type prefix name labels label_values value #types time string string string string vector[string] vector[string] double -XXXXXXXXXX.XXXXXX zeek counter btest btest_connections proto tcp 500.0 +XXXXXXXXXX.XXXXXX zeek counter btest btest_connections_total proto tcp 500.0 #close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/scripts/base/frameworks/telemetry/basic.zeek b/testing/btest/scripts/base/frameworks/telemetry/basic.zeek index fc6e8deabc..ee9344f0a6 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/basic.zeek +++ b/testing/btest/scripts/base/frameworks/telemetry/basic.zeek @@ -11,7 +11,7 @@ global btest_a_cf = Telemetry::register_counter_family([ $prefix="btest", $name="a_test", - $unit="1", + $unit="", $help_text="A btest metric", $labels=vector("x", "y") ]); @@ -19,7 +19,7 @@ global btest_a_cf = Telemetry::register_counter_family([ global btest_b_cf = Telemetry::register_counter_family([ $prefix="btest", $name="b_test", - $unit="1", + $unit="", $help_text="Another btest metric", $labels=vector("x", "y") ]); @@ -27,7 +27,7 @@ global btest_b_cf = Telemetry::register_counter_family([ global btest_c_cf = Telemetry::register_counter_family([ $prefix="btest", $name="c_test", - $unit="1", + $unit="", $help_text="The last btest metric", $labels=vector("x", "y") ]); @@ -43,7 +43,7 @@ global system_sensor_temp_gf = Telemetry::register_gauge_family([ global btest_sample_histogram_hf = Telemetry::register_histogram_family([ $prefix="btest", $name="sample_histogram", - $unit="1", + $unit="", $help_text="A sample histogram that is not returned by Telemetry::collect_metrics", $bounds=vector(1.0, 2.0, 3.0, 4.0, 5.0), $labels=vector("dim") diff --git a/testing/btest/scripts/base/utils/json.test b/testing/btest/scripts/base/utils/json.test index ad569bfb0f..30e8e201ba 100644 --- a/testing/btest/scripts/base/utils/json.test +++ b/testing/btest/scripts/base/utils/json.test @@ -139,7 +139,7 @@ event zeek_init() local gauge_family = Telemetry::register_gauge_family([ $prefix="btest", $name="btest_testing_gauge", - $unit="1", + $unit="", $help_text="Btest testing", $labels=vector("dim_1"), ]); @@ -150,7 +150,7 @@ event zeek_init() local counter_family = Telemetry::register_counter_family([ $prefix="btest", $name="btest_testing_counter", - $unit="1", + $unit="", $help_text="Btest testing", $labels=vector("dim_1"), ]); diff --git a/testing/btest/scripts/policy/frameworks/telemetry/log-prefixes.zeek b/testing/btest/scripts/policy/frameworks/telemetry/log-prefixes.zeek index 1030f05c39..8c208fd9b5 100644 --- a/testing/btest/scripts/policy/frameworks/telemetry/log-prefixes.zeek +++ b/testing/btest/scripts/policy/frameworks/telemetry/log-prefixes.zeek @@ -11,7 +11,7 @@ redef Telemetry::log_prefixes = {"btest"}; global connections_by_proto_cf = Telemetry::register_counter_family([ $prefix="btest", $name="connections", - $unit="1", + $unit="", $help_text="Total number of monitored connections", $labels=vector("proto") ]);