opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Opensearch dist dir autodetection (#15216)

Browse Source 
* Opensearch dist dir autodetection

* Add arm64 as supported architecture for datanode

* Added changelog
This commit is contained in:
Tomas Dvorak
2023-04-14 09:53:33 +02:00
committed by GitHub
parent 0ce8e0b5f5
commit c36a63495d
11 changed files with 306 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
data-node/src/main/java/org/graylog/datanode/Configuration.java
View File

@@ -49,8 +49,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import static org.graylog2.shared.utilities.StringUtils.f;
/**
* Helper class to hold configuration of Graylog
*/
@@ -74,10 +72,7 @@ public class Configuration extends BaseConfiguration {
private boolean disableNativeSystemStatsCollector = false;
@Parameter(value = "opensearch_location")
private String opensearchLocation = "dist/opensearch-2.5.0";
@Parameter(value = "opensearch_version")
private String opensearchVersion = "2.5.0";
private String opensearchDistributionRoot = "dist";
@Parameter(value = "opensearch_data_location")
private String opensearchDataLocation = "data";
@@ -153,30 +148,14 @@ public class Configuration extends BaseConfiguration {
return isLeader;
}
public String getOpensearchDistributionRoot() {
return opensearchDistributionRoot;
}
public String getOpensearchConfigLocation() {
return opensearchConfigLocation;
}
public String getOpensearchLocation() {
// If the configured location exists, just use it.
if (Files.exists(Path.of(opensearchLocation))) {
return opensearchLocation;
}
// Otherwise check if the architecture dependent distribution exists.
final var osArch = System.getProperty("os.arch");
return switch (osArch) {
case "amd64" -> f("%s-linux-x64", opensearchLocation);
case "aarch64" -> f("%s-linux-aarch64", opensearchLocation);
default ->
throw new UnsupportedOperationException("Unsupported OpenSearch distribution architecture: " + osArch);
};
}
public String getOpensearchVersion() {
return opensearchVersion;
}
public String getOpensearchDataLocation() {
return opensearchDataLocation;
}