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

Refactored all usages of directories used by datanode and managed opensearch (#16905)

Browse Source 
* Refactored all usages of directories used by datanode and managed opensearch

* add datanode directories preflight check

* code cleanup

* fixed OpensearchSecurityConfiguration

* Fixed DatanodeDirectories logging

* code cleanup
This commit is contained in:
Tomas Dvorak
2023-10-13 08:16:58 +02:00
committed by GitHub
parent d575869444
commit bede9d3206
23 changed files with 458 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data-node/src/main/java/org/graylog/datanode/process/OpensearchConfiguration.java
View File

@@ -17,18 +17,19 @@
package org.graylog.datanode.process;
import org.apache.commons.exec.OS;
import org.graylog.datanode.OpensearchDistribution;
import org.graylog.datanode.configuration.DatanodeDirectories;
import org.graylog.datanode.configuration.variants.OpensearchSecurityConfiguration;
import org.graylog.datanode.management.Environment;
import org.graylog.shaded.opensearch2.org.apache.http.HttpHost;
import java.nio.file.Path;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public record OpensearchConfiguration(
Path opensearchDir,
Path opensearchConfigDir,
OpensearchDistribution opensearchDistribution,
DatanodeDirectories datanodeDirectories,
String bindAddress,
String hostname,
int httpPort,
@@ -80,7 +81,7 @@ public record OpensearchConfiguration(
public Environment getEnv() {
final Environment env = new Environment(System.getenv());
env.put("OPENSEARCH_PATH_CONF", opensearchConfigDir.resolve("opensearch").toAbsolutePath().toString());
env.put("OPENSEARCH_PATH_CONF", datanodeDirectories.getOpensearchProcessConfigurationDir().toString());
return env;
}