From 26aab20455e5d16614957d3afd9eaac7c8bc673d Mon Sep 17 00:00:00 2001
From: Jan Heise <jan.heise@graylog.com>
Date: Fri, 23 Feb 2024 13:38:23 +0100
Subject: [PATCH] DataNode: Add max_clause_count default (#18354)

* add max_clause_count default

* add changelog
---
 changelog/unreleased/pr-18354.toml                         | 4 ++++
 .../src/main/java/org/graylog/datanode/Configuration.java  | 7 +++++++
 .../configuration/OpensearchConfigurationProvider.java     | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 changelog/unreleased/pr-18354.toml

diff --git a/changelog/unreleased/pr-18354.toml b/changelog/unreleased/pr-18354.toml
new file mode 100644
index 0000000000..461f76ff3f
--- /dev/null
+++ b/changelog/unreleased/pr-18354.toml
@@ -0,0 +1,4 @@
+type = "f"
+message = "Add a sensible default value for OpenSearch inside the DataNode for indices.query.bool.max_clause_count"
+
+pulls = ["18354"]
diff --git a/data-node/src/main/java/org/graylog/datanode/Configuration.java b/data-node/src/main/java/org/graylog/datanode/Configuration.java
index 05946859f8..9363ca3702 100644
--- a/data-node/src/main/java/org/graylog/datanode/Configuration.java
+++ b/data-node/src/main/java/org/graylog/datanode/Configuration.java
@@ -240,6 +240,13 @@ public class Configuration extends BaseConfiguration {
     @Parameter(value = "metrics_policy")
     private String metricsPolicy = "gl-datanode-metrics-ism";
 
+    @Parameter(value = "opensearch_indices_query_bool_max_clause_count")
+    private Integer indicesQueryBoolMaxClauseCount = 32768;
+
+    public Integer getIndicesQueryBoolMaxClauseCount() {
+        return indicesQueryBoolMaxClauseCount;
+    }
+
     public boolean isInsecureStartup() {
         return insecureStartup;
     }
diff --git a/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java b/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java
index 2b5e9b2667..996955ef25 100644
--- a/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java
+++ b/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java
@@ -144,6 +144,9 @@ public class OpensearchConfigurationProvider implements Provider<OpensearchConfi
         // Uncomment the following line to get DEBUG logs for the underlying Opensearch
         //config.put("logger.org.opensearch", "debug");
 
+        // common OpenSearch config parameters from our docs
+        config.put("indices.query.bool.max_clause_count", localConfiguration.getIndicesQueryBoolMaxClauseCount().toString());
+
         return config.build();
     }