You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/01/07 06:52:43 UTC
[incubator-inlong] branch master updated: [INLONG-2113] refactor the audit docker image (#2115)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 7b5c1ed [INLONG-2113] refactor the audit docker image (#2115)
7b5c1ed is described below
commit 7b5c1ede854bda35cd13a8340dd615137bad1190
Author: dockerzhang <do...@apache.org>
AuthorDate: Fri Jan 7 14:51:45 2022 +0800
[INLONG-2113] refactor the audit docker image (#2115)
Co-authored-by: dockerzhang <do...@tencent.com>
---
inlong-audit/audit-dist/assembly/assembly.xml | 51 -------------
inlong-audit/audit-dist/pom.xml | 72 -----------------
.../audit-docker/{ => audit-source}/Dockerfile | 14 ++--
.../audit-souce-docker.sh} | 7 +-
.../audit-docker/{ => audit-source}/pom.xml | 38 +++++----
.../audit-store/Dockerfile} | 12 ++-
.../audit-store-docker.sh} | 14 ++--
.../audit-docker/{ => audit-store}/pom.xml | 40 ++++++----
inlong-audit/audit-docker/pom.xml | 89 +++++++---------------
inlong-audit/audit-source/conf/audit.conf | 8 +-
inlong-audit/audit-store/assembly/assembly.xml | 7 +-
inlong-audit/audit-store/bin/prepare_env.sh | 27 -------
.../audit-store/conf/application.properties | 19 +++--
inlong-audit/audit-store/conf/logback.xml | 2 +-
inlong-audit/audit-store/conf/server.properties | 26 -------
.../sql/{audit.sql => apache_inlong_audit.sql} | 9 +++
.../inlong/store/config/DataServerConfig.java | 1 -
inlong-audit/pom.xml | 1 -
inlong-manager/manager-docker/Dockerfile | 3 +-
19 files changed, 138 insertions(+), 302 deletions(-)
diff --git a/inlong-audit/audit-dist/assembly/assembly.xml b/inlong-audit/audit-dist/assembly/assembly.xml
deleted file mode 100644
index cd64f1c..0000000
--- a/inlong-audit/audit-dist/assembly/assembly.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
- <id>bin</id>
-
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>../audit-source/target</directory>
- <includes>
- <include>*.gz</include>
- </includes>
- <outputDirectory>./</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../audit-store/target</directory>
- <includes>
- <include>*.gz</include>
- </includes>
- <outputDirectory>./</outputDirectory>
- </fileSet>
-
- </fileSets>
-
-</assembly>
diff --git a/inlong-audit/audit-dist/pom.xml b/inlong-audit/audit-dist/pom.xml
deleted file mode 100644
index 64366fc..0000000
--- a/inlong-audit/audit-dist/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-audit</artifactId>
- <version>0.13.0-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-dist</artifactId>
- <packaging>pom</packaging>
- <name>Apache InLong - Audit Dist</name>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>audit-source</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${plugin.assembly.version}</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>assembly/assembly.xml</descriptor>
- </descriptors>
- <tarLongFileMode>posix</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/inlong-audit/audit-docker/Dockerfile b/inlong-audit/audit-docker/audit-source/Dockerfile
similarity index 74%
rename from inlong-audit/audit-docker/Dockerfile
rename to inlong-audit/audit-docker/audit-source/Dockerfile
index 254a09f..ff72569 100644
--- a/inlong-audit/audit-docker/Dockerfile
+++ b/inlong-audit/audit-docker/audit-source/Dockerfile
@@ -18,10 +18,12 @@
#
FROM openjdk:8-jdk
# add tarball from target output
-ARG AUDIT_TARBALL
-ADD ${AUDIT_TARBALL} /opt/inlong-audit
+ARG AUDIT_SOURCE_TARBALL
+ADD ${AUDIT_SOURCE_TARBALL} /opt/inlong-audit-source
EXPOSE 46801
-WORKDIR /opt/inlong-audit
-ADD audit-docker.sh bin/
-RUN chmod +x bin/audit-docker.sh
-CMD ["bin/audit-docker.sh"]
+ENV PULSAR_BROKER_LIST=127.0.0.1:6650
+ENV PULSAR_TOPIC=public/default/audit
+WORKDIR /opt/inlong-audit-source
+ADD audit-souce-docker.sh bin/
+RUN chmod +x bin/audit-souce-docker.sh
+CMD ["bin/audit-souce-docker.sh"]
diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-source/audit-souce-docker.sh
similarity index 81%
copy from inlong-audit/audit-docker/audit-docker.sh
copy to inlong-audit/audit-docker/audit-source/audit-souce-docker.sh
index aa67b64..51af9e7 100644
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-source/audit-souce-docker.sh
@@ -18,12 +18,9 @@
file_path=$(cd "$(dirname "$0")"/../;pwd)
# config
-sed -i "s/PULSAR_LIST/$PULSAR_BROKER_LIST/g" ${file_path}/conf/audit.conf
-cat <<EOF > ${file_path}/conf/common.properties
-manager_hosts=$MANAGER_OPENAPI_IP:$MANAGER_OPENAPI_PORT
-EOF
+sed -i "s/PULSAR_BROKER_LIST/$PULSAR_BROKER_LIST/g" ${file_path}/conf/audit.conf
+sed -i "s/PULSAR_TOPIC/$PULSAR_TOPIC/g" ${file_path}/conf/audit.conf
# start
-bash +x ${file_path}/bin/prepare_env.sh
bash +x ${file_path}/bin/start.sh
sleep 3
# keep alive
diff --git a/inlong-audit/audit-docker/pom.xml b/inlong-audit/audit-docker/audit-source/pom.xml
similarity index 71%
copy from inlong-audit/audit-docker/pom.xml
copy to inlong-audit/audit-docker/audit-source/pom.xml
index fd8674b..f8ac29f 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/audit-source/pom.xml
@@ -21,13 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.inlong</groupId>
- <artifactId>inlong-audit</artifactId>
+ <artifactId>audit-docker</artifactId>
<version>0.13.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.inlong</groupId>
- <artifactId>audit-docker</artifactId>
+ <artifactId>audit-source-docker</artifactId>
<modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Audit Docker</name>
+ <name>Apache InLong - Audit Docker Source</name>
<dependencies>
<dependency>
@@ -38,14 +38,6 @@
<type>tar.gz</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-store</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
<profile>
@@ -70,7 +62,7 @@
<goal>push</goal>
</goals>
<configuration>
- <repository>${docker.organization}/audit</repository>
+ <repository>${docker.organization}/audit-source</repository>
<tag>latest</tag>
</configuration>
</execution>
@@ -78,12 +70,30 @@
<configuration>
<repository>${docker.organization}/audit-source</repository>
<pullNewerImage>false</pullNewerImage>
- <tag>apache-inlong-audit-source-${project.version}</tag>
+ <tag>${project.version}</tag>
<buildArgs>
- <AUDIT_TARBALL>target/apache-inlong-audit-source-${project.version}-bin.tar.gz</AUDIT_TARBALL>
+ <AUDIT_SOURCE_TARBALL>target/audit-source-${project.version}-bin.tar.gz</AUDIT_SOURCE_TARBALL>
</buildArgs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tarball</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/</outputDirectory>
+ <includeArtifactIds>audit-source</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/inlong-audit/audit-source/conf/pulsar.properties b/inlong-audit/audit-docker/audit-store/Dockerfile
similarity index 61%
rename from inlong-audit/audit-source/conf/pulsar.properties
rename to inlong-audit/audit-docker/audit-store/Dockerfile
index 5cd8d02..3a5845b 100644
--- a/inlong-audit/audit-source/conf/pulsar.properties
+++ b/inlong-audit/audit-docker/audit-store/Dockerfile
@@ -16,4 +16,14 @@
# specific language governing permissions and limitations
# under the License.
#
-topic=persistent://public/default/audit-test
\ No newline at end of file
+FROM openjdk:8-jdk
+# add tarball from target output
+ARG AUDIT_STORE_TARBALL
+ADD ${AUDIT_STORE_TARBALL} /opt/inlong-audit-store
+ENV JDBC_URL='jdbc:mysql:\/\/127.0.0.1:3306\/apache_inlong_audit?useSSL=false\&allowPublicKeyRetrieval=true\&characterEncoding=UTF-8\&nullCatalogMeansCurrent=true\&serverTimezone=GMT%2b8'
+ENV USERNAME=root
+ENV PASSWORD=inlong
+WORKDIR /opt/inlong-audit-store
+ADD audit-store-docker.sh bin/
+RUN chmod +x bin/audit-store-docker.sh
+CMD ["bin/audit-store-docker.sh"]
diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-store/audit-store-docker.sh
similarity index 69%
rename from inlong-audit/audit-docker/audit-docker.sh
rename to inlong-audit/audit-docker/audit-store/audit-store-docker.sh
index aa67b64..e5992ab 100644
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-store/audit-store-docker.sh
@@ -18,13 +18,15 @@
file_path=$(cd "$(dirname "$0")"/../;pwd)
# config
-sed -i "s/PULSAR_LIST/$PULSAR_BROKER_LIST/g" ${file_path}/conf/audit.conf
-cat <<EOF > ${file_path}/conf/common.properties
-manager_hosts=$MANAGER_OPENAPI_IP:$MANAGER_OPENAPI_PORT
-EOF
+conf_file=${file_path}/conf/application.properties
+
+# replace the configuration
+sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${conf_file}"
+sed -i "s/spring.datasource.druid.username=.*$/spring.datasource.druid.username=${USERNAME}/g" "${conf_file}"
+sed -i "s/spring.datasource.druid.password=.*$/spring.datasource.druid.password=${PASSWORD}/g" "${conf_file}"
+
# start
-bash +x ${file_path}/bin/prepare_env.sh
bash +x ${file_path}/bin/start.sh
sleep 3
# keep alive
-tail -F ${file_path}/logs/audit-source.log
+tail -F ${file_path}/logs/audit-store.log
diff --git a/inlong-audit/audit-docker/pom.xml b/inlong-audit/audit-docker/audit-store/pom.xml
similarity index 69%
copy from inlong-audit/audit-docker/pom.xml
copy to inlong-audit/audit-docker/audit-store/pom.xml
index fd8674b..13c6e42 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/audit-store/pom.xml
@@ -21,25 +21,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.inlong</groupId>
- <artifactId>inlong-audit</artifactId>
+ <artifactId>audit-docker</artifactId>
<version>0.13.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.inlong</groupId>
- <artifactId>audit-docker</artifactId>
+ <artifactId>audit-store-docker</artifactId>
<modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Audit Docker</name>
+ <name>Apache InLong - Audit Docker Store</name>
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
- <artifactId>audit-source</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
<artifactId>audit-store</artifactId>
<version>${project.parent.version}</version>
<classifier>bin</classifier>
@@ -70,20 +62,38 @@
<goal>push</goal>
</goals>
<configuration>
- <repository>${docker.organization}/audit</repository>
+ <repository>${docker.organization}/audit-store</repository>
<tag>latest</tag>
</configuration>
</execution>
</executions>
<configuration>
- <repository>${docker.organization}/audit-source</repository>
+ <repository>${docker.organization}/audit-store</repository>
<pullNewerImage>false</pullNewerImage>
- <tag>apache-inlong-audit-source-${project.version}</tag>
+ <tag>${project.version}</tag>
<buildArgs>
- <AUDIT_TARBALL>target/apache-inlong-audit-source-${project.version}-bin.tar.gz</AUDIT_TARBALL>
+ <AUDIT_STORE_TARBALL>target/audit-store-${project.version}-bin.tar.gz</AUDIT_STORE_TARBALL>
</buildArgs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tarball</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/</outputDirectory>
+ <includeArtifactIds>audit-store</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/inlong-audit/audit-docker/pom.xml b/inlong-audit/audit-docker/pom.xml
index fd8674b..478681b 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/pom.xml
@@ -17,75 +17,38 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>0.13.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-docker</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Audit Docker</name>
+ <artifactId>audit-docker</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>audit-source</module>
+ <module>audit-store</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-source</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-store</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>tag-and-push-latest</id>
- <goals>
- <goal>tag</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <repository>${docker.organization}/audit</repository>
- <tag>latest</tag>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <repository>${docker.organization}/audit-source</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>apache-inlong-audit-source-${project.version}</tag>
- <buildArgs>
- <AUDIT_TARBALL>target/apache-inlong-audit-source-${project.version}-bin.tar.gz</AUDIT_TARBALL>
- </buildArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <encoding>UTF-8</encoding>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/inlong-audit/audit-source/conf/audit.conf b/inlong-audit/audit-source/conf/audit.conf
index eec6d76..8637ba8 100644
--- a/inlong-audit/audit-source/conf/audit.conf
+++ b/inlong-audit/audit-source/conf/audit.conf
@@ -59,8 +59,8 @@ agent1.channels.ch-msg2.fsyncInterval = 10
agent1.sinks.pulsar-sink-msg1.channel = ch-msg1
agent1.sinks.pulsar-sink-msg1.type = org.apache.flume.sink.PulsarSink
-agent1.sinks.pulsar-sink-msg1.pulsar_server_url= pulsar://127.0.0.1:6650,127.0.0.2:6650
-agent1.sinks.pulsar-sink-msg1.topic = persistent://public/default/audit-test
+agent1.sinks.pulsar-sink-msg1.pulsar_server_url= pulsar://PULSAR_BROKER_LIST
+agent1.sinks.pulsar-sink-msg1.topic = persistent://PULSAR_TOPIC
agent1.sinks.pulsar-sink-msg1.send_timeout_ms = 30000
agent1.sinks.pulsar-sink-msg1.client_op_timeout_second = 30000
agent1.sinks.pulsar-sink-msg1.stat_interval_sec = 60
@@ -75,8 +75,8 @@ agent1.sinks.pulsar-sink-msg1.disk_io_rate_per_sec= 20000000
agent1.sinks.pulsar-sink-msg2.channel = ch-msg2
agent1.sinks.pulsar-sink-msg2.type = org.apache.flume.sink.PulsarSink
-agent1.sinks.pulsar-sink-msg2.pulsar_server_url = pulsar://127.0.0.1:6650,127.0.0.2:6650
-agent1.sinks.pulsar-sink-msg1.topic = persistent://public/default/audit-test
+agent1.sinks.pulsar-sink-msg2.pulsar_server_url = pulsar://PULSAR_BROKER_LIST
+agent1.sinks.pulsar-sink-msg1.topic = persistent://PULSAR_TOPIC
agent1.sinks.pulsar-sink-msg2.send_timeout_ms = 30000
agent1.sinks.pulsar-sink-msg2.client_op_timeout_second = 30000
agent1.sinks.pulsar-sink-msg2.stat_interval_sec = 60
diff --git a/inlong-audit/audit-store/assembly/assembly.xml b/inlong-audit/audit-store/assembly/assembly.xml
index fe9642c..877fed3 100644
--- a/inlong-audit/audit-store/assembly/assembly.xml
+++ b/inlong-audit/audit-store/assembly/assembly.xml
@@ -23,7 +23,7 @@
<format>dir</format>
<format>tar.gz</format>
</formats>
- <includeBaseDirectory>true</includeBaseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target</directory>
@@ -39,6 +39,11 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
+ <directory>sql</directory>
+ <outputDirectory>sql</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
<directory>conf</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0755</fileMode>
diff --git a/inlong-audit/audit-store/bin/prepare_env.sh b/inlong-audit/audit-store/bin/prepare_env.sh
deleted file mode 100755
index b87ecb5..0000000
--- a/inlong-audit/audit-store/bin/prepare_env.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-cd "$(dirname "$0")"/../conf
-
-for i in {application.properties,server.properties}
- do
- touch $i
-done
\ No newline at end of file
diff --git a/inlong-audit/audit-store/conf/application.properties b/inlong-audit/audit-store/conf/application.properties
index 804b1b4..a09c4e3 100644
--- a/inlong-audit/audit-store/conf/application.properties
+++ b/inlong-audit/audit-store/conf/application.properties
@@ -17,14 +17,14 @@
# under the License.
#
-#datasource start
+# datasource config
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.name = druidDataSource
spring.datasource.type = com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url= jdbc:mysql://127.0.0.1:3306/inlong_audit?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+spring.datasource.druid.url= jdbc:mysql://127.0.0.1:3306/apache_inlong_audit?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
spring.datasource.druid.username=root
-spring.datasource.druid.password=123456
+spring.datasource.druid.password=inlong
spring.datasource.druid.filters=stat,log4j,config
spring.datasource.druid.max-active=100
spring.datasource.druid.initial-size=1
@@ -40,8 +40,15 @@ spring.datasource.druid.pool-prepared-statements=true
spring.datasource.druid.filter.wall.config.multi-statement-allow=true
spring.datasource.druid.max-open-prepared-statements=50
spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
-#datasource end
-#mybatis start
+
+# mybatis config
mybatis.mapper-locations=classpath*:mapper/*.xml
mybatis.type-aliases-package=org.apache.inlong.store.entities
-#mybatis end
\ No newline at end of file
+
+# audit config
+audit.config.file.check.enable=false
+audit.config.manager.server.url=http://127.0.0.1:8000
+
+# pulsar config
+audit.pulsar.server.url=pulsar://127.0.0.1:6650
+audit.pulsar.topic=persistent://public/default/audit
\ No newline at end of file
diff --git a/inlong-audit/audit-store/conf/logback.xml b/inlong-audit/audit-store/conf/logback.xml
index 0edc1fb..77d5376 100644
--- a/inlong-audit/audit-store/conf/logback.xml
+++ b/inlong-audit/audit-store/conf/logback.xml
@@ -22,7 +22,7 @@
<property name="LOG_BACK_DIR" value="logs"/>
<appender name="INFO_ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${LOG_BACK_DIR}/info.log</file>
+ <file>${LOG_BACK_DIR}/audit-store.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
<fileNamePattern>${LOG_BACK_DIR}/info-%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
diff --git a/inlong-audit/audit-store/conf/server.properties b/inlong-audit/audit-store/conf/server.properties
deleted file mode 100644
index afe398c..0000000
--- a/inlong-audit/audit-store/conf/server.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#config server
-audit.config.file.check.enable=false
-audit.config.manager.server.url=http://127.0.0.1:8000
-
-#pulsar
-audit.pulsar.server.url=pulsar://127.0.0.1:6650
-audit.pulsar.topic=persistent://public/default/audit
\ No newline at end of file
diff --git a/inlong-audit/audit-store/sql/audit.sql b/inlong-audit/audit-store/sql/apache_inlong_audit.sql
similarity index 88%
rename from inlong-audit/audit-store/sql/audit.sql
rename to inlong-audit/audit-store/sql/apache_inlong_audit.sql
index 6b98369..de4e220 100644
--- a/inlong-audit/audit-store/sql/audit.sql
+++ b/inlong-audit/audit-store/sql/apache_inlong_audit.sql
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- database for Manager Web
+-- ----------------------------
+CREATE DATABASE IF NOT EXISTS apache_inlong_audit;
+USE apache_inlong_audit;
+
CREATE TABLE `audit_data` (
`id` int(32) not null primary key auto_increment COMMENT 'id',
`ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'client ip',
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/store/config/DataServerConfig.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/store/config/DataServerConfig.java
index dec9a58..938cc18 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/store/config/DataServerConfig.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/store/config/DataServerConfig.java
@@ -37,7 +37,6 @@ import org.springframework.stereotype.Service;
@MapperScan(basePackages = "org.apache.inlong.store.db.dao")
@PropertySources({
@PropertySource("classpath:application.properties"),
- @PropertySource(value = "classpath:server.properties", ignoreResourceNotFound = true)
})
public class DataServerConfig {
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 53f5276..b312020 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -34,7 +34,6 @@
<modules>
<module>audit-source</module>
- <module>audit-dist</module>
<module>audit-docker</module>
<module>audit-store</module>
<module>audit-common</module>
diff --git a/inlong-manager/manager-docker/Dockerfile b/inlong-manager/manager-docker/Dockerfile
index b9c41dc..a075a90 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -21,8 +21,7 @@ EXPOSE 8083
# profile and env virables
ENV ACTIVE_PROFILE=prod
-# Note: '/' and '&' symbles need to be escaped with the '\'
-ENV JDBC_URL='jdbc:mysql:\/\/127.0.0.1:3306\/apache_inlong_manager?useSSL=false\&allowPublicKeyRetrieval=true\&characterEncoding=UTF-8\&nullCatalogMeansCurrent=true\&serverTimezone=GMT%2b8'
+ENV JDBC_URL=127.0.0.1:3306
ENV USERNAME=root
ENV PASSWORD=inlong
ENV TUBE_MANAGER=http://127.0.0.1:8089