From 6886ed51c5f7e2601583a468418c85070f37ade3 Mon Sep 17 00:00:00 2001 From: dailidong Date: Mon, 1 Jun 2020 11:11:34 +0800 Subject: [PATCH] fix table T_DS_ALERT (#2854) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT --- .../src/main/resources/config/install_config.conf | 5 +---- sql/dolphinscheduler-postgre.sql | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-server/src/main/resources/config/install_config.conf b/dolphinscheduler-server/src/main/resources/config/install_config.conf index 3bb4d8390..05a3e9906 100644 --- a/dolphinscheduler-server/src/main/resources/config/install_config.conf +++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf @@ -137,7 +137,4 @@ alertServer="ds3" # run api machine # note: list of machine hostnames for deploying api server -apiServers="ds1" - -# whether to start monitoring self-starting scripts -monitorServerState="false" \ No newline at end of file +apiServers="ds1" \ No newline at end of file diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql index c57e5d1a8..b16965a43 100644 --- a/sql/dolphinscheduler-postgre.sql +++ b/sql/dolphinscheduler-postgre.sql @@ -191,7 +191,7 @@ CREATE TABLE t_ds_alert ( content text , alert_type int DEFAULT NULL , alert_status int DEFAULT '0' , - ·log· text , + log text , alertgroup_id int DEFAULT NULL , receivers text , receivers_cc text , -- GitLab