Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/unreleased/pr-26200.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type = "f"
message = "Fix Sidecar config not being loaded from the Graylog server configuration file."

pulls = ["26200"]
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.graylog.plugins.netflow.NetFlowPluginModule;
import org.graylog.plugins.pipelineprocessor.PipelineConfig;
import org.graylog.plugins.sidecar.SidecarModule;
import org.graylog.plugins.sidecar.common.SidecarPluginConfiguration;
import org.graylog.plugins.views.ViewsBindings;
import org.graylog.plugins.views.ViewsConfig;
import org.graylog.plugins.views.search.rest.scriptingapi.ScriptingApiModule;
Expand Down Expand Up @@ -149,6 +150,7 @@ public class Server extends ServerBootstrap {
private final ContentStreamConfiguration contentStreamConfiguration = new ContentStreamConfiguration();
private final DnsLookupAdapterConfiguration dnsLookupAdapterConfiguration = new DnsLookupAdapterConfiguration();
private final EventDefinitionConfiguration eventDefinitionConfiguration = new EventDefinitionConfiguration();
private final SidecarPluginConfiguration sidecarPluginConfiguration = new SidecarPluginConfiguration();

@Option(name = {"-l", "--local"}, description = "Run Graylog in local mode. Only interesting for Graylog developers.")
private boolean local = false;
Expand Down Expand Up @@ -242,7 +244,8 @@ public boolean isLocal() {
telemetryConfiguration,
contentStreamConfiguration,
dnsLookupAdapterConfiguration,
eventDefinitionConfiguration);
eventDefinitionConfiguration,
sidecarPluginConfiguration);
}

@Override
Expand Down
Loading