Commit graph

526 commits

Author SHA1 Message Date
Tim Wojtulewicz
a96b7e6563 Updating submodule(s) [nomail] 2022-10-27 08:48:00 -07:00
Christian Kreibich
3237ad0ba2 Merge remote-tracking branch 'origin/topic/awelzel/builtin-af-packet'
* origin/topic/awelzel/builtin-af-packet:
  Include in Jan's AF_PACKET plugin as builtin plugin
2022-10-26 16:48:37 -07:00
Benjamin Bannier
08bfcff702 Bump spicy-plugin to v1.3.21. 2022-10-26 16:17:02 +02:00
Christian Kreibich
92c758bd44 Management framework: bump zeek-client and cluster testsuite 2022-10-24 16:00:58 -07:00
Christian Kreibich
bf892370ef Update broker submodule [nomail] 2022-10-20 16:59:07 -07:00
Tim Wojtulewicz
d875bfb7bd Update bifcl, binpac, broker, cmake, gen-zam, and paraglob submodules 2022-10-19 20:16:01 -07:00
Tim Wojtulewicz
0d7d490a15 Update libkqueue submodule to latest upstream master 2022-10-16 14:22:51 -07:00
Tim Wojtulewicz
3cc1f3c645 Update rapidjson submodule to latest upstream master 2022-10-16 14:22:51 -07:00
Tim Wojtulewicz
af1b65dc2c Update highwayhash submodule to latest upstream master 2022-10-16 14:22:51 -07:00
Tim Wojtulewicz
e1dc695abb Update bifcl submodule to get fixes for DWARF information for lldb 2022-10-13 13:59:35 -05:00
Arne Welzel
0bc7d0905e Include in Jan's AF_PACKET plugin as builtin plugin
This has come up a few times and the motivation is mainly better "first timer"
experience with Zeek. Concretely, if one wants to run a Zeek cluster with
multiple workers and reasonable load balancing on Linux, AF_PACKET is a decent
start. Without AF_PACKET support being built into Zeek, however, a new user's
next experience is that of setting up a development environment in order
to compile an external plugin (think compiler, kernel headers, zkg, ...).
Only to get what could be termed basic functionality.

This is using the ZEEK_INCLUDE_PLUGINS infrastructure. I've used the all
upper case spelling of AF_PACKET in the help output because it seems everyone
else references/writes it like that. I think we should also write it
like that in the docs.
2022-10-13 13:29:27 +02:00
Tim Wojtulewicz
75dab6e878 Update gen-zam and paraglob submodules for Coverity/clang-tidy fixes 2022-10-12 15:56:03 -05:00
Tim Wojtulewicz
a7ea14ece5 Update zeekctl submodule [nomail] [skip ci] 2022-10-07 09:22:56 -07:00
Tim Wojtulewicz
541f450581 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-plugin'
* origin/topic/bbannier/bump-spicy-plugin:
  Remove stray `/` at the end of directory name.
  Remove commented out code.
  Bump spicy-plugin to v1.3.19.
2022-10-06 14:18:29 -07:00
Tim Wojtulewicz
2fce5b3a34 Merge remote-tracking branch 'origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs'
* origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs:
  Update CT log list.
2022-10-06 14:16:41 -07:00
Benjamin Bannier
2144cef77c Bump spicy-plugin to v1.3.19. 2022-10-04 10:47:50 +02:00
Tim Wojtulewicz
32d922a576 Update broker submodule [nomail] 2022-10-03 09:34:22 -07:00
Robin Sommer
876c367c2d Bump bifcl submodule. 2022-09-28 10:09:58 +02:00
Tim Wojtulewicz
b3c2988c90 Update broker submodule 2022-09-20 09:02:50 -07:00
Tim Wojtulewicz
a32609a5b2 Updating submodule(s) [nomail] 2022-09-19 18:01:33 -07:00
Tim Wojtulewicz
f02475d01a Update broker submodule 2022-09-19 16:35:42 -07:00
Benjamin Bannier
3fcc4cf457 Bump spicy-plugin to v1.3.18. 2022-09-12 18:43:57 +02:00
Tim Wojtulewicz
2d7bfb4ca7 Merge remote-tracking branch 'origin/topic/neverlord/ssl-auth-test'
* origin/topic/neverlord/ssl-auth-test:
  Revert to regular peering fn for ssl_auth_failure
2022-08-26 09:09:36 -07:00
Dominik Charousset
456efd8082 Revert to regular peering fn for ssl_auth_failure
With the fixed Broker version, the `ssl_auth_failure` btest can use the
regular `peer` function again.
2022-08-26 17:00:45 +02:00
Benjamin Bannier
3b2b327d7d Bump Spicy dependencies to spicy-1.5.1 and spicy-plugin-1.3.17.
(cherry picked from commit 7e1840f5fe)
2022-08-25 12:55:37 -07:00
Johanna Amann
0968322c5f Merge remote-tracking branch 'origin/topic/neverlord/gh-2343'
* origin/topic/neverlord/gh-2343:
  Add missing bits for Broker::metrics_import_topics
  Try adding Broker::metrics_import_topics, stuck
2022-08-24 13:26:20 +01:00
Dominik Charousset
6565b4862d Add missing bits for Broker::metrics_import_topics 2022-08-22 17:10:07 +02:00
Arne Welzel
32ee6960f2 telemetry: Switch to histogram family bucket and bound accessors
Instead of determining the bucket bounds from a concrete metric instance,
broker now provides accessors via the concrete histogram family handles.
2022-08-09 11:00:07 +02:00
Arne Welzel
95fba8fd29 Bump broker submodule to master.
Includes changes to run a collector in the broker::telemetry layer,
as well as pybind upgrade, no-discard removals and formatting changes.
2022-08-04 09:16:10 +02:00
Tim Wojtulewicz
14e48733ac Update gen-zam submodule [nomail] 2022-08-02 10:43:52 -07:00
Tim Wojtulewicz
25c63ed7ab Update binpac, bifcl, and gen-zam submodules for renaming changes 2022-07-12 13:58:42 -07:00
Tim Wojtulewicz
f624c18383 Deprecate bro_int_t and bro_uint_t 2022-07-12 12:01:23 -07:00
Benjamin Bannier
b13f8f4dd4 Fix default build with --disable-cpp-tests.
For a build configured with `--disable-cpp-tests` we globally set
`-DDOCTEST_CONFIG_DISABLE`. Spicy does not expect this define to be used
and its unit tests fail to build with it.

This patch adds a Zeek-side workaround for that. We now do not build the
Spicy unit test targets as part of `ALL` anymore.

Closes #2238.
2022-07-09 12:57:32 +02:00
Christian Kreibich
28b7ec2cc5 Bump broker and zeek-archiver submodules to pull in CI updates 2022-07-07 14:20:24 -07:00
Arne Welzel
b77f5fa14c Add gulrak/filesystem to auxil, expose via zeek::filesystem
This adds https://github.com/gulrak/filesystem as a submodule into auxil
as a compiler-independent std::filesystem replacement.

The ghc::filesystem namespace is exposed as zeek::filesystem in util.h.

In the build directory, we add 3rdparty/ghc as a symlink to auxil in
order to support building from the build tree.

    <build_dir>/src/3rdparty/ghc -> /path/to/zeek/src/auxil/filesystem/include/ghc

In the installation tree, the headers are installed into include/zeek/3rdparty:

    <install_dir>/include/zeek/3rdparty/ghc

Note, this differs from how we approached rapidjson which isn't included
using a zeek/3rdparty and instead requires an additional include path of
the following form for external plugins to find and use it.

    <install_dir>/include/zeek/3rdparty/rapidjson/include/

We diverge from this approach. Placing ghc directly into 3rdparty appears
nicer and avoids changing external components (DynamicPlugin.cmake / spicyc)
2022-07-04 13:32:18 +02:00
Christian Kreibich
b96d8afa52 Merge branch 'topic/christian/management-default-instance'
* topic/christian/management-default-instance:
  Management framework: bump zeek-client and cluster testsuite
2022-07-01 11:11:46 -07:00
Christian Kreibich
86431f0a44 Management framework: bump zeek-client and cluster testsuite
No Zeek-side changes here, this just pulls in updates and tests for more
flexible cluster configs in the client.
2022-06-30 10:24:57 -07:00
Benjamin Bannier
e8bc953e8a Bump Spicy and spicy-plugin to their latest release. 2022-06-30 15:44:05 +02:00
Tim Wojtulewicz
342354343c Update broker submodule [nomail] 2022-06-27 15:56:39 -07:00
Tim Wojtulewicz
a6dd3af831 Bump broker submodule to pick up two fixes
- https://github.com/zeek/broker/pull/244
- https://github.com/zeek/broker/pull/245
2022-06-24 14:18:23 -07:00
Tim Wojtulewicz
e60c305ac1 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to the latest development version.
2022-06-23 13:04:08 -07:00
Christian Kreibich
3287b8b793 Merge branch 'topic/christian/management-restart'
* topic/christian/management-restart:
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client
  Management framework: edit pass over docstrings
  Management framework: node restart support
  Management framework: more consistent Supervisor interaction in the agent
  Management framework: log the controller's startup deployment attempt
  Management framework: bugfix for a get_id_value corner case
  Management framework: minor timeout bugfix
  Management framework: make "result" argument plural in multi-result response events
2022-06-23 12:27:19 -07:00
Benjamin Bannier
dd2fe2548b Bump Spicy to the latest development version. 2022-06-23 21:09:00 +02:00
Christian Kreibich
99cd416552 Management framework: bump zeek-client 2022-06-23 00:02:10 -07:00
Christian Kreibich
54f2f28047 Merge branch 'topic/christian/management-deploy'
* topic/christian/management-deploy: (21 commits)
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client
  Management framework: rename set_configuration events to stage_configuration
  Management framework: trigger deployment upon when instances are ready
  Management framework: more resilient node shutdown upon deployment
  Management framework: re-trigger deployment upon controller launch
  Management framework: move most deployment handling to internal function
  Management framework: distinguish internally and externally requested deployments
  Management framework: track instances by their Broker IDs
  Management framework: tweak Supervisor event logging
  Management framework: make helper function a local
  Management framework: rename "log_level" to "level"
  Management framework: add "finish" callback to requests
  Management framework: add a helper for rendering result vectors to a string
  Management framework: agents now skip re-deployment of current config
  Management framework: suppress notify_agent_hello upon Supervisor peering
  Management framework: introduce state machine for configs and persist them
  Management framework: introduce deployment API in controller
  Management framework: rename agent "set_configuration" to "deploy"
  Management framework: consistency fixes to the Result record
  ...
2022-06-22 22:59:53 -07:00
Christian Kreibich
3c3d0f0c1e Management framework: bump zeek-client 2022-06-22 11:54:58 -07:00
Christian Kreibich
4deacefa4c Merge branch 'topic/christian/management-config-validation'
* topic/christian/management-config-validation:
  Management framework: bump external cluster testsuite
  Management framework: bump zeek-client
  Management framework: add config validation
  Management framework: improvements to port auto-enumeration
  Management framework: control output-to-console in Supervisor
  Management framework: handle no-instances corner case in set-config correctly
2022-06-21 16:59:32 -07:00
Tim Wojtulewicz
5b85cd6dfd Update broker submodule to fix put_unique issues from 5.0RC1 2022-06-21 12:14:04 -07:00
Christian Kreibich
7fbb008f85 Management framework: bump zeek-client 2022-06-19 01:20:22 -07:00
Benjamin Bannier
d15ba08890 Bump Spicy and spicy-plugin to latest dev snapshot.
This bump brings in fixes for the following issues:

- zeek/spicy#1204
- zeek/spicy#1208
- zeek/spicy#1210
- zeek/spicy-plugin#112
- zeek/spicy-plugin#117
2022-06-17 11:09:52 +02:00