Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Drop support for subscribing to bro/ topics

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-01-10 12:26:50 -07:00
parent 1649e3e7cc
commit 9033018509
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -187,6 +187,10 @@ Changed Functionality
Removed Functionality Removed Functionality
--------------------- ---------------------
- Zeek no longer automatically subscribes to topics prefixed with "bro/" whenever
subscribing to topics prefixed with "zeek/". This was a leftover backward-
compatibility step in the Broker code that should have been removed long ago.
Deprecated Functionality Deprecated Functionality
------------------------ ------------------------

7
src/broker/Manager.cc
View file

@ -906,13 +906,6 @@ bool Manager::Subscribe(const string& topic_prefix) {
DBG_LOG(DBG_BROKER, "Subscribing to topic prefix %s", topic_prefix.c_str()); DBG_LOG(DBG_BROKER, "Subscribing to topic prefix %s", topic_prefix.c_str());
bstate->subscriber.add_topic(topic_prefix, ! run_state::detail::zeek_init_done); bstate->subscriber.add_topic(topic_prefix, ! run_state::detail::zeek_init_done);
// For backward compatibility, we also may receive messages on
// "bro/" topic prefixes in addition to "zeek/".
if ( strncmp(topic_prefix.data(), "zeek/", 5) == 0 ) {
std::string alt_topic = "bro/" + topic_prefix.substr(5);
bstate->subscriber.add_topic(std::move(alt_topic), ! run_state::detail::zeek_init_done);
}
return true; return true;
} }

8
testing/btest/Baseline/scripts.base.frameworks.telemetry.internal-metrics/out
View file

@ -18,8 +18,8 @@ Telemetry::INT_GAUGE, broker, buffered-messages, [type], [data], 0.0
count_value, 0 count_value, 0
Telemetry::INT_GAUGE, broker, buffered-messages, [type], [command], 0.0 Telemetry::INT_GAUGE, broker, buffered-messages, [type], [command], 0.0
count_value, 0 count_value, 0
Telemetry::INT_GAUGE, broker, buffered-messages, [type], [routing-update], 2.0 Telemetry::INT_GAUGE, broker, buffered-messages, [type], [routing-update], 1.0
count_value, 2 count_value, 1
Telemetry::INT_GAUGE, broker, buffered-messages, [type], [ping], 0.0 Telemetry::INT_GAUGE, broker, buffered-messages, [type], [ping], 0.0
count_value, 0 count_value, 0
Telemetry::INT_GAUGE, broker, buffered-messages, [type], [pong], 0.0 Telemetry::INT_GAUGE, broker, buffered-messages, [type], [pong], 0.0
@ -27,8 +27,8 @@ count_value, 0
### caf |5| ### caf |5|
Telemetry::INT_COUNTER, caf.system, rejected-messages, [], [], 0.0 Telemetry::INT_COUNTER, caf.system, rejected-messages, [], [], 0.0
count_value, 0 count_value, 0
Telemetry::INT_COUNTER, caf.system, processed-messages, [], [], 8.0 Telemetry::INT_COUNTER, caf.system, processed-messages, [], [], 7.0
count_value, 8 count_value, 7
Telemetry::INT_GAUGE, caf.system, running-actors, [], [], 2.0 Telemetry::INT_GAUGE, caf.system, running-actors, [], [], 2.0
count_value, 2 count_value, 2
Telemetry::INT_GAUGE, caf.system, queued-messages, [], [], 0.0 Telemetry::INT_GAUGE, caf.system, queued-messages, [], [], 0.0