feat: moved healthCheck.enabled property to Elasticsearch/OpensearchP…

…roperties

to better reflect that health check is turned off for ES/OS, not Operate itself

(cherry picked from commit 1555c02)

# Conflicts:
#	operate/common/src/main/java/io/camunda/operate/connect/OpensearchConnector.java

operate/common/src/main/java/io/camunda/operate/connect/ElasticsearchConnector.java

@@ -114,7 +114,7 @@ public ElasticsearchClient elasticsearchClient() {
     // And create the API client
     elasticsearchClient = new ElasticsearchClient(transport);
 
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getElasticsearch().isHealthCheckEnabled()) {
       if (!checkHealth(elasticsearchClient)) {
         LOGGER.warn("Elasticsearch cluster is not accessible");
       } else {
@@ -193,7 +193,7 @@ public RestHighLevelClient createEsClient(final ElasticsearchProperties elsConfi
         new RestHighLevelClientBuilder(restClientBuilder.build())
             .setApiCompatibilityMode(true)
             .build();
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getElasticsearch().isHealthCheckEnabled()) {
       if (!checkHealth(esClient)) {
         LOGGER.warn("Elasticsearch cluster is not accessible");
       } else {

operate/common/src/main/java/io/camunda/operate/connect/OpensearchConnector.java

@@ -99,7 +99,7 @@ public OpensearchConnector(
   @Primary
   public OpenSearchClient openSearchClient() {
     final OpenSearchClient openSearchClient = createOsClient(operateProperties.getOpensearch());
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getOpensearch().isHealthCheckEnabled()) {
       try {
         final HealthResponse response = openSearchClient.cluster().health();
         LOGGER.info("OpenSearch cluster health: {}", response.status());
@@ -116,7 +116,7 @@ public OpenSearchClient openSearchClient() {
   public OpenSearchAsyncClient openSearchAsyncClient() {
     final OpenSearchAsyncClient openSearchClient =
         createAsyncOsClient(operateProperties.getOpensearch());
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getOpensearch().isHealthCheckEnabled()) {
       final CompletableFuture<HealthResponse> healthResponse;
       try {
         healthResponse = openSearchClient.cluster().health();
@@ -172,7 +172,7 @@ public OpenSearchAsyncClient createAsyncOsClient(final OpensearchProperties osCo
     final OpenSearchTransport transport = builder.build();
     final OpenSearchAsyncClient openSearchAsyncClient = new OpenSearchAsyncClient(transport);
 
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getOpensearch().isHealthCheckEnabled()) {
       final CompletableFuture<HealthResponse> healthResponse;
       try {
         healthResponse = openSearchAsyncClient.cluster().health();
@@ -240,7 +240,7 @@ public OpenSearchClient createOsClient(final OpensearchProperties osConfig) {
 
     final OpenSearchTransport transport = builder.build();
     final OpenSearchClient openSearchClient = new ExtendedOpenSearchClient(transport);
-    if (operateProperties.isHealthCheckEnabled()) {
+    if (operateProperties.getOpensearch().isHealthCheckEnabled()) {
       try {
         final HealthResponse response = openSearchClient.cluster().health();
         LOGGER.info("OpenSearch cluster health: {}", response.status());

operate/common/src/main/java/io/camunda/operate/property/ElasticsearchProperties.java

@@ -46,6 +46,9 @@ public class ElasticsearchProperties {
 
   private boolean createSchema = true;
 
+  /** Indicates whether operate does a proper health check for ES clusters. */
+  private boolean healthCheckEnabled = true;
+
   private String url;
   private String username;
   private String password;
@@ -125,6 +128,14 @@ public void setCreateSchema(final boolean createSchema) {
     this.createSchema = createSchema;
   }
 
+  public boolean isHealthCheckEnabled() {
+    return healthCheckEnabled;
+  }
+
+  public void setHealthCheckEnabled(final boolean healthCheckEnabled) {
+    this.healthCheckEnabled = healthCheckEnabled;
+  }
+
   public String getPassword() {
     return password;
   }

operate/common/src/main/java/io/camunda/operate/property/OpensearchProperties.java

@@ -46,6 +46,9 @@ public class OpensearchProperties {
 
   private boolean createSchema = true;
 
+  /** Indicates whether operate does a proper health check for ES/OS clusters. */
+  private boolean healthCheckEnabled = true;
+
   private String url;
   private String username;
   private String password;
@@ -127,6 +130,14 @@ public void setCreateSchema(final boolean createSchema) {
     this.createSchema = createSchema;
   }
 
+  public boolean isHealthCheckEnabled() {
+    return healthCheckEnabled;
+  }
+
+  public void setHealthCheckEnabled(final boolean healthCheckEnabled) {
+    this.healthCheckEnabled = healthCheckEnabled;
+  }
+
   public String getPassword() {
     return password;
   }

operate/common/src/main/java/io/camunda/operate/property/OperateProperties.java

@@ -49,9 +49,6 @@ public class OperateProperties {
   /** Indicates, whether CSRF prevention is enabled. */
   private boolean csrfPreventionEnabled = true;
 
-  /** Indicates whether operate does a proper health check for ES/OS clusters. */
-  private boolean healthCheckEnabled = true;
-
   /** Standard user data */
   private String userId = "demo";
 
@@ -155,14 +152,6 @@ public void setCsrfPreventionEnabled(final boolean csrfPreventionEnabled) {
     this.csrfPreventionEnabled = csrfPreventionEnabled;
   }
 
-  public boolean isHealthCheckEnabled() {
-    return healthCheckEnabled;
-  }
-
-  public void setHealthCheckEnabled(final boolean healthCheckEnabled) {
-    this.healthCheckEnabled = healthCheckEnabled;
-  }
-
   public OperateElasticsearchProperties getElasticsearch() {
     return elasticsearch;
   }

operate/common/src/test/java/io/camunda/operate/connect/ElasticsearchConnectorTest.java

@@ -25,7 +25,7 @@ class ElasticsearchConnectorTest {
   public void shouldNotDoClusterHealthCheckWhenDisabled() {
     final OperateProperties operateProperties = new OperateProperties();
     final OperateElasticsearchProperties esProperties = new OperateElasticsearchProperties();
-    operateProperties.setHealthCheckEnabled(false);
+    esProperties.setHealthCheckEnabled(false);
     operateProperties.setElasticsearch(esProperties);
     final ElasticsearchConnector connector = spy(new ElasticsearchConnector(operateProperties));
 

operate/common/src/test/java/io/camunda/operate/connect/OpensearchConnectorTest.java

@@ -94,8 +94,8 @@ public void asyncHasAwsCredentialsButShouldUseBasicAuth() {
   @Test
   public void shouldNotDoClusterHealthCheckWhenDisabled() {
     final OperateProperties operateProperties = new OperateProperties();
-    operateProperties.setHealthCheckEnabled(false);
     final OperateOpensearchProperties osProperties = new OperateOpensearchProperties();
+    osProperties.setHealthCheckEnabled(false);
     operateProperties.setOpensearch(osProperties);
     final OpensearchConnector connector = spy(new OpensearchConnector(operateProperties, mock()));
     doReturn(mock(HttpAsyncClientBuilder.class)).when(connector).configureHttpClient(any(), any());

operate/schema/src/main/java/io/camunda/operate/management/IndicesHealthIndicator.java

@@ -45,18 +45,10 @@ public Health getHealth(final boolean includeDetails) {
   @Override
   public Health health() {
     LOGGER.debug("Indices check is called");
-    if (isClusterHealthy() && indicesCheck.indicesArePresent()) {
+    if (indicesCheck.isHealthy() && indicesCheck.indicesArePresent()) {
       return Health.up().build();
     } else {
       return Health.down().build();
     }
   }
-
-  private boolean isClusterHealthy() {
-    if (!properties.isHealthCheckEnabled()) {
-      LOGGER.warn("Cluster health check is disabled.");
-      return true;
-    }
-    return indicesCheck.isHealthy();
-  }
 }

operate/schema/src/main/java/io/camunda/operate/schema/elasticsearch/ElasticsearchSchemaManager.java

@@ -165,7 +165,12 @@ public void refresh(final String indexPattern) {
 
   @Override
   public boolean isHealthy() {
-    return retryElasticsearchClient.isHealthy();
+    if (operateProperties.getElasticsearch().isHealthCheckEnabled()) {
+      return retryElasticsearchClient.isHealthy();
+    } else {
+      LOGGER.warn("OpenSearch cluster health check is disabled.");
+      return true;
+    }
   }
 
   @Override

operate/schema/src/main/java/io/camunda/operate/schema/opensearch/OpensearchSchemaManager.java

@@ -199,7 +199,12 @@ public void refresh(final String indexPattern) {
 
   @Override
   public boolean isHealthy() {
-    return richOpenSearchClient.cluster().isHealthy();
+    if (operateProperties.getOpensearch().isHealthCheckEnabled()) {
+      return richOpenSearchClient.cluster().isHealthy();
+    } else {
+      LOGGER.warn("OpenSearch cluster health check is disabled.");
+      return true;
+    }
   }
 
   @Override