Merge branch 'master' into opensearch/update-to-2.19.4

Author: todvora

changelog/unreleased/issue-22105.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Fix browser navigation not restoring the previous search"
+
+issues = ["22105", "18484"]
+pulls = ["24583"]

changelog/unreleased/issue-9582.toml

@@ -0,0 +1,5 @@
+type = "a"
+message = "Added new Palo Alto Networks UDP (PAN-OS v11+) input."
+
+pulls=["24617"]
+issues = ["graylog-plugin-enterprise#9582"]

changelog/unreleased/pr-24518.toml

@@ -0,0 +1,5 @@
+type = "a"
+message = "Throw custom exception with help text on parent circuit breaking exception."
+
+issues = ["graylog-plugin-enterprise#7917"]
+pulls = ["24518"]

changelog/unreleased/pr-24578.toml

@@ -0,0 +1,6 @@
+type = "a"
+message = "Added support for customizing titles of events with new configuration option in Event Definitions."
+
+pulls = ["24578", "graylog-plugin-enterprise#12830"]
+
+

changelog/unreleased/pr-24590.toml

@@ -0,0 +1,4 @@
+type = "f"
+message = "Return 404 instead of HTML for non-existent API methods."
+
+pulls = ["24590"]

changelog/unreleased/pr-24604.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Fix y10k problem in certificates signing"
+
+pulls = ["24604"]
+issues = []

changelog/unreleased/pr-24645.toml

@@ -0,0 +1,4 @@
+type = "f"
+message = "Fix legacy public notifications missing `variant` field created in previous versions breaking login screen."
+
+pulls = ["24645"]

graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ElasticsearchClient.java

@@ -45,6 +45,7 @@
 import org.graylog2.indexer.InvalidWriteTargetException;
 import org.graylog2.indexer.MapperParsingException;
 import org.graylog2.indexer.MasterNotDiscoveredException;
+import org.graylog2.indexer.ParentCircuitBreakingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -202,6 +203,9 @@ public static RuntimeException exceptionFrom(Exception e, String errorMessage) {
             if (isMapperParsingExceptionException(elasticsearchException)) {
                 return new MapperParsingException(elasticsearchException.getMessage());
             }
+            if (isParentCircuitBreakingException(elasticsearchException)) {
+                return new ParentCircuitBreakingException(elasticsearchException.getMessage());
+            }
         } else if (e instanceof IOException && e.getCause() instanceof ContentTooLongException) {
             return new BatchSizeTooLargeException(e.getMessage());
         }
@@ -231,8 +235,8 @@ private static boolean isIndexNotFoundException(ElasticsearchException elasticse
         return elasticsearchException.getMessage().contains("index_not_found_exception");
     }
 
-    private static boolean isMapperParsingExceptionException(ElasticsearchException openSearchException) {
-        return openSearchException.getMessage().contains("mapper_parsing_exception");
+    private static boolean isMapperParsingExceptionException(ElasticsearchException elasticSearchException) {
+        return elasticSearchException.getMessage().contains("mapper_parsing_exception");
     }
 
     private static boolean isBatchSizeTooLargeException(ElasticsearchException elasticsearchException) {
@@ -254,6 +258,19 @@ private static boolean isBatchSizeTooLargeException(ElasticsearchException elast
         return false;
     }
 
+    private static boolean isParentCircuitBreakingException(ElasticsearchException elasticsearchException) {
+        try {
+            final ParsedElasticsearchException parsedException = ParsedElasticsearchException.from(elasticsearchException.getMessage());
+            if (parsedException.type().equals("circuit_breaking_exception")) {
+                ParsedElasticsearchException parsedCause = ParsedElasticsearchException.from(elasticsearchException.getRootCause().getMessage());
+                return parsedCause.reason().contains("[parent] Data too large");
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return false;
+    }
+
     public static RequestOptions withTimeout(RequestOptions requestOptions, Duration timeout) {
         final RequestConfig.Builder requestConfigBuilder = (requestOptions == null || requestOptions.getRequestConfig() == null)
                 ? RequestConfig.custom()

graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/OpenSearchClient.java

@@ -46,6 +46,7 @@
 import org.graylog2.indexer.InvalidWriteTargetException;
 import org.graylog2.indexer.MapperParsingException;
 import org.graylog2.indexer.MasterNotDiscoveredException;
+import org.graylog2.indexer.ParentCircuitBreakingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,6 +204,9 @@ public static RuntimeException exceptionFrom(Exception e, String errorMessage) {
             if (isMapperParsingExceptionException(openSearchException)) {
                 return new MapperParsingException(openSearchException.getMessage());
             }
+            if (isParentCircuitBreakingException(openSearchException)) {
+                return new ParentCircuitBreakingException(openSearchException.getMessage());
+            }
         } else if (e instanceof IOException && e.getCause() instanceof ContentTooLongException) {
             return new BatchSizeTooLargeException(e.getMessage());
         }
@@ -255,6 +259,19 @@ private static boolean isBatchSizeTooLargeException(OpenSearchException openSear
         return false;
     }
 
+    private static boolean isParentCircuitBreakingException(OpenSearchException openSearchException) {
+        try {
+            final ParsedOpenSearchException parsedException = ParsedOpenSearchException.from(openSearchException.getMessage());
+            if (parsedException.type().equals("circuit_breaking_exception")) {
+                ParsedOpenSearchException parsedCause = ParsedOpenSearchException.from(openSearchException.getRootCause().getMessage());
+                return parsedCause.reason().contains("[parent] Data too large");
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return false;
+    }
+
     public static RequestOptions withTimeout(RequestOptions requestOptions, Duration timeout) {
         final RequestConfig.Builder requestConfigBuilder = (requestOptions == null || requestOptions.getRequestConfig() == null)
                 ? RequestConfig.custom()

graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/OfficialOpensearchClient.java

@@ -24,6 +24,7 @@
 import org.graylog2.indexer.InvalidWriteTargetException;
 import org.graylog2.indexer.MapperParsingException;
 import org.graylog2.indexer.MasterNotDiscoveredException;
+import org.graylog2.indexer.ParentCircuitBreakingException;
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.ErrorCause;
@@ -145,6 +146,9 @@ public static RuntimeException mapException(Throwable t, String message) {
             if (isMapperParsingExceptionException(openSearchException)) {
                 return new MapperParsingException(openSearchException.getMessage());
             }
+            if (isParentCircuitBreakingException(openSearchException)) {
+                return new ParentCircuitBreakingException(openSearchException.getMessage());
+            }
         } else if (t instanceof ResponseException responseException) {
             if (responseException.status() == 429) {
                 return new BatchSizeTooLargeException(t.getMessage());
@@ -194,4 +198,17 @@ private static boolean isBatchSizeTooLargeException(OpenSearchException openSear
         }
         return false;
     }
+
+    private static boolean isParentCircuitBreakingException(OpenSearchException openSearchException) {
+        try {
+            final ParsedOpenSearchException parsedException = ParsedOpenSearchException.from(openSearchException.getMessage());
+            if (parsedException.type().equals("circuit_breaking_exception")) {
+                ParsedOpenSearchException parsedCause = ParsedOpenSearchException.from(openSearchException.getCause().getMessage());
+                return parsedCause.reason().contains("[parent] Data too large");
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return false;
+    }
 }