diff --git a/changelog/unreleased/pr-14063.toml b/changelog/unreleased/pr-14063.toml new file mode 100644 index 000000000000..fad2602c996c --- /dev/null +++ b/changelog/unreleased/pr-14063.toml @@ -0,0 +1,4 @@ +type = "fixed" +message = "Fix connectivity check when Elasticsearch/OpenSearch is not available." + +pulls = ["14063"] diff --git a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java index c114206e70f0..ff9c68762c88 100644 --- a/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java +++ b/graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/ClusterAdapterES7.java @@ -168,7 +168,7 @@ public boolean isConnected() { try { final ClusterHealthResponse result = client.execute((c, requestOptions) -> c.cluster().health(request, requestOptions)); return result.getNumberOfDataNodes() > 0; - } catch (ElasticsearchException e) { + } catch (org.graylog.shaded.elasticsearch7.org.elasticsearch.ElasticsearchException e) { if (LOG.isDebugEnabled()) { LOG.error(e.getMessage(), e); } diff --git a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java index 42a16d4b9db0..d7eeade4de86 100644 --- a/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java +++ b/graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/ClusterAdapterOS2.java @@ -169,7 +169,7 @@ public boolean isConnected() { try { final ClusterHealthResponse result = client.execute((c, requestOptions) -> c.cluster().health(request, requestOptions)); return result.getNumberOfDataNodes() > 0; - } catch (ElasticsearchException e) { + } catch (OpenSearchException e) { if (LOG.isDebugEnabled()) { LOG.error(e.getMessage(), e); }