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/09/15 01:25:49 UTC
[inlong] branch release-1.3.0 updated (006489dbf -> 097c5935b)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
from 006489dbf [INLONG-5876][Manager] Remove the check of data separator (#5878)
new c999a90da [INLONG-5890][Script] Add tcp protocol when connecting to MySQL (#5891)
new 097c5935b [INLONG-5894][Dashboard] Remove the password required restrict for ClickHouse cluster (#5895)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/inlong-daemon | 8 ++++----
inlong-dashboard/src/metas/sinks/clickhouse.tsx | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
[inlong] 02/02: [INLONG-5894][Dashboard] Remove the password required restrict for ClickHouse cluster (#5895)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 097c5935bc086d53208ec36f011641a2e76ae042
Author: Charles Zhang <do...@apache.org>
AuthorDate: Wed Sep 14 20:21:12 2022 +0800
[INLONG-5894][Dashboard] Remove the password required restrict for ClickHouse cluster (#5895)
---
inlong-dashboard/src/metas/sinks/clickhouse.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inlong-dashboard/src/metas/sinks/clickhouse.tsx b/inlong-dashboard/src/metas/sinks/clickhouse.tsx
index 8941fa3bc..69ad65a46 100644
--- a/inlong-dashboard/src/metas/sinks/clickhouse.tsx
+++ b/inlong-dashboard/src/metas/sinks/clickhouse.tsx
@@ -104,7 +104,7 @@ const getForm: GetStorageFormFieldsType = (
name: 'password',
type: 'password',
label: i18n.t('meta.Sinks.Password'),
- rules: [{ required: true }],
+ rules: [{ required: false }],
props: {
disabled: isEdit && [110, 130].includes(currentValues?.status),
style: {
[inlong] 01/02: [INLONG-5890][Script] Add tcp protocol when connecting to MySQL (#5891)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit c999a90da85c953baa863cb2b06f7a9481a1d223
Author: Charles Zhang <do...@apache.org>
AuthorDate: Wed Sep 14 19:33:30 2022 +0800
[INLONG-5890][Script] Add tcp protocol when connecting to MySQL (#5891)
---
bin/inlong-daemon | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/inlong-daemon b/bin/inlong-daemon
index 646a42b70..b70bfef26 100644
--- a/bin/inlong-daemon
+++ b/bin/inlong-daemon
@@ -68,10 +68,10 @@ start_inlong_audit() {
echo "init apache_inlong_audit"
cd $INLONG_HOME/inlong-audit
select_db_sql="SELECT COUNT(*) FROM information_schema.TABLES WHERE table_schema = 'apache_inlong_audit'"
- inlong_audit_count=$(mysql -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} -e "${select_db_sql}")
+ inlong_audit_count=$(mysql --protocol=tcp -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} -e "${select_db_sql}")
inlong_num=$(echo $inlong_audit_count | tr -cd "[0-9]")
if [ $inlong_num -eq 0 ]; then
- mysql -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} <sql/apache_inlong_audit.sql
+ mysql --protocol=tcp -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} <sql/apache_inlong_audit.sql
fi
echo "start audit proxy"
if [ "${mq_type}" = "pulsar" ]; then
@@ -92,11 +92,11 @@ start_inlong_manager() {
cd $INLONG_HOME/inlong-manager
# Whether the database table exists. If it does not exist, initialize the database and skip if it exists.
select_db_sql="SELECT COUNT(*) FROM information_schema.TABLES WHERE table_schema = 'apache_inlong_manager'"
- inlong_manager_count=$(mysql -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} -e "${select_db_sql}")
+ inlong_manager_count=$(mysql --protocol=tcp -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} -e "${select_db_sql}")
inlong_num=$(echo $inlong_manager_count | tr -cd "[0-9]")
if [ $inlong_num -eq 0 ]; then
echo "init apache_inlong_manager database"
- mysql -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} <sql/apache_inlong_manager.sql
+ mysql --protocol=tcp -h${spring_datasource_hostname} -P${spring_datasource_port} -u${spring_datasource_username} -p${spring_datasource_password} <sql/apache_inlong_manager.sql
fi
bash +x ./bin/startup.sh
# wait to start