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

Merge remote-tracking branch 'origin/topic/jsiwek/broctl-tweaks'

Browse source 
* origin/topic/jsiwek/broctl-tweaks:
  Consolidating some node-specific functionality from scripts in broctl repo.
This commit is contained in:
Robin Sommer 2011-10-05 16:54:39 -07:00
commit fe77d385e0
8 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/base/frameworks/cluster/__load__.bro
View file

@ -28,14 +28,17 @@ redef Communication::listen_port_clear = Cluster::nodes[Cluster::node]$p;
@if ( Cluster::local_node_type() == Cluster::MANAGER )
@load ./nodes/manager
@load site/local-manager
@endif
@if ( Cluster::local_node_type() == Cluster::PROXY )
@load ./nodes/proxy
@load site/local-proxy
@endif
@if ( Cluster::local_node_type() == Cluster::WORKER )
@load ./nodes/worker
@load site/local-worker
@endif
@endif

5
scripts/base/frameworks/cluster/nodes/manager.bro
View file

@ -10,12 +10,11 @@
@prefixes += cluster-manager
# Load the script for local site configuration for the manager node.
@load site/local-manager
## Turn off remote logging since this is the manager and should only log here.
redef Log::enable_remote_logging = F;
redef Log::default_rotation_interval = 1 hrs;
## Use the cluster's archive logging script.
redef Log::default_rotation_postprocessor_cmd = "archive-log";

5
scripts/base/frameworks/cluster/nodes/proxy.bro
View file

@ -1,9 +1,6 @@
@prefixes += cluster-proxy
# Load the script for local site configuration for proxy nodes.
@load site/local-proxy
## The proxy only syncs state; does not forward events.
redef forward_remote_events = F;
redef forward_remote_state_changes = T;
@ -14,6 +11,8 @@ redef Log::enable_local_logging = F;
## Make sure that remote logging is enabled.
redef Log::enable_remote_logging = T;
redef Log::default_rotation_interval = 24hrs;
## Use the cluster's delete-log script.
redef Log::default_rotation_postprocessor_cmd = "delete-log";

6
scripts/base/frameworks/cluster/nodes/worker.bro
View file

@ -1,17 +1,17 @@
@prefixes += cluster-worker
# Load the script for local site configuration for the worker nodes.
@load site/local-worker
## Don't do any local logging.
redef Log::enable_local_logging = F;
## Make sure that remote logging is enabled.
redef Log::enable_remote_logging = T;
redef Log::default_rotation_interval = 24hrs;
## Use the cluster's delete-log script.
redef Log::default_rotation_postprocessor_cmd = "delete-log";
@load misc/trim-trace-file
## Record all packets into trace file.
##
## Note that this only indicates that *if* we are recording packets, we want all

2
testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
View file

@ -15,6 +15,8 @@ redef Cluster::nodes = {
};
@TEST-END-FILE
redef Log::default_rotation_interval = 0secs;
redef enum Metrics::ID += {
TEST_METRIC,
};

2
testing/btest/scripts/base/frameworks/metrics/cluster-intermediate-update.bro
View file

@ -15,6 +15,8 @@ redef Cluster::nodes = {
};
@TEST-END-FILE
redef Log::default_rotation_interval = 0secs;
redef enum Notice::Type += {
Test_Notice,
};

2
testing/btest/scripts/base/frameworks/notice/cluster.bro
View file

@ -13,6 +13,8 @@ redef Cluster::nodes = {
};
@TEST-END-FILE
redef Log::default_rotation_interval = 0secs;
redef enum Notice::Type += {
Test_Notice,
};

2
testing/btest/scripts/base/frameworks/notice/suppression-cluster.bro
View file

@ -15,6 +15,8 @@ redef Cluster::nodes = {
};
@TEST-END-FILE
redef Log::default_rotation_interval = 0secs;
redef enum Notice::Type += {
Test_Notice,
};