Skip to content

Commit 60e18ec

Browse files
xd4rkerdennisoelkers
authored andcommitted
Fix sidecar server config loading (#26200)
* Fix sidecar server config loading * Add changelog
1 parent 7fd4df6 commit 60e18ec

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

changelog/unreleased/pr-26200.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
type = "f"
2+
message = "Fix Sidecar config not being loaded from the Graylog server configuration file."
3+
4+
pulls = ["26200"]

graylog2-server/src/main/java/org/graylog2/commands/Server.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.graylog.plugins.netflow.NetFlowPluginModule;
4646
import org.graylog.plugins.pipelineprocessor.PipelineConfig;
4747
import org.graylog.plugins.sidecar.SidecarModule;
48+
import org.graylog.plugins.sidecar.common.SidecarPluginConfiguration;
4849
import org.graylog.plugins.views.ViewsBindings;
4950
import org.graylog.plugins.views.ViewsConfig;
5051
import org.graylog.plugins.views.search.rest.scriptingapi.ScriptingApiModule;
@@ -158,6 +159,7 @@ public class Server extends ServerBootstrap implements DocumentedBeansService {
158159
private final DnsLookupAdapterConfiguration dnsLookupAdapterConfiguration = new DnsLookupAdapterConfiguration();
159160
private final EventDefinitionConfiguration eventDefinitionConfiguration = new EventDefinitionConfiguration();
160161
private final MetricsCacheConfiguration metricsCacheConfiguration = new MetricsCacheConfiguration();
162+
private final SidecarPluginConfiguration sidecarPluginConfiguration = new SidecarPluginConfiguration();
161163

162164
@Option(name = {"-l", "--local"}, description = "Run Graylog in local mode. Only interesting for Graylog developers.")
163165
private boolean local = false;
@@ -262,7 +264,8 @@ public List<Object> getDocumentedConfigurationBeans() {
262264
contentStreamConfiguration,
263265
dnsLookupAdapterConfiguration,
264266
eventDefinitionConfiguration,
265-
metricsCacheConfiguration);
267+
metricsCacheConfiguration,
268+
sidecarPluginConfiguration);
266269
}
267270

268271
@Override

0 commit comments

Comments
 (0)