root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Move Elasticsearch health auto-configuration into spring-boot-elasticsearch 

Issue: 46091
This commit is contained in:
Andy Wilkinson 2025-05-16 15:27:37 +01:00 committed by Phillip Webb
parent b4ac84807d
commit 949cc34bba
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -59,28 +59,6 @@
"description": "Whether to enable disk space health check.",
"defaultValue": true
},
{
"name": "management.health.elasticsearch.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Elasticsearch health check.",
"defaultValue": true
},
{
"name": "management.health.elasticsearch.indices",
"type": "java.util.List<java.lang.String>",
"description": "Comma-separated index names.",
"deprecation": {
"level": "error"
}
},
{
"name": "management.health.elasticsearch.response-timeout",
"type": "java.time.Duration",
"description": "Time to wait for a response from the cluster.",
"deprecation": {
"level": "error"
}
},
{
"name": "management.health.influxdb.enabled",
"type": "java.lang.Boolean",

1
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -13,7 +13,6 @@ org.springframework.boot.actuate.autoconfigure.data.mongo.MongoHealthContributor
org.springframework.boot.actuate.autoconfigure.data.mongo.MongoReactiveHealthContributorAutoConfiguration
org.springframework.boot.actuate.autoconfigure.data.redis.RedisHealthContributorAutoConfiguration
org.springframework.boot.actuate.autoconfigure.data.redis.RedisReactiveHealthContributorAutoConfiguration
org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticsearchRestHealthContributorAutoConfiguration
org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration

2
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/data/elasticsearch/ElasticsearchReactiveHealthContributorAutoConfigurationTests.java
View File

@ -18,12 +18,12 @@ package org.springframework.boot.actuate.autoconfigure.data.elasticsearch;
import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticsearchRestHealthContributorAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.data.elasticsearch.actuate.health.ElasticsearchReactiveHealthIndicator;
import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.elasticsearch.actuate.health.ElasticsearchRestClientHealthIndicator;
import org.springframework.boot.elasticsearch.actuate.health.autoconfigure.ElasticsearchRestHealthContributorAutoConfiguration;
import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration;
import org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

2
spring-boot-project/spring-boot-elasticsearch/build.gradle
View File

@ -30,7 +30,7 @@ dependencies {
api(project(":spring-boot-project:spring-boot"))
api("org.elasticsearch.client:elasticsearch-rest-client")
optional(project(":spring-boot-project:spring-boot-actuator"))
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
optional(project(":spring-boot-project:spring-boot-jsonb"))
optional(project(":spring-boot-project:spring-boot-reactor"))

8
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchRestHealthContributorAutoConfiguration.java → spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/actuate/health/autoconfigure/ElasticsearchRestHealthContributorAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.actuate.autoconfigure.elasticsearch;
package org.springframework.boot.elasticsearch.actuate.health.autoconfigure;
import org.elasticsearch.client.RestClient;
@ -28,6 +28,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.elasticsearch.actuate.health.ElasticsearchRestClientHealthIndicator;
import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration;
import org.springframework.context.annotation.Bean;
/**
@ -37,9 +38,8 @@ import org.springframework.context.annotation.Bean;
* @author Artsiom Yudovin
* @since 2.1.1
*/
@AutoConfiguration(
afterName = "org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration")
@ConditionalOnClass({ RestClient.class, ElasticsearchRestClientHealthIndicator.class })
@AutoConfiguration(after = ElasticsearchRestClientAutoConfiguration.class)
@ConditionalOnClass({ RestClient.class, ConditionalOnEnabledHealthIndicator.class })
@ConditionalOnBean(RestClient.class)
@ConditionalOnEnabledHealthIndicator("elasticsearch")
public class ElasticsearchRestHealthContributorAutoConfiguration

4
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/package-info.java → spring-boot-project/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/actuate/health/autoconfigure/package-info.java
View File

@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for actuator Elasticsearch concerns.
* Auto-configuration for Elasticsearch health integration.
*/
package org.springframework.boot.actuate.autoconfigure.elasticsearch;
package org.springframework.boot.elasticsearch.actuate.health.autoconfigure;

22
spring-boot-project/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -1,6 +1,28 @@
{
"groups": [],
"properties": [
{
"name": "management.health.elasticsearch.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable Elasticsearch health check.",
"defaultValue": true
},
{
"name": "management.health.elasticsearch.indices",
"type": "java.util.List<java.lang.String>",
"description": "Comma-separated index names.",
"deprecation": {
"level": "error"
}
},
{
"name": "management.health.elasticsearch.response-timeout",
"type": "java.time.Duration",
"description": "Time to wait for a response from the cluster.",
"deprecation": {
"level": "error"
}
},
{
"name": "spring.elasticsearch.jest.connection-timeout",
"type": "java.time.Duration",

3
spring-boot-project/spring-boot-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1,3 +1,4 @@
org.springframework.boot.elasticsearch.actuate.health.autoconfigure.ElasticsearchRestHealthContributorAutoConfiguration
org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchClientAutoConfiguration
org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration
org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration
org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration

2
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchRestHealthContributorAutoConfigurationTests.java → spring-boot-project/spring-boot-elasticsearch/src/test/java/org/springframework/boot/elasticsearch/actuate/health/autoconfigure/ElasticsearchRestHealthContributorAutoConfigurationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.actuate.autoconfigure.elasticsearch;
package org.springframework.boot.elasticsearch.actuate.health.autoconfigure;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;