Commit graph

3195 commits

Author SHA1 Message Date
Christian Kreibich
c4bc9078ef Merge branch 'topic/christian/broker-prometheus-cpp'
* topic/christian/broker-prometheus-cpp:
  Update the scripts.base.frameworks.telemetry.internal-metrics test
  Revert "Temporarily disable the scripts/base/frameworks/telemetry/internal-metrics btest"
  Bump Broker to pull in new Prometheus support and pass in Zeek's registry
2024-07-11 12:15:16 -07:00
Arne Welzel
a9c4daaa22 Merge remote-tracking branch 'jgras/topic/jgras/log-disable-analyzer'
* jgras/topic/jgras/log-disable-analyzer:
  Extend btest for logging of disabled analyzers
  Add logging of disabled analyzers to analyzer.log
2024-07-10 18:51:26 +02:00
Arne Welzel
1c8fedaf09 Merge remote-tracking branch 'origin/topic/awelzel/move-hilti-jit-parallelism-to-btest-cfg'
* origin/topic/awelzel/move-hilti-jit-parallelism-to-btest-cfg:
  testing/btest: Default to HILTI_JIT_PARALLELISM=1
  Revert "CI: Use ccache and a single CPU when building spicy analyzers for btests"
2024-07-10 11:06:46 +02:00
Tim Wojtulewicz
b309c423f8 Merge remote-tracking branch 'origin/topic/timw/ci-reduce-spicy-test-load'
* origin/topic/timw/ci-reduce-spicy-test-load:
  CI: Use ccache and a single CPU when building spicy analyzers for btests
2024-07-09 15:12:29 -07:00
Tim Wojtulewicz
b64f0e8fd8 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot
2024-07-09 14:53:49 -07:00
Tim Wojtulewicz
c557b2156a Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Jul24'
* origin/topic/vern/script-opt-maint.Jul24:
  minor script optimization updates to reflect recent changes, Coverity findings
2024-07-09 10:15:26 -07:00
Arne Welzel
e102715bc8 Merge remote-tracking branch 'cknill/topic/cknill/display_cmake_fix'
* cknill/topic/cknill/display_cmake_fix:
  Fix for --display-cmake in configure Moved build directory creation further down in the script so that --display-cmake has a chance to happen before build tree setup.
2024-07-09 17:10:28 +02:00
Christian Kreibich
6552c4e0fe Merge branch 'topic/christian/management-telemetry-additions'
* topic/christian/management-telemetry-additions:
  Management framework: bump cluster testsuite to pull in telemetry tests
  Management framework: bump zeek-client
  Management framework: augment deployed configs with instance IP addresses
  Management framework: add auto-enumeration of metrics ports
  Management framework: propagate metrics port from agent
  Management framework: add metrics port in management & Supervisor node records
  Harden the telemetry manager against unset Telemetry::metrics_address
  Comment-only tweaks for telemetry-related settings.
2024-07-09 00:08:28 -07:00
Tim Wojtulewicz
4d31335391 Merge branch 'topic/timw/update-submodules'
* topic/timw/update-submodules:
  Update submodules [nomail]
2024-07-08 15:00:26 -07:00
Arne Welzel
66cdb490ff Merge remote-tracking branch 'origin/topic/awelzel/ci-macos-sonoma-only'
* origin/topic/awelzel/ci-macos-sonoma-only:
  CMakeLists: Ensure Threads::Threads target exists
  ci/macos: Only use sonoma image
2024-07-04 17:34:42 +02:00
Benjamin Bannier
ecc1c4c215 Merge remote-tracking branch 'origin/topic/bbannier/bump-zeek-aux' 2024-07-04 17:22:53 +02:00
Benjamin Bannier
15b12c399a Merge branch 'topic/bbannier/bump-spicy' 2024-07-04 15:16:17 +02:00
Arne Welzel
651b44bb6e Merge remote-tracking branch 'origin/topic/awelzel/3789-debug-trailing-crlf-assert'
* origin/topic/awelzel/3789-debug-trailing-crlf-assert:
  HTTP: Implement FlipRoles()
  ContentLineAnalyzer: Add getter for skip_partial
2024-07-04 13:36:20 +02:00
Christian Kreibich
f9af58a5c2 Merge branch 'topic/christian/supervisor-node-simplification'
* topic/christian/supervisor-node-simplification:
  Remove the Supervisor's internal ClusterEndpoint struct.
  Provide a script-layer equivalent to Supervisor::__init_cluster().
2024-07-02 15:36:08 -07:00
Christian Kreibich
3d6954dfd4 Merge branch 'topic/christian/json-improvements'
* topic/christian/json-improvements:
  Update NEWS file to cover JSON enhancements
  Support JSON roundtripping via to_json()/from_json() for patterns
  Support table deserialization in from_json()
  Support map-based definition of ports in from_json()
  Document the field_escape_pattern in the to_json() BiF
2024-07-02 14:47:24 -07:00
Arne Welzel
c2dd3dfad0 Bump cmake submodule [nomail] 2024-07-02 19:42:29 +02:00
Arne Welzel
e57aa5932e Merge remote-tracking branch 'origin/topic/awelzel/3682-bad-pipe-op-3'
* origin/topic/awelzel/3682-bad-pipe-op-3:
  threading/Manager: Warn if threads are added after termination
  iosource/Manager: Reap dry sources while computing timeout
  threading/MsgThread: Decouple IO source and thread lifetimes
  iosource/Manager: Do not manage lifetime of pkt_src
  iosource/Manager: Honor manage_lifetime and dont_count for short-lived IO sources
2024-07-02 14:41:54 +02:00
Arne Welzel
43804fa3b5 Merge remote-tracking branch 'origin/topic/awelzel/fix-coveralls-no-token'
* origin/topic/awelzel/fix-coveralls-no-token:
  coverage/lcov_html: Allow missing coveralls token
2024-06-26 13:16:38 +02:00
Benjamin Bannier
0987d9cd37 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 2024-06-25 13:39:09 +02:00
Arne Welzel
2ebb8824b2 Merge remote-tracking branch 'origin/topic/awelzel/bump-zeekctl-file-extract-dir'
* origin/topic/awelzel/bump-zeekctl-file-extract-dir:
  NEWS: Add entry about FileExtractDir
  Update zeekctl submodule
2024-06-25 11:32:27 +02:00
Arne Welzel
3097a79539 Merge remote-tracking branch 'origin/topic/vern/record-script-opt'
* origin/topic/vern/record-script-opt:
  script optimization for record operations sourced (in part) from other records
2024-06-24 11:19:31 +02:00
Christian Kreibich
eb5ea66012 Merge branch 'topic/awelzel/topic/awelzel/ssh-invalid-version-2'
* topic/awelzel/topic/awelzel/ssh-invalid-version-2:
  zeek-testing-private: Update baseline
  ssh: Revert half-duplex robustness
2024-06-20 18:17:57 -07:00
Christian Kreibich
398b41af5a Merge branch 'topic/dopheide/runtime-includes' of github.com:/dopheide-esnet/zeek
* 'topic/dopheide/runtime-includes' of github.com:/dopheide-esnet/zeek:
  Fixes build error of OpenVPN spicy plugin
2024-06-20 17:34:21 -07:00
Robin Sommer
b5206f818a
Merge remote-tracking branch 'origin/topic/robin/gh-3521-zeek-val'
* origin/topic/robin/gh-3521-zeek-val:
  Bump Spicy and documentation submodules.
  Spicy: Provide runtime API to access Zeek-side globals.
  Spicy: Reformat `zeek.spicy` with `spicy-format`.
  Spicy: Extend exception hierarchy.
2024-06-20 15:54:17 +02:00
Arne Welzel
a7f10df4f7 Merge remote-tracking branch 'origin/topic/christian/ci-updates'
* origin/topic/christian/ci-updates:
  CMakeLists: Disable -Werror for 3rdparty/sqlite3.c
  Bump zeek-3rdparty to pull in sqlite move to 3.46
  CI: drop Fedora 38, add 40
2024-06-18 10:53:09 +02:00
Robin Sommer
8c755af8b2
Merge remote-tracking branch 'origin/topic/robin/gh-3783-replaces-two'
* origin/topic/robin/gh-3783-replaces-two:
  Spicy: Disallow repeating replacements of the same analyzer.
  Bump Spicy.
2024-06-14 13:51:06 +02:00
Benjamin Bannier
345fc31dcc Merge remote-tracking branch 'origin/topic/bbannier/ci-centos8-stream-eol' 2024-06-11 15:11:52 +02:00
Arne Welzel
1e3b5ee68b Merge remote-tracking branch 'origin/topic/timw/civetweb-shutdown-data-race'
* origin/topic/timw/civetweb-shutdown-data-race:
  Suppress a known data race during civetweb shutdown
2024-06-11 12:01:10 +02:00
Arne Welzel
3081a40a2a Merge remote-tracking branch 'origin/topic/awelzel/asan-coverage-fixes'
* origin/topic/awelzel/asan-coverage-fixes:
  Bump cmake for -fprofile-update=atomic usage
  cirrus: Unset CCACHE_BASEDIR for asan/coverage build
2024-06-11 11:03:14 +02:00
Tim Wojtulewicz
3f6b9ab167 Merge remote-tracking branch 'origin/topic/timw/telemetry-bind-address'
* origin/topic/timw/telemetry-bind-address:
  Add Telemetry::metrics_address option
2024-06-07 09:29:09 -07:00
Tim Wojtulewicz
322d223c18 Merge remote-tracking branch 'origin/topic/timw/pic-prometheus-cpp'
* origin/topic/timw/pic-prometheus-cpp:
  Update cmake submodule [nomail]
2024-06-06 18:23:59 -07:00
Tim Wojtulewicz
2cb284a352 Merge remote-tracking branch 'origin/topic/timw/dont-require-jq'
* origin/topic/timw/dont-require-jq:
  Change prometheus test to check for require jq
2024-06-06 18:08:44 -07:00
Tim Wojtulewicz
16d39b9978 Merge remote-tracking branch 'origin/topic/timw/zeekctl-check-telemetry'
* origin/topic/timw/zeekctl-check-telemetry:
  Check for 'zeekctl check' before trying to start up prometheus
2024-06-06 18:07:02 -07:00
Tim Wojtulewicz
66e3d8c2e4 Merge remote-tracking branch 'origin/topic/timw/telemetry-follow-up'
* origin/topic/timw/telemetry-follow-up:
  Switch to zeek fork of prometheus-cpp
  Remove unnecessary shared_from_this on instrument classes
  Restore label_names field in MetricOpts record
  Change how we count FDs on Linux to fix zeekctl stop issues
  Update zeekctl tests for telemetry rework
  Use forward declarations of prometheus-cpp types in telemetry::Manager
  Add prometheus-cpp files to install set for plugins to use
  Fix a memory leak with the CivetWeb callbacks in telemetry
  Fix a bunch of copy-instead-of-move findings from Coverity
  Move telmetry label names out of opts records, into main metric records
  Ensure the order of label values matches the label names
  Remove prefix column from telemetry.log
  Fix race condition by pre-building the cluster json data for services.json
  Set running_under_test for scripts.base.frameworks.logging.telemetry test
2024-06-04 14:17:05 -07:00
Tim Wojtulewicz
07d845b558 Merge remote-tracking branch 'origin/topic/awelzel/stevesmoot-reporter-error-updates'
* origin/topic/awelzel/stevesmoot-reporter-error-updates:
  Update reporter.bif to describe special case of errors in init
2024-06-04 11:36:23 -07:00
Tim Wojtulewicz
e7b0a0a887 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Jun24'
* origin/topic/vern/script-opt-maint.Jun24:
  script optimization baseline tweaks due to recent minor changes
  updated list of BiFs for script optimization
  addressed some Coverity nits
  improved error cascade for invalid attributes
2024-06-04 10:36:57 -07:00
Tim Wojtulewicz
29d66ec197 Merge branch 'topic/timw/prometheus-cpp-3'
* topic/timw/prometheus-cpp-3: (35 commits)
  Update docs submodule [nomail] [skip ci]
  Add type aliases for instrument and family shared_ptrs
  Update NEWS for double and is_sum changes
  Remove is_sum arguments from counters and gauges
  Change all instruments to only handle doubles
  Add comment to telemetry::Manager::InitPostScript
  Remove all of the ZEEK_METRICS_ environment variables
  Fix header comments in scripts/policy/frameworks/telemetry/prometheus.zeek
  Change all prometheus #includes to use angle brackets
  Update zeekctl submodule for metrics_port node.cfg option
  Regenerate docs [nomail]
  Remove the is_sum argument from BIF histogram creation methods
  Update NEWS for Telemetry rework
  Remove Telemetry::metrics_export_prefixes option
  Validate that label names are constant in non-zeek metrics
  Avoid calling Collect() in counter/gauge Value() methods if not needed
  Fix some determinism issues with btests
  Temporarily disable the scripts/base/frameworks/telemetry/internal-metrics btest
  Fix the scripts.policy.frameworks.telemetry.prometheus btest to use the service discovery endpoint
  Btest updates due to recent changes
  ...
2024-05-31 14:18:48 -07:00
Christian Kreibich
1d4a169dd4 Merge branch 'topic/christian/analyzer-lookup-bifs'
* topic/christian/analyzer-lookup-bifs:
  More precise error reporting for the disable_analyzer() BiF
  Add btests for the lookup_connection_analyzer_id() BiF.
  Add BiF for looking up a connection's numeric protocol analyzer IDs
2024-05-31 09:37:52 -07:00
Tim Wojtulewicz
c04e503c92 Merge remote-tracking branch 'origin/topic/vern/add-del-expr'
* origin/topic/vern/add-del-expr:
  removing now-vestigial "add" and "delete" statements
  script optimization support for "add" and "delete" being expressions
  "add" and "delete" are now expressions rather than statements
  bug fix for dealing with illegal types of initializers
  added a space when rendering some expressions so they're more readable
2024-05-29 13:49:10 -07:00
Johanna Amann
03b358f6d1 Merge branch 'files_pe_timestamp_sync' of https://github.com/mvhensbergen/zeek
* 'files_pe_timestamp_sync' of https://github.com/mvhensbergen/zeek:
  Don't hardcode values
  Add btest for timestamp check
  Copy timestamp from file object
2024-05-29 14:16:31 +01:00
Tim Wojtulewicz
d86e73376b Merge remote-tracking branch 'origin/topic/timw/fix-coverage-part-trois'
* origin/topic/timw/fix-coverage-part-trois:
  CI: Revert part of 2bde82ffa2 to fix coverage builds
2024-05-28 13:06:03 -07:00
Christian Kreibich
e6b41defa0 Merge branch 'topic/christian/fix-zeekygen-quic-warning'
* topic/christian/fix-zeekygen-quic-warning:
  Fix Zeekygen warning for QUIC::unrecognized_version event
2024-05-24 15:04:38 -07:00
Tim Wojtulewicz
47dd834bdb Merge remote-tracking branch 'origin/topic/johanna/tls-new-groups-and-consts'
* origin/topic/johanna/tls-new-groups-and-consts:
  Update TLS consts, mainly new named curves.
2024-05-24 10:49:42 -07:00
Tim Wojtulewicz
afc89c0480 Merge remote-tracking branch 'origin/topic/timw/fix-coverage-part-deux'
* origin/topic/timw/fix-coverage-part-deux:
  CI: Remove --enable-werror for asan builds
  CI: Run coverage builds for PRs, but only upload on master
  Coverage: Ignore a few errors during generation
  Coverage: don't bother ignoring non-existent bro.dir files
  CI: Re-enable coverage
  CI: Switch asan build back to gcc
  Update cmake submodule [nomail]
  CI: Avoid divide by zero error when generating coverage files
2024-05-21 16:23:23 -07:00
Tim Wojtulewicz
04c8a6bde7 Merge remote-tracking branch 'origin/topic/vern/smb-filtering'
* origin/topic/vern/smb-filtering:
  Fix for suppressing SMB logging of previously-logged files
2024-05-20 15:54:19 -07:00
Tim Wojtulewicz
1a0fffd714 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to latest dev snapshot
2024-05-17 08:56:45 -07:00
Tim Wojtulewicz
87870f8345 Merge remote-tracking branch 'origin/topic/vern/zam-subnet-fix'
* origin/topic/vern/zam-subnet-fix:
  Fix for ZAM inlining of nested function calls with the same parameter names
  Fixed ZAM logic error in canonicalizing specialized min/max instructions
  Fixed order-of-evaluation bug in ZAM Subnet-To-Addr instruction
  "-a zam" BTest baseline update reflecting recent Spicy baseline change
2024-05-16 11:09:33 -07:00
Tim Wojtulewicz
237f4c39a4 Merge branch 'topic/timw/no-spicy-head-on-releases'
* topic/timw/no-spicy-head-on-releases:
  CI: Disable spicy_head task for release branches
2024-05-16 09:35:06 -07:00
Tim Wojtulewicz
a4d7587bca Merge remote-tracking branch 'origin/topic/timw/fix-coverage-build'
* origin/topic/timw/fix-coverage-build:
  CI: Use llvm-cov-18 on Cirrus for building coverage data
2024-05-15 20:00:58 -07:00
Tim Wojtulewicz
8337b5f018 Merge remote-tracking branch 'origin/topic/timw/ubuntu-24-sanitizers'
* origin/topic/timw/ubuntu-24-sanitizers:
  CI: Use clang-18 on Ubuntu 24 for sanitizers builds, enable TSan builds
  CI: Add clang-18 to Ubuntu 24.04 VM
2024-05-13 17:40:52 -07:00