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:
#### 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.
So ensure these are installed:
sudo apt install libssl-dev
When enabling the `compile-cpp`:
### Mac OS
#### Git
......@@ -156,7 +150,7 @@ Then install `Homebrew` - If this hasn't been installed yet, as we are going to
#### 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
......
distribution/pom.xml
浏览文件 @ 489be30b
......@@ -48,7 +48,6 @@
<descriptor>src/assembly/datanode.xml</descriptor>
<descriptor>src/assembly/confignode.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/spark-connector.xml</descriptor>
</descriptors>
......@@ -84,7 +83,6 @@
<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-plugin-bin.zip</include>
<include>apache-iotdb-${project.version}-library-udf-bin.zip</include>
<include>apache-iotdb-${project.version}-spark-connector-bin.zip</include>
</includes>
......@@ -109,12 +107,6 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-grafana-plugin</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-confignode</artifactId>
......@@ -125,24 +117,71 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>library-udf</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector_2.11</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>spark-iotdb-connector_2.12</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<profiles>
<profile>
<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>
<dependency>
<groupId>org.apache.iotdb</groupId>
......@@ -152,6 +191,9 @@
<!-- <classifier>${os.classifier}</classifier>-->
</dependency>
</dependencies>
</profile>
<profile>
<id>with-grafana-plugin</id>
<build>
<plugins>
<plugin>
......@@ -168,7 +210,7 @@
</goals>
<configuration>
<descriptors combine.children="append">
<descriptor>src/assembly/client-cpp.xml</descriptor>
<descriptor>src/assembly/grafana-plugin.xml</descriptor>
</descriptors>
</configuration>
</execution>
......@@ -192,7 +234,7 @@
<fileSets>
<fileSet>
<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>
</fileSet>
</fileSets>
......@@ -202,6 +244,14 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-grafana-plugin</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
iotdb-connector/grafana-plugin/backend-compile.sh
浏览文件 @ 489be30b
......@@ -28,8 +28,8 @@ go get -u github.com/grafana/grafana-plugin-sdk-go
go mod tidy
check_results=$(go env | grep GOPATH= | sed 's/\"//g')
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/*
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
$go_path/bin/mage -v
iotdb-connector/grafana-plugin/go.mod
浏览文件 @ 489be30b
......@@ -18,6 +18,6 @@ module github.com/grafana/grafana-starter-datasource-backend
go 1.16
require (
github.com/grafana/grafana-plugin-sdk-go v0.139.0
github.com/magefile/mage v1.13.0 // indirect
github.com/grafana/grafana-plugin-sdk-go v0.172.0
github.com/magefile/mage v1.15.0 // indirect
)
iotdb-connector/grafana-plugin/pom.xml
浏览文件 @ 489be30b
......@@ -26,97 +26,92 @@
<packaging>pom</packaging>
<name>IoTDB: Connector: Grafana (Plugin)</name>
<description>IoTDB Grafana plugin</description>
<profiles>
<profile>
<id>compile-grafana-plugin</id>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<executions>
<execution>
<id>install node and yarn</id>
<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>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<executions>
<execution>
<id>install node and yarn</id>
<goals>
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<filesets>
<fileset>
<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>
<nodeVersion>v16.13.1</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
</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>
</profile>
</profiles>
</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>
<filesets>
<fileset>
<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>
</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>
iotdb-connector/pom.xml
浏览文件 @ 489be30b
......@@ -33,11 +33,18 @@
<module>flink-iotdb-connector</module>
<module>flink-tsfile-connector</module>
<module>grafana-connector</module>
<module>grafana-plugin</module>
<module>hadoop</module>
<module>hive-connector</module>
<module>spark-iotdb-connector</module>
<module>spark-tsfile</module>
<module>zeppelin-interpreter</module>
</modules>
<profiles>
<profile>
<id>with-grafana-plugin</id>
<modules>
<module>grafana-plugin</module>
</modules>
</profile>
</profiles>
</project>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或