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 2024/05/13 06:04:46 UTC
(inlong) branch master updated: [INLONG-10205][Script] Add the metrics.audit.proxy.hosts for standalone deployment (#10206)
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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 50fc3024b6 [INLONG-10205][Script] Add the metrics.audit.proxy.hosts for standalone deployment (#10206)
50fc3024b6 is described below
commit 50fc3024b6867e67c376fa0d42cd20cf09922720
Author: Charles Zhang <do...@apache.org>
AuthorDate: Mon May 13 14:04:41 2024 +0800
[INLONG-10205][Script] Add the metrics.audit.proxy.hosts for standalone deployment (#10206)
---
bin/init-config.sh | 2 ++
.../audit-store/src/test/resources/application-test.properties | 4 ++--
.../manager-web/src/main/resources/application-dev.properties | 7 ++++---
.../manager-web/src/main/resources/application-prod.properties | 7 ++++---
.../manager-web/src/main/resources/application-test.properties | 7 ++++---
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/bin/init-config.sh b/bin/init-config.sh
index 018b22a79b..057b0cd688 100644
--- a/bin/init-config.sh
+++ b/bin/init-config.sh
@@ -96,12 +96,14 @@ init_inlong_manager() {
$SED_COMMAND 's#jdbc:mysql://.*apache_inlong_manager#'''jdbc:mysql://${spring_datasource_hostname}:${spring_datasource_port}/apache_inlong_manager'''#g' application-dev.properties
$SED_COMMAND 's/spring.datasource.druid.username=.*/'''spring.datasource.druid.username=${spring_datasource_username}'''/g' application-dev.properties
$SED_COMMAND 's/spring.datasource.druid.password=.*/'''spring.datasource.druid.password=${spring_datasource_password}'''/g' application-dev.properties
+ $SED_COMMAND 's/metrics.audit.proxy.hosts=.*/'''metrics.audit.proxy.hosts=${audit_proxy_ip}:${audit_proxy_port}'''/g' application-dev.properties
$SED_COMMAND 's/audit.query.url=.*/'''audit.query.url=${audit_service_ip}:${audit_service_port}'''/g' application-dev.properties
fi
if [ $spring_profiles_active == "prod" ]; then
$SED_COMMAND 's#jdbc:mysql://.*apache_inlong_manager#'''jdbc:mysql://${spring_datasource_hostname}:${spring_datasource_port}/apache_inlong_manager'''#g' application-prod.properties
$SED_COMMAND 's/spring.datasource.druid.username=.*/'''spring.datasource.druid.username=${spring_datasource_username}'''/g' application-prod.properties
$SED_COMMAND 's/spring.datasource.druid.password=.*/'''spring.datasource.druid.password=${spring_datasource_password}'''/g' application-prod.properties
+ $SED_COMMAND 's/metrics.audit.proxy.hosts=.*/'''metrics.audit.proxy.hosts=${audit_proxy_ip}:${audit_proxy_port}'''/g' application-prod.properties
$SED_COMMAND 's/audit.query.url=.*/'''audit.query.url=${audit_service_ip}:${audit_service_port}'''/g' application-prod.properties
fi
echo "Init inlong manager flink plugin configuration"
diff --git a/inlong-audit/audit-store/src/test/resources/application-test.properties b/inlong-audit/audit-store/src/test/resources/application-test.properties
index 2848b93c63..c04553bd82 100644
--- a/inlong-audit/audit-store/src/test/resources/application-test.properties
+++ b/inlong-audit/audit-store/src/test/resources/application-test.properties
@@ -47,8 +47,8 @@ mybatis.type-aliases-package=org.apache.inlong.audit.db.entities
audit.config.file.check.enable=false
audit.config.manager.server.url=http://127.0.0.1:8000
-# store.server: elasticsearch / mysql
-audit.config.store.mode=elasticsearch
+# Supports common JDBC protocol
+audit.config.store.mode=jdbc
# proxy.type: pulsar / tube / kafka
audit.config.proxy.type=pulsar
diff --git a/inlong-manager/manager-web/src/main/resources/application-dev.properties b/inlong-manager/manager-web/src/main/resources/application-dev.properties
index 7e1be40a03..d5d7c047da 100644
--- a/inlong-manager/manager-web/src/main/resources/application-dev.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-dev.properties
@@ -20,11 +20,11 @@
# Log level
logging.level.root=info
logging.level.org.apache.inlong.manager=debug
-
+# Database configuration
spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
spring.datasource.druid.username=root
spring.datasource.druid.password=inlong
-# datasource config, set org.postgresql.Driver if using PostgreSQL
+# Database config, set org.postgresql.Driver if using PostgreSQL
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.druid.validationQuery=SELECT 'x'
# Initialization size, minimum, maximum
@@ -95,9 +95,10 @@ group.deleted.batch.size=100
# If turned on, the groups could be deleted periodically.
group.deleted.enabled=false
+# Audit Proxy Address
metrics.audit.proxy.hosts=127.0.0.1:10081
-# tencent cloud log service endpoint, The Operator cls resource by it
+# Tencent cloud log service endpoint, The Operator cls resource by it
cls.manager.endpoint=127.0.0.1
diff --git a/inlong-manager/manager-web/src/main/resources/application-prod.properties b/inlong-manager/manager-web/src/main/resources/application-prod.properties
index 8ff532fdf8..2f8f0c4aa7 100644
--- a/inlong-manager/manager-web/src/main/resources/application-prod.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-prod.properties
@@ -19,11 +19,11 @@
# Log level
logging.level.root=info
-
+# Database configuration
spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
spring.datasource.druid.username=root
spring.datasource.druid.password=inlong
-# datasource config, set org.postgresql.Driver if using PostgreSQL
+# Database config, set org.postgresql.Driver if using PostgreSQL
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.druid.validationQuery=SELECT 'x'
# Initialization size, minimum, maximum
@@ -94,8 +94,9 @@ group.deleted.batch.size=100
# If turned on, the groups could be deleted periodically.
group.deleted.enabled=false
+# Audit Proxy Address
metrics.audit.proxy.hosts=127.0.0.1:10081
-# tencent cloud log service endpoint, The Operator cls resource by it
+# Tencent cloud log service endpoint, The Operator cls resource by it
cls.manager.endpoint=127.0.0.1
diff --git a/inlong-manager/manager-web/src/main/resources/application-test.properties b/inlong-manager/manager-web/src/main/resources/application-test.properties
index 29c18d2826..a8aedfa67d 100644
--- a/inlong-manager/manager-web/src/main/resources/application-test.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-test.properties
@@ -20,11 +20,11 @@
# Log level
logging.level.root=info
logging.level.org.apache.inlong.manager=debug
-
+# Database configuration
spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/apache_inlong_manager?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8
spring.datasource.druid.username=root
spring.datasource.druid.password=inlong
-# datasource config, set org.postgresql.Driver if using PostgreSQL
+# Database config, set org.postgresql.Driver if using PostgreSQL
spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.druid.validationQuery=SELECT 'x'
# Initialization size, minimum, maximum
@@ -95,8 +95,9 @@ group.deleted.batch.size=100
# If turned on, the groups could be deleted periodically.
group.deleted.enabled=false
+# Audit Proxy Address
metrics.audit.proxy.hosts=127.0.0.1:10081
-# tencent cloud log service endpoint, The Operator cls resource by it
+# Tencent cloud log service endpoint, The Operator cls resource by it
cls.manager.endpoint=127.0.0.1