This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch feature/metric2021 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit effd6da7eada12a66863b0a4dca34aa4829efdf8 Author: xiangdong huang <[email protected]> AuthorDate: Fri Feb 26 15:59:47 2021 +0800 move iotdb-metric.properties tometrics/interface/ --- .../assembly/resources/conf/iotdb-metric.properties | 21 ++++++++++++++++++++- server/src/assembly/server.xml | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/server/src/assembly/resources/conf/iotdb-metric.properties b/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.properties similarity index 54% rename from server/src/assembly/resources/conf/iotdb-metric.properties rename to metrics/interface/src/main/assembly/resources/conf/iotdb-metric.properties index 4fbc6bb..fc13326 100644 --- a/server/src/assembly/resources/conf/iotdb-metric.properties +++ b/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.properties @@ -17,13 +17,32 @@ # under the License. # +# whether enable the module enable_metric=true + +# can be multiple reporter, e.g., jmx,prometheus,iotdb metric_reporter_list=jmx + push_period_in_second=5 + + +######################################################## +# # +# if the reporter is prometheus, # +# then the following must be set # +# # +######################################################## prometheus_exporter_port=8090 + +######################################################## +# # +# if the reporter is iotdb, # +# then the following must be set # +# # +######################################################## iotdb_ip=127.0.0.1 iotdb_port=6667 -iotdb_sg=iotdb +iotdb_sg=_sysmetric iotdb_user=root iotdb_passwd=root diff --git a/server/src/assembly/server.xml b/server/src/assembly/server.xml index 4db5225..f4cd959 100644 --- a/server/src/assembly/server.xml +++ b/server/src/assembly/server.xml @@ -36,5 +36,9 @@ <directory>src/assembly/resources</directory> <outputDirectory>${file.separator}</outputDirectory> </fileSet> + <fileSet> + <directory>${maven.multiModuleProjectDirectory}/metrics/interface/src/assembly/resources</directory> + <outputDirectory>${file.separator}</outputDirectory> + </fileSet> </fileSets> </assembly>
