Skip to content

I
Iotdb

apache / Iotdb
10 个月 前同步成功

通知 25
Star 3344
Fork 916
I
Iotdb

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 489be30b 编写于 作者: C Christofer Dutz 提交者： GitHub
浏览文件
操作

Feature/streamlined grafana plugin profile (#10907)

上级 05432f6d
隐藏空白更改
内联 并排
Showing with 162 addition and 116 deletion
README.md
浏览文件 @ 489be30b
...@@ -127,17 +127,11 @@ Make sure `Java` is installed, if it's missing, simply install it via: ...@@ -127,17 +127,11 @@ Make sure `Java` is installed, if it's missing, simply install it via:
#### OpenSSL header files #### OpenSSL header files
sudo apt -y install libssl-dev
#### OpenSSL
Usually OpenSSL is already installed, however it's missing the header files we need to compile. Usually OpenSSL is already installed, however it's missing the header files we need to compile.
So ensure these are installed: So ensure these are installed:
sudo apt install libssl-dev sudo apt install libssl-dev
When enabling the `compile-cpp`:
### Mac OS ### Mac OS
#### Git #### Git
...@@ -156,7 +150,7 @@ Then install `Homebrew` - If this hasn't been installed yet, as we are going to ...@@ -156,7 +150,7 @@ Then install `Homebrew` - If this hasn't been installed yet, as we are going to
#### Java #### Java
As soon as that's done install `Java` or newer - If this hasn't been installed yet: As soon as that's done install `Java`, if this hasn't been installed yet:
brew install java brew install java
......
distribution/pom.xml
浏览文件 @ 489be30b
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
<descriptor>src/assembly/datanode.xml</descriptor> <descriptor>src/assembly/datanode.xml</descriptor>
<descriptor>src/assembly/confignode.xml</descriptor> <descriptor>src/assembly/confignode.xml</descriptor>
<descriptor>src/assembly/cli.xml</descriptor> <descriptor>src/assembly/cli.xml</descriptor>
<descriptor>src/assembly/grafana-plugin.xml</descriptor>
<descriptor>src/assembly/library-udf.xml</descriptor> <descriptor>src/assembly/library-udf.xml</descriptor>
<descriptor>src/assembly/spark-connector.xml</descriptor> <descriptor>src/assembly/spark-connector.xml</descriptor>
</descriptors> </descriptors>
...@@ -84,7 +83,6 @@ ...@@ -84,7 +83,6 @@
<include>apache-iotdb-${project.version}-datanode-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}-cli-bin.zip</include>
<include>apache-iotdb-${project.version}-confignode-bin.zip</include> <include>apache-iotdb-${project.version}-confignode-bin.zip</include>
<include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
<include>apache-iotdb-${project.version}-library-udf-bin.zip</include> <include>apache-iotdb-${project.version}-library-udf-bin.zip</include>
<include>apache-iotdb-${project.version}-spark-connector-bin.zip</include> <include>apache-iotdb-${project.version}-spark-connector-bin.zip</include>
</includes> </includes>
...@@ -109,12 +107,6 @@ ...@@ -109,12 +107,6 @@
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-grafana-plugin</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-confignode</artifactId> <artifactId>iotdb-confignode</artifactId>
...@@ -125,24 +117,71 @@ ...@@ -125,24 +117,71 @@
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>library-udf</artifactId> <artifactId>library-udf</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector_2.11</artifactId> <artifactId>spark-iotdb-connector_2.11</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector_2.12</artifactId> <artifactId>spark-iotdb-connector_2.12</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>with-cpp</id> <id>with-cpp</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
<executions>
<!-- Package binaries-->
<execution>
<id>all-bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors combine.children="append">
<descriptor>src/assembly/client-cpp.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<!--
Create SHA512 checksum files for the release artifacts.
-->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>sign-source-release</id>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<includes combine.children="append">
<include>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin.zip</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.iotdb</groupId> <groupId>org.apache.iotdb</groupId>
...@@ -152,6 +191,9 @@ ...@@ -152,6 +191,9 @@
<!-- <classifier>${os.classifier}</classifier>--> <!-- <classifier>${os.classifier}</classifier>-->
</dependency> </dependency>
</dependencies> </dependencies>
</profile>
<profile>
<id>with-grafana-plugin</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -168,7 +210,7 @@ ...@@ -168,7 +210,7 @@
</goals> </goals>
<configuration> <configuration>
<descriptors combine.children="append"> <descriptors combine.children="append">
<descriptor>src/assembly/client-cpp.xml</descriptor> <descriptor>src/assembly/grafana-plugin.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
...@@ -192,7 +234,7 @@ ...@@ -192,7 +234,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<includes combine.children="append"> <includes combine.children="append">
<include>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin.zip</include> <include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
</includes> </includes>
</fileSet> </fileSet>
</fileSets> </fileSets>
...@@ -202,6 +244,14 @@ ...@@ -202,6 +244,14 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-grafana-plugin</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>
</profile> </profile>
</profiles> </profiles>
</project> </project>
iotdb-connector/grafana-plugin/backend-compile.sh
浏览文件 @ 489be30b
...@@ -28,8 +28,8 @@ go get -u github.com/grafana/grafana-plugin-sdk-go ...@@ -28,8 +28,8 @@ go get -u github.com/grafana/grafana-plugin-sdk-go
go mod tidy go mod tidy
check_results=$(go env | grep GOPATH= | sed 's/\"//g') check_results=$(go env | grep GOPATH= | sed 's/\"//g')
go_path=${check_results/GOPATH=/} go_path=${check_results/GOPATH=/}
cd $go_path/pkg/mod/github.com/magefile/mage@v1.14.0 cd $go_path/pkg/mod/github.com/magefile/mage@v1.15.0
chmod 755 $go_path/pkg/mod/github.com/magefile/* chmod 755 $go_path/pkg/mod/github.com/magefile/*
go run $go_path/pkg/mod/github.com/magefile/mage@v1.14.0/bootstrap.go go run $go_path/pkg/mod/github.com/magefile/mage@v1.15.0/bootstrap.go
cd $work_path cd $work_path
$go_path/bin/mage -v $go_path/bin/mage -v
iotdb-connector/grafana-plugin/go.mod
浏览文件 @ 489be30b
...@@ -18,6 +18,6 @@ module github.com/grafana/grafana-starter-datasource-backend ...@@ -18,6 +18,6 @@ module github.com/grafana/grafana-starter-datasource-backend
go 1.16 go 1.16
require ( require (
github.com/grafana/grafana-plugin-sdk-go v0.139.0 github.com/grafana/grafana-plugin-sdk-go v0.172.0
github.com/magefile/mage v1.13.0 // indirect github.com/magefile/mage v1.15.0 // indirect
) )
iotdb-connector/grafana-plugin/pom.xml
浏览文件 @ 489be30b
...@@ -26,97 +26,92 @@ ...@@ -26,97 +26,92 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>IoTDB: Connector: Grafana (Plugin)</name> <name>IoTDB: Connector: Grafana (Plugin)</name>
<description>IoTDB Grafana plugin</description> <description>IoTDB Grafana plugin</description>
<profiles> <build>
<profile> <plugins>
<id>compile-grafana-plugin</id> <plugin>
<build> <groupId>com.github.eirslett</groupId>
<plugins> <artifactId>frontend-maven-plugin</artifactId>
<plugin> <version>1.12.1</version>
<groupId>com.github.eirslett</groupId> <executions>
<artifactId>frontend-maven-plugin</artifactId> <execution>
<version>1.12.1</version> <id>install node and yarn</id>
<executions> <goals>
<execution> <goal>install-node-and-yarn</goal>
<id>install node and yarn</id> </goals>
<goals>
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v16.13.1</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
</configuration>
</execution>
<execution>
<id>yarn install</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>yarn build</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>build</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration> <configuration>
<filesets> <nodeVersion>v16.13.1</nodeVersion>
<fileset> <yarnVersion>v1.22.17</yarnVersion>
<directory>${basedir}/node</directory>
</fileset>
<fileset>
<directory>${basedir}/node_modules</directory>
</fileset>
<fileset>
<directory>${basedir}/dist</directory>
</fileset>
<fileset>
<directory>${basedir}/coverage</directory>
</fileset>
</filesets>
</configuration> </configuration>
</plugin> </execution>
<plugin> <execution>
<artifactId>maven-antrun-plugin</artifactId> <id>yarn install</id>
<version>1.3</version> <goals>
<executions> <goal>yarn</goal>
<execution> </goals>
<id>test</id> <configuration>
<phase>package</phase> <arguments>install</arguments>
<goals> </configuration>
<goal>run</goal> </execution>
</goals> <execution>
<configuration> <id>yarn build</id>
<tasks> <goals>
<condition property="osFamily" value="windows"> <goal>yarn</goal>
<os family="windows"/> </goals>
</condition> <configuration>
<condition property="osFamily" value="unix"> <arguments>build</arguments>
<os family="unix"/> </configuration>
</condition> </execution>
<exec executable="C:\\Windows\\System32\\cmd.exe" osfamily="windows"> </executions>
<arg line="/c backend-compile.bat"/> </plugin>
</exec> <plugin>
<exec executable="/bin/bash" osfamily="unix"> <groupId>org.apache.maven.plugins</groupId>
<arg line="-c ./backend-compile.sh"/> <artifactId>maven-clean-plugin</artifactId>
</exec> <configuration>
</tasks> <filesets>
</configuration> <fileset>
</execution> <directory>${basedir}/node</directory>
</executions> </fileset>
</plugin> <fileset>
</plugins> <directory>${basedir}/node_modules</directory>
</build> </fileset>
</profile> <fileset>
</profiles> <directory>${basedir}/dist</directory>
</fileset>
<fileset>
<directory>${basedir}/coverage</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<id>test</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<condition property="osFamily" value="windows">
<os family="windows"/>
</condition>
<condition property="osFamily" value="unix">
<os family="unix"/>
</condition>
<exec executable="C:\\Windows\\System32\\cmd.exe" osfamily="windows">
<arg line="/c backend-compile.bat"/>
</exec>
<exec executable="/bin/bash" osfamily="unix">
<arg line="-c ./backend-compile.sh"/>
</exec>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
iotdb-connector/pom.xml
浏览文件 @ 489be30b
...@@ -33,11 +33,18 @@ ...@@ -33,11 +33,18 @@
<module>flink-iotdb-connector</module> <module>flink-iotdb-connector</module>
<module>flink-tsfile-connector</module> <module>flink-tsfile-connector</module>
<module>grafana-connector</module> <module>grafana-connector</module>
<module>grafana-plugin</module>
<module>hadoop</module> <module>hadoop</module>
<module>hive-connector</module> <module>hive-connector</module>
<module>spark-iotdb-connector</module> <module>spark-iotdb-connector</module>
<module>spark-tsfile</module> <module>spark-tsfile</module>
<module>zeppelin-interpreter</module> <module>zeppelin-interpreter</module>
</modules> </modules>
<profiles>
<profile>
<id>with-grafana-plugin</id>
<modules>
<module>grafana-plugin</module>
</modules>
</profile>
</profiles>
</project> </project>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或