Skip to content

enable protocol choice, so we can enable https #3630

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

Merged
shroffk merged 1 commit into from
Nov 10, 2025
Merged

enable protocol choice, so we can enable https #3630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion ...re/src/main/java/org/phoebus/service/saveandrestore/persistence/config/ElasticConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ public class ElasticConfig {
@Value("${elasticsearch.authorization.password}")
private String password;

@Value("${elasticsearch.http.protocol:http}")
private String protocol;


private ElasticsearchClient client;
private static final AtomicBoolean esInitialized = new AtomicBoolean();
Expand All @@ -112,7 +115,7 @@ public class ElasticConfig {
public ElasticsearchClient getClient() {
if (client == null) {
// Create the low-level client
RestClientBuilder clientBuilder = RestClient.builder(new HttpHost(host, port));
RestClientBuilder clientBuilder = RestClient.builder(new HttpHost(host, port, protocol));

// Configure authentication
if (!authorizationHeader.isEmpty()) {
Expand Down
1 change: 1 addition & 0 deletions services/save-and-restore/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ server.port=8080
# Elasticsearch connection parameters
elasticsearch.network.host=localhost
elasticsearch.http.port=9200
elasticsearch.http.protocol=http

# The value for the `Authorization` header used in requests to the Elasticsearch server.
# This header supports token-based or API key-based authentication.
Expand Down