kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复alarm程序配置脚本错误造成的问题。并修复相关文档。

This commit is contained in:
wusheng 2016-04-21 10:16:01 +08:00
parent 21394784b8
commit 139e1829a1
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD_DOC.md
View File

@ -67,7 +67,7 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val
INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES (1003,'servers_addr_1','60.194.3.183:34000;60.194.3.183:35000;60.194.3.184:34000;60.194.3.184:35000;','string','日志采集地址-外网','2015-12-10 15:23:53','A','2015-12-10 15:23:53');
--配置告警类型
--config types of alarm
INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Excution Time > 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution Time > 500ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53');
INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{\"type\":\"default\",\"label\":\"exception\",\"desc\":\"System Exception\"},{\"type\":\"ExecuteTime-PossibleError\",\"label\":\"mark\",\"desc\":\"Excution Time > 5s\"},{\"type\":\"ExecuteTime-Warning\",\"label\":\"mark\",\"desc\":\"Excution Time > 500ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53');
```
- 注：2016-4-21日前的版本升级，system_config表config_id=1000,SQL语句更新，请注意修改，新增配置config_id=1004
- 注：2016-4-8日前的版本升级，请升级脚本中的相关片段

4
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java
View File

@ -12,12 +12,13 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import redis.clients.jedis.Jedis;
import com.ai.cloud.skywalking.alarm.model.AlarmMessage;
import com.ai.cloud.skywalking.alarm.model.AlarmRule;
import com.ai.cloud.skywalking.alarm.model.AlarmType;
@ -32,7 +33,6 @@ import com.ai.cloud.skywalking.alarm.util.TemplateConfigurationUtil;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import redis.clients.jedis.Jedis;
public class AlarmMessageProcessor {

6
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/util/AlarmTypeUtil.java
View File

@ -33,12 +33,6 @@ public class AlarmTypeUtil {
if (alarmTypeList == null || alarmTypeList.isEmpty()) {
alarmTypeList = new ArrayList<AlarmType>();
}
AlarmType defaultType = new AlarmType();
defaultType.setType("default");
defaultType.setLabel("mark");
defaultType.setDesc("Others");
alarmTypeList.add(defaultType);
return alarmTypeList;
}

2
skywalking-webui/src/main/sql/table.mysql
View File

@ -224,7 +224,7 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val
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', 'alarm_type_info', '[{\"type\":\"alarm\",\"label\":\"exception\",\"desc\":\"System exception\"},{\"type\":\"timeAlarm\",\"label\":\"mark\",\"desc\":\"Execution Time> 5s\"},{\"type\":\"timeWarning\",\"label\":\"mark\",\"desc\":\"Excution Time> 500ms\"}]', 'json', '告警类型', '2016-04-18 16:04:51', 'A', '2016-04-18 16:04:53');
INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val_desc`,`create_time`,`sts`,`modify_time`) VALUES ('1004', 'alarm_type_info', '[{\"type\":\"default\",\"label\":\"exception\",\"desc\":\"System Exception\"},{\"type\":\"ExecuteTime-PossibleError\",\"label\":\"mark\",\"desc\":\"Excution Time > 5s\"},{\"type\":\"ExecuteTime-Warning\",\"label\":\"mark\",\"desc\":\"Excution Time > 500ms\"}]', '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');