From 24bbf6415d6c57cc8f289f6520d4d36dc60daec2 Mon Sep 17 00:00:00 2001 From: lizl9 Date: Wed, 20 Apr 2016 22:57:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Balarm=E4=B8=8B=E7=9A=84config.proper?= =?UTF-8?q?ties=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 00.system_config表中，mail_info废弃"mail.account.prefix"属性，添加"mailSender"属性; 01.system_config表中，添加“type_info”描述类型告警类型，其中类型顺序决定邮件中的显示顺序； 02.与主线版本同步，并添加了告警类型id --- skywalking-alarm/src/main/resources/config.properties | 10 ++++++---- skywalking-webui/src/main/sql/table.mysql | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/skywalking-alarm/src/main/resources/config.properties b/skywalking-alarm/src/main/resources/config.properties index 58f335892..40aa7de38 100644 --- a/skywalking-alarm/src/main/resources/config.properties +++ b/skywalking-alarm/src/main/resources/config.properties @@ -9,8 +9,7 @@ server.alarm_rule_activity_interval=3600000 processthread.thread_wait_interval=5000 #zookeeper连接地址 -#zkpath.connect_str=10.1.241.18:29181,10.1.241.19:29181,10.1.241.20:29181 -zkpath.connect_str=127.0.0.1:29181 +zkpath.connect_str=10.1.241.18:29181,10.1.241.19:29181,10.1.241.20:29181 #zookeeper连接超时时间(单位:毫秒) zkpath.connect_timeout=1000 #zookeeper重试次数 @@ -49,8 +48,7 @@ db.max_pool_size=20 db.connect_timeout=10000 #告警信息存在的redis服务器地址 -#alarm.redis_server=10.1.241.18:16379 -alarm.redis_server=127.0.0.1:6379 +alarm.redis_server=10.1.241.18:16379 #redis的最大空闲连接数 alarm.redis_max_idle=20 #redis的最小空闲连接数 @@ -59,6 +57,10 @@ alarm.redis_min_idle=1 alarm.redis_max_total=50 #是否关闭告警发送 alarm.alarm_off_flag=false + +alarm.checker.turn_on_exception_checker=true +#告警检查器：执行时间超时告警检查 +alarm.checker.turn_on_execute_time_checker=true #告警类型配置id alarm.alarm_type_config_id=1004 diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index 592c0cc1c..5d5e190fc 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -220,11 +220,11 @@ CREATE TABLE `auth_file_config` ( UNIQUE INDEX `id_UNIQUE` (`id` ASC)); # 请参考文档和环境进行修改 -INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1000,'mail_info','{\"mail.host\":\"mail.asiainfo.com\",\"mail.transport.protocol\":\"smtp\",\"mail.smtp.auth\":\"true\",\"mail.smtp.starttls.enable\":\"false\",\"mail.username\":\"testA\",\"mail.password\":\"******\",\"mail.account.prefix\":\"@asiainfo.com\"}','json','默认邮件发送人信息','2015-12-10 11:54:06','A','2015-12-10 11:54:06'); +INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1000,'mail_info','{\"mail.host\":\"mail.asiainfo.com\",\"mail.transport.protocol\":\"smtp\",\"mail.smtp.auth\":\"true\",\"mail.smtp.starttls.enable\":\"false\",\"mail.username\":\"testA\",\"mail.password\":\"******\",\"mail.sender\":\"mailSender@asiainfo.com\"}','json','默认邮件发送人信息','2015-12-10 11:54:06','A','2015-12-10 11:54:06'); INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1001,'portal_addr','http://10.1.235.197:48080/skywalking/','string','默认门户地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1002,'servers_addr','10.1.235.197:34000;10.1.235.197:35000;','string','日志采集地址','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1003,'servers_addr_1','XXX.XXX.XXX.XXX:34000;','string','日志采集地址-外网','2015-12-10 15:23:53','A','2015-12-10 15:23:53'); - +INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Execution > 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution > 300ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53'); # init default value of auth_file_config INSERT INTO `auth_file_config` (`config_id`, `key`, `value0`, `value1`, `key_desc`, `sts`) VALUES ('1', 'buriedpoint.printf', 'false', 'false', '是否打印数据', 'A');