This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch metric_ssl in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 12069b0dd657b11a90501fbc0e9533e5b5de8d6f Author: HTHou <[email protected]> AuthorDate: Wed Sep 10 10:23:05 2025 +0800 finish config --- .../org/apache/iotdb/metrics/config/MetricConfig.java | 16 +++++++++++----- .../iotdb/metrics/config/MetricConfigDescriptor.java | 18 ++++++++++++++++++ .../reporter/prometheus/PrometheusReporter.java | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java index 31a41dd4eac..26529b3e080 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java @@ -79,11 +79,11 @@ public class MetricConfig { private long upTimeInNs = 0; private String internalDatabase = "root.__system"; - private boolean enableSSL = true; - private String keyStorePath = "/Users/ht/.keystore"; - private String keyStorePassword = "123456"; - private String trustStorePath = "/Users/ht/.truststore"; - private String trustStorePassword = "123456"; + private boolean enableSSL = false; + private String keyStorePath = ""; + private String keyStorePassword = ""; + private String trustStorePath = ""; + private String trustStorePassword = ""; public MetricConfig() { // try to get pid of iotdb instance @@ -270,6 +270,12 @@ public class MetricConfig { prometheusReporterPassword = newMetricConfig.getPrometheusReporterPassword(); internalReporterType = newMetricConfig.getInternalReportType(); + enableSSL = newMetricConfig.isEnableSSL(); + keyStorePath = newMetricConfig.getKeyStorePath(); + keyStorePassword = newMetricConfig.getKeyStorePassword(); + trustStorePath = newMetricConfig.getTrustStorePath(); + trustStorePassword = newMetricConfig.getTrustStorePassword(); + iotdbReporterConfig.copy(newMetricConfig.getIoTDBReporterConfig()); } diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java index 2cc5c2a986d..83c30077a53 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java @@ -124,6 +124,24 @@ public class MetricConfigDescriptor { loadConfig.getPrometheusReporterPassword(), properties)); + loadConfig.setEnableSSL( + Boolean.parseBoolean( + getPropertyWithoutPrefix( + "metric_enable_ssl", String.valueOf(loadConfig.isEnableSSL()), properties))); + + loadConfig.setKeyStorePath( + getPropertyWithoutPrefix("key_store_path", loadConfig.getKeyStorePath(), properties)); + + loadConfig.setKeyStorePassword( + getPropertyWithoutPrefix("key_store_pwd", loadConfig.getKeyStorePassword(), properties)); + + loadConfig.setTrustStorePath( + getPropertyWithoutPrefix("trust_store_path", loadConfig.getTrustStorePath(), properties)); + + loadConfig.setTrustStorePassword( + getPropertyWithoutPrefix( + "trust_store_pwd", loadConfig.getTrustStorePassword(), properties)); + IoTDBReporterConfig reporterConfig = loadConfig.getIoTDBReporterConfig(); reporterConfig.setHost( getProperty( diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus/PrometheusReporter.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus/PrometheusReporter.java index 74d5f6f9024..1e0c33d61c2 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus/PrometheusReporter.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus/PrometheusReporter.java @@ -19,7 +19,6 @@ package org.apache.iotdb.metrics.reporter.prometheus; -import io.netty.handler.ssl.ClientAuth; import org.apache.iotdb.metrics.AbstractMetricManager; import org.apache.iotdb.metrics.config.MetricConfig; import org.apache.iotdb.metrics.config.MetricConfigDescriptor; @@ -40,6 +39,7 @@ import io.netty.channel.ChannelOption; import io.netty.channel.group.DefaultChannelGroup; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpResponseStatus; +import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.util.concurrent.GlobalEventExecutor;
