diff --git a/dinky-admin/src/main/resources/application.yml b/dinky-admin/src/main/resources/application.yml index cea7efc5f2..21e68271f8 100644 --- a/dinky-admin/src/main/resources/application.yml +++ b/dinky-admin/src/main/resources/application.yml @@ -15,7 +15,7 @@ spring: # If you use pgsql database, please configure pgsql database connection information in application-pgsql.yml # If you use the h2 database, please configure the h2 database connection information in application-h2.yml, # note: the h2 database is only for experience use, and the related data that has been created cannot be migrated, please use it with caution - active: h2 #[h2,mysql,pgsql] + active: ${DB_ACTIVE:h2} #[h2,mysql,pgsql] include: jmx # mvc config diff --git a/script/sql/upgrade/1.0.0-SNAPSHOT_schema/mysql/dinky_dml.sql b/script/sql/upgrade/1.0.0-SNAPSHOT_schema/mysql/dinky_dml.sql index c1be87ac1a..64162b9f19 100644 --- a/script/sql/upgrade/1.0.0-SNAPSHOT_schema/mysql/dinky_dml.sql +++ b/script/sql/upgrade/1.0.0-SNAPSHOT_schema/mysql/dinky_dml.sql @@ -220,15 +220,16 @@ INSERT INTO dinky_alert_rules (id, name, rule, template_id, rule_type, trigger_c INSERT INTO dinky_alert_rules (id, name, rule, template_id, rule_type, trigger_conditions, description, enabled, create_time, update_time, creator, updater) VALUES (6, 'alert.rule.checkpointFail', '[{"ruleKey":"isCheckpointFailed","ruleOperator":"EQ","ruleValue":"true"}]', 1, 'SYSTEM', ' or ', '', 1, '1970-01-01 00:00:00', '2023-11-22 17:03:44', null, null); INSERT INTO dinky_alert_rules (id, name, rule, template_id, rule_type, trigger_conditions, description, enabled, create_time, update_time, creator, updater) VALUES (7, 'alert.rule.jobRunException', '[{"ruleKey":"isException","ruleOperator":"EQ","ruleValue":"true"}]', 1, 'SYSTEM', ' or ', '', 1, '1970-01-01 00:00:00', '2023-11-22 17:03:44', null, null); -INSERT INTO dinky_alert_template VALUES (1, 'Default', ' -- **Job Name :** ${task.name} -- **Job Status :** ${jobInstance.status} -- **Alert Time :** ${time} -- **Start Time :** ${startTime} -- **End Time :** ${endTime} -- **${(exceptions.rootException)?substring(0,20)}** + +INSERT INTO dinky_alert_template (id, name, template_content, enabled, create_time, update_time, creator, updater) VALUES (1, 'Default', ' +- **Job Name :** ${jobName} +- **Job Status :** ${jobStatus} +- **Alert Time :** ${alertTime} +- **Start Time :** ${jobStartTime} +- **End Time :** ${jobEndTime} +- **${errorMsg}** [Go toTask Web](http://${taskUrl}) -', 1, null, null,null,null); +', 1, '2023-11-20 17:45:48', '2023-11-23 00:14:22', null, 1); COMMIT;