This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 0525417abe Remove grafana connector and rename server to datanode in
distribution package (#6477)
0525417abe is described below
commit 0525417abea6bcfb4648284194f2fb950f28b4ff
Author: Haonan <[email protected]>
AuthorDate: Tue Jun 28 12:20:20 2022 +0800
Remove grafana connector and rename server to datanode in distribution
package (#6477)
---
distribution/pom.xml | 6 ++----
distribution/src/assembly/all.xml | 12 ------------
distribution/src/assembly/{server.xml => datanode.xml} | 2 +-
docker/src/main/Dockerfile-single | 2 +-
docker/src/main/Dockerfile-single-influxdb | 2 +-
docker/src/main/Dockerfile-single-tc | 2 +-
6 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c9bd405b0d..8afdbf586c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -47,10 +47,9 @@
<configuration>
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
-
<descriptor>src/assembly/server.xml</descriptor>
+
<descriptor>src/assembly/datanode.xml</descriptor>
<descriptor>src/assembly/confignode.xml</descriptor>
<descriptor>src/assembly/cli.xml</descriptor>
-
<descriptor>src/assembly/grafana-connector.xml</descriptor>
<descriptor>src/assembly/client-cpp.xml</descriptor>
<descriptor>src/assembly/grafana-plugin.xml</descriptor>
<descriptor>src/assembly/library-udf.xml</descriptor>
@@ -84,10 +83,9 @@
<directory>${project.build.directory}</directory>
<includes>
<include>apache-iotdb-${project.version}-all-bin.zip</include>
-
<include>apache-iotdb-${project.version}-server-bin.zip</include>
+
<include>apache-iotdb-${project.version}-datanode-bin.zip</include>
<include>apache-iotdb-${project.version}-cli-bin.zip</include>
<include>apache-iotdb-${project.version}-confignode-bin.zip</include>
-
<include>apache-iotdb-${project.version}-grafana-connector-bin.zip</include>
<include>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin.zip</include>
<include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
<include>apache-iotdb-${project.version}-library-udf-bin.zip</include>
diff --git a/distribution/src/assembly/all.xml
b/distribution/src/assembly/all.xml
index aa17f03e5d..e5909b2415 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -44,14 +44,6 @@
</excludes>
</unpackOptions>
</dependencySet>
- <dependencySet>
- <includes>
- <include>*:iotdb-grafana-connector:war:*</include>
- </includes>
- <outputDirectory>tools/grafana/</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
@@ -113,10 +105,6 @@
</fileSet>
</fileSets>
<files>
- <file>
-
<source>${maven.multiModuleProjectDirectory}/grafana-connector/src/main/resources/application.properties</source>
- <destName>tools/grafana/application.properties</destName>
- </file>
<file>
<source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source>
<destName>datanode/conf/datanode-env.sh</destName>
diff --git a/distribution/src/assembly/server.xml
b/distribution/src/assembly/datanode.xml
similarity index 99%
rename from distribution/src/assembly/server.xml
rename to distribution/src/assembly/datanode.xml
index e774d89711..0b923afa83 100644
--- a/distribution/src/assembly/server.xml
+++ b/distribution/src/assembly/datanode.xml
@@ -20,7 +20,7 @@
-->
<assembly>
- <id>server-bin</id>
+ <id>datanode-bin</id>
<formats>
<format>dir</format>
<format>zip</format>
diff --git a/docker/src/main/Dockerfile-single
b/docker/src/main/Dockerfile-single
index cb1b7c0db1..3c1629cd86 100644
--- a/docker/src/main/Dockerfile-single
+++ b/docker/src/main/Dockerfile-single
@@ -21,7 +21,7 @@
FROM openjdk:11-jre-slim
-ADD distribution/target/apache-iotdb-*-server-bin.zip /
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
RUN apt update \
&& apt install lsof dos2unix procps unzip -y \
diff --git a/docker/src/main/Dockerfile-single-influxdb
b/docker/src/main/Dockerfile-single-influxdb
index a0f77d41e2..8319075d5b 100644
--- a/docker/src/main/Dockerfile-single-influxdb
+++ b/docker/src/main/Dockerfile-single-influxdb
@@ -21,7 +21,7 @@
FROM openjdk:11-jre-slim
-ADD distribution/target/apache-iotdb-*-server-bin.zip /
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
RUN apt update \
&& apt install lsof dos2unix procps unzip -y \
diff --git a/docker/src/main/Dockerfile-single-tc
b/docker/src/main/Dockerfile-single-tc
index 71f785fef9..d4dd297c74 100644
--- a/docker/src/main/Dockerfile-single-tc
+++ b/docker/src/main/Dockerfile-single-tc
@@ -21,7 +21,7 @@
FROM openjdk:11-jre-slim
-ADD distribution/target/apache-iotdb-*-server-bin.zip /
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
RUN apt update \
&& apt install lsof dos2unix procps unzip iproute2 iputils-ping -y \
