Skip to content

Commit

Permalink
redpanda: Wire up audit_log_mgr to admin_server
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Blafford authored and michael-redpanda committed Oct 17, 2023
1 parent db9f57f commit f16e929
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/v/redpanda/admin_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
#include "rpc/errc.h"
#include "rpc/rpc_utils.h"
#include "security/acl.h"
#include "security/audit/audit_log_manager.h"
#include "security/credential_store.h"
#include "security/scram_algorithm.h"
#include "security/scram_authenticator.h"
Expand Down Expand Up @@ -244,7 +245,8 @@ admin_server::admin_server(
ss::sharded<memory_sampling>& memory_sampling_service,
ss::sharded<cloud_storage::cache>& cloud_storage_cache,
ss::sharded<resources::cpu_profiler>& cpu_profiler,
ss::sharded<transform::service>* transform_service)
ss::sharded<transform::service>* transform_service,
ss::sharded<security::audit::audit_log_manager>& audit_mgr)
: _log_level_timer([this] { log_level_timer_handler(); })
, _server("admin")
, _cfg(std::move(cfg))
Expand Down Expand Up @@ -272,6 +274,7 @@ admin_server::admin_server(
, _cloud_storage_cache(cloud_storage_cache)
, _cpu_profiler(cpu_profiler)
, _transform_service(transform_service)
, _audit_mgr(audit_mgr)
, _default_blocked_reactor_notify(
ss::engine().get_blocked_reactor_notify_ms()) {
_server.set_content_streaming(true);
Expand Down
5 changes: 4 additions & 1 deletion src/v/redpanda/admin_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "resource_mgmt/memory_sampling.h"
#include "rpc/connection_cache.h"
#include "seastarx.h"
#include "security/fwd.h"
#include "storage/node.h"
#include "transform/fwd.h"
#include "utils/request_auth.h"
Expand Down Expand Up @@ -81,7 +82,8 @@ class admin_server {
ss::sharded<memory_sampling>&,
ss::sharded<cloud_storage::cache>&,
ss::sharded<resources::cpu_profiler>&,
ss::sharded<transform::service>*);
ss::sharded<transform::service>*,
ss::sharded<security::audit::audit_log_manager>&);

ss::future<> start();
ss::future<> stop();
Expand Down Expand Up @@ -552,6 +554,7 @@ class admin_server {
ss::sharded<cloud_storage::cache>& _cloud_storage_cache;
ss::sharded<resources::cpu_profiler>& _cpu_profiler;
ss::sharded<transform::service>* _transform_service;
ss::sharded<security::audit::audit_log_manager>& _audit_mgr;

// Value before the temporary override
std::chrono::milliseconds _default_blocked_reactor_notify;
Expand Down
3 changes: 2 additions & 1 deletion src/v/redpanda/application.cc
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,8 @@ void application::configure_admin_server() {
std::ref(_memory_sampling),
std::ref(shadow_index_cache),
std::ref(_cpu_profiler),
&_transform_service)
&_transform_service,
std::ref(audit_mgr))
.get();
}

Expand Down

0 comments on commit f16e929

Please sign in to comment.