Skip to content

Fix the Elasticsearch Health Status #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanitha1822 wants to merge 2 commits into
base: release-3.8.2
Choose a base branch
from
Open

Fix the Elasticsearch Health Status #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42485fe
fix: authenticate elasticsearch health probes against secured cluster
vanitha1822 Jul 9, 2026
2913588
fix: pom version
vanitha1822 Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.common.identity</groupId>
<artifactId>identity-api</artifactId>
<version>3.8.0</version>
<version>3.8.2</version>

<packaging>war</packaging>

Expand Down
37 changes: 31 additions & 6 deletions src/main/java/com/iemr/common/identity/service/health/HealthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@
import javax.management.ObjectName;
import jakarta.annotation.PostConstruct;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -116,6 +120,8 @@ public class HealthService {
private final boolean elasticsearchEnabled;
private final boolean elasticsearchIndexingRequired;
private final String elasticsearchTargetIndex;
private final String elasticsearchUsername;
private final String elasticsearchPassword;
private static final ObjectMapper objectMapper = new ObjectMapper();

private RestClient elasticsearchRestClient;
Expand All @@ -139,7 +145,9 @@ public HealthService(
@Value("${elasticsearch.port:9200}") int elasticsearchPort,
@Value("${elasticsearch.enabled:false}") boolean elasticsearchEnabled,
@Value("${elasticsearch.target-index:amrit_data}") String elasticsearchTargetIndex,
@Value("${elasticsearch.indexing-required:false}") boolean elasticsearchIndexingRequired) {
@Value("${elasticsearch.indexing-required:false}") boolean elasticsearchIndexingRequired,
@Value("${elasticsearch.username:}") String elasticsearchUsername,
@Value("${elasticsearch.password:}") String elasticsearchPassword) {

this.dataSource = dataSource;
this.advancedCheckExecutor = Executors.newSingleThreadExecutor(r -> {
Expand All @@ -153,6 +161,8 @@ public HealthService(
this.elasticsearchEnabled = elasticsearchEnabled;
this.elasticsearchIndexingRequired = elasticsearchIndexingRequired;
this.elasticsearchTargetIndex = (elasticsearchTargetIndex != null) ? elasticsearchTargetIndex : "amrit_data";
this.elasticsearchUsername = elasticsearchUsername;
this.elasticsearchPassword = elasticsearchPassword;
}

@PostConstruct
Expand All @@ -176,15 +186,30 @@ public void cleanup() {

private void initializeElasticsearchClient() {
try {
this.elasticsearchRestClient = RestClient.builder(
RestClientBuilder builder = RestClient.builder(
new HttpHost(elasticsearchHost, elasticsearchPort, "http"))
.setRequestConfigCallback(cb -> cb
.setConnectTimeout(ELASTICSEARCH_CONNECT_TIMEOUT_MS)
.setSocketTimeout(ELASTICSEARCH_SOCKET_TIMEOUT_MS))
.build();
.setSocketTimeout(ELASTICSEARCH_SOCKET_TIMEOUT_MS));

// Attach Basic Auth when credentials are configured, so the health
// probes authenticate against a security-enabled cluster (matches
// ElasticsearchConfig). When username is blank (security disabled),
// the client stays unauthenticated.
if (elasticsearchUsername != null && !elasticsearchUsername.isEmpty()) {
BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(
AuthScope.ANY,
new UsernamePasswordCredentials(elasticsearchUsername, elasticsearchPassword));
builder.setHttpClientConfigCallback(httpClientBuilder ->
httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
}

this.elasticsearchRestClient = builder.build();
this.elasticsearchClientReady = true;
logger.info("Elasticsearch client initialized (connect/socket timeout: {}ms)",
ELASTICSEARCH_CONNECT_TIMEOUT_MS);
logger.info("Elasticsearch client initialized (connect/socket timeout: {}ms, auth: {})",
ELASTICSEARCH_CONNECT_TIMEOUT_MS,
(elasticsearchUsername != null && !elasticsearchUsername.isEmpty()) ? "enabled" : "disabled");
} catch (Exception e) {
logger.warn("Failed to initialize Elasticsearch client: {}", e.getMessage());
this.elasticsearchClientReady = false;
Expand Down
Loading