From bfc2374c8f4108ce55cf8c316ff4f7964ab6a44b Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 27 Feb 2023 13:04:40 +0100 Subject: [PATCH] Bump external test suites, filter some telemetry.log entries --- testing/external/commit-hash.zeek-testing | 2 +- testing/external/commit-hash.zeek-testing-private | 2 +- testing/external/scripts/testing-setup.zeek | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing index 26eccf6560..577208577f 100644 --- a/testing/external/commit-hash.zeek-testing +++ b/testing/external/commit-hash.zeek-testing @@ -1 +1 @@ -fae5bc9cfa6d57c9bcfed4dea6d0cd5c4a15932d +2adb32810742823cddea39d9a7ced7e45df67131 diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index 8d49cce761..496448b15b 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -0520a9854fb0591916bb88f68e98ed5750f1b7e6 +41f6eb60c626316f0554548fcfa1ab07ddcf61a0 diff --git a/testing/external/scripts/testing-setup.zeek b/testing/external/scripts/testing-setup.zeek index 9285a23c6c..76656112c2 100644 --- a/testing/external/scripts/testing-setup.zeek +++ b/testing/external/scripts/testing-setup.zeek @@ -27,17 +27,21 @@ hook Telemetry::log_policy(rec: Telemetry::Info, id: Log::ID, filter: Log::Filte break; } -# Filter out veto metrics and also loaded_script logs and telemetry logs due -# depending on the configuration (heavily). hook Telemetry::log_policy(rec: Telemetry::Info, id: Log::ID, filter: Log::Filter) { if ( rec$prefix != "zeek" ) return; # Filter all event-handler-invocations entries from telemetry.log - # except those having something to do with connections. + # except those having something to do with connection_* if ( rec$name == "event-handler-invocations" && /connection_.*/ !in cat(rec$label_values) ) break; + + # Filter out the LoadedScripts stream due to platform dependent + # difference in the scripts loaded, and also filter out Telemetry + # log counts. + if ( rec$name == /log-.*/ && /LoadedScripts::LOG|Telemetry::LOG/ in cat(rec$label_values) ) + break; } # The IMAP analyzer includes absolute filenames in its error messages,