Skip to content

Commit 75c8f19

Browse files
jsy1001dejsy1001de
authored
refactor(home): change size of messages sent by kafka to 2M (#848)
1 parent f68018a commit 75c8f19

File tree

7 files changed

+56
-23
lines changed

7 files changed

+56
-23
lines changed

‎server/agg/agg-dispatcher/src/main/java/io/holoinsight/server/agg/v1/dispatcher/AggDispatcher.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public void init() {
7474
properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, AggValuesSerdes.S.class.getName());
7575
properties.put(ProducerConfig.BATCH_SIZE_CONFIG, 64 * 1024);
7676
properties.put(ProducerConfig.LINGER_MS_CONFIG, 100);
77+
properties.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, 2097152);
7778
properties.put(ProducerConfig.MAX_BLOCK_MS_CONFIG, 3000);
7879
properties.put(ProducerConfig.COMPRESSION_TYPE_CONFIG,
7980
aggProperties.getProducerCompressionType());

‎server/common/common-service/src/main/java/io/holoinsight/server/common/service/impl/AlertSubscribeServiceImpl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
77
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
88
import io.holoinsight.server.common.dao.converter.AlarmSubscribeConverter;
9-
import io.holoinsight.server.common.dao.mapper.AlarmSubscribeMapper;
109
import io.holoinsight.server.common.dao.entity.AlarmSubscribe;
1110
import io.holoinsight.server.common.dao.entity.dto.AlarmSubscribeDTO;
1211
import io.holoinsight.server.common.dao.entity.dto.AlarmSubscribeInfo;
12+
import io.holoinsight.server.common.dao.mapper.AlarmSubscribeMapper;
1313
import io.holoinsight.server.common.service.AlertSubscribeService;
1414
import org.apache.commons.lang3.StringUtils;
15+
import org.springframework.beans.factory.annotation.Autowired;
1516
import org.springframework.stereotype.Service;
1617
import org.springframework.util.CollectionUtils;
1718

18-
import javax.annotation.Resource;
1919
import java.util.ArrayList;
2020
import java.util.Date;
2121
import java.util.HashMap;
@@ -32,11 +32,9 @@
3232
public class AlertSubscribeServiceImpl extends ServiceImpl<AlarmSubscribeMapper, AlarmSubscribe>
3333
implements AlertSubscribeService {
3434

35-
@Resource
35+
@Autowired
3636
private AlarmSubscribeConverter alarmSubscribeConverter;
3737

38-
@Resource
39-
private AlarmSubscribeMapper alarmSubscribeMapper;
4038

4139
public Boolean saveDataBatch(AlarmSubscribeDTO alarmSubscribeDTO, String creator, String tenant,
4240
String workspace) {
@@ -56,7 +54,9 @@ public Boolean saveDataBatch(AlarmSubscribeDTO alarmSubscribeDTO, String creator
5654
alarmSubscribeInfo.stream().map(AlarmSubscribeInfo::getId).collect(Collectors.toList());
5755
ids.removeAll(updateIds);
5856
// 删除
59-
this.removeBatchByIds(ids);
57+
if (!CollectionUtils.isEmpty(ids)) {
58+
ids.forEach(id -> this.baseMapper.deleteById(id));
59+
}
6060

6161
List<AlarmSubscribe> alarmSubscribeList = new ArrayList<>();
6262
alarmSubscribeDTO.getAlarmSubscribe().forEach(e -> {
@@ -88,7 +88,7 @@ public AlarmSubscribeDTO queryByUniqueId(QueryWrapper<AlarmSubscribe> queryWrapp
8888
String uniqueId) {
8989
AlarmSubscribeDTO alarmSubscribeDTO = new AlarmSubscribeDTO();
9090
alarmSubscribeDTO.setUniqueId(uniqueId);
91-
List<AlarmSubscribe> list = this.alarmSubscribeMapper.selectList(queryWrapper);
91+
List<AlarmSubscribe> list = this.baseMapper.selectList(queryWrapper);
9292
if (!CollectionUtils.isEmpty(list)) {
9393
alarmSubscribeDTO.setEnvType(list.get(0).getEnvType());
9494
}
@@ -98,7 +98,7 @@ public AlarmSubscribeDTO queryByUniqueId(QueryWrapper<AlarmSubscribe> queryWrapp
9898

9999
@Override
100100
public List<AlarmSubscribeInfo> queryByMap(QueryWrapper<AlarmSubscribe> queryWrapper) {
101-
List<AlarmSubscribe> list = this.alarmSubscribeMapper.selectList(queryWrapper);
101+
List<AlarmSubscribe> list = this.baseMapper.selectList(queryWrapper);
102102
return alarmSubscribeConverter.dosToDTOs(list);
103103
}
104104

‎server/home/home-service/src/main/java/io/holoinsight/server/home/biz/service/GaeaCollectConfigService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public interface GaeaCollectConfigService extends IService<GaeaCollectConfig> {
1818

1919
GaeaCollectConfigDTO findById(Long id);
2020

21+
GaeaCollectConfigDTO findByTableName(String tenant, String workspace, String tableName);
22+
2123
List<GaeaCollectConfigDTO> findByRefId(String refId);
2224

2325
GaeaCollectConfigDTO upsert(GaeaCollectConfigDTO gaeaCollectConfigDTO);

‎server/home/home-service/src/main/java/io/holoinsight/server/home/biz/service/impl/GaeaCollectConfigServiceImpl.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
*/
44
package io.holoinsight.server.home.biz.service.impl;
55

6+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
68
import io.holoinsight.server.common.MD5Hash;
79
import io.holoinsight.server.home.biz.service.GaeaCollectConfigService;
810
import io.holoinsight.server.home.dal.converter.GaeaCollectConfigConverter;
911
import io.holoinsight.server.home.dal.mapper.GaeaCollectConfigMapper;
1012
import io.holoinsight.server.home.dal.model.GaeaCollectConfig;
1113
import io.holoinsight.server.home.dal.model.dto.GaeaCollectConfigDTO;
12-
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
1314
import lombok.extern.slf4j.Slf4j;
15+
import org.apache.commons.lang3.StringUtils;
1416
import org.mapstruct.factory.Mappers;
1517
import org.springframework.stereotype.Service;
1618
import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +41,20 @@ public GaeaCollectConfigDTO findById(Long id) {
3941
return gaeaCollectConfigConverter.doToDTO(getById(id));
4042
}
4143

44+
@Override
45+
public GaeaCollectConfigDTO findByTableName(String tenant, String workspace, String tableName) {
46+
QueryWrapper<GaeaCollectConfig> wrapper = new QueryWrapper<>();
47+
48+
wrapper.eq("tenant", tenant);
49+
if (StringUtils.isNotBlank(workspace)) {
50+
wrapper.eq("workspace", workspace);
51+
}
52+
wrapper.eq("table_name", tableName);
53+
wrapper.eq("deleted", 0);
54+
wrapper.last("LIMIT 1");
55+
return gaeaCollectConfigConverter.doToDTO(this.getOne(wrapper));
56+
}
57+
4258
@Override
4359
public List<GaeaCollectConfigDTO> findByRefId(String refId) {
4460
Map<String, Object> columnMap = new HashMap<>();

‎server/home/home-web/src/main/java/io/holoinsight/server/home/web/controller/AlarmSubscribeFacadeImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ public void checkParameter() {
106106
ParaCheckUtil.checkParaNotNull(alarmSubscribeDTO, "alarmSubscribeDTO");
107107
MonitorScope ms = RequestContext.getContext().ms;
108108
MonitorUser mu = RequestContext.getContext().mu;
109-
if (StringUtils.isNotEmpty(alarmSubscribeDTO.getUniqueId())) {
109+
String uniqueId = alarmSubscribeDTO.getUniqueId();
110+
if (StringUtils.isNotEmpty(uniqueId)) {
110111
ParaCheckUtil.checkParaBoolean(
111-
parameterSecurityService.checkRuleTenantAndWorkspace(alarmSubscribeDTO.getUniqueId(),
112-
tenant(), workspace()),
112+
parameterSecurityService.checkRuleTenantAndWorkspace(uniqueId, tenant(), workspace()),
113113
"uniqueId do not belong to this tenant " + tenant() + " or workspace " + workspace());
114114
}
115115
if (!CollectionUtils.isEmpty(alarmSubscribeDTO.getAlarmSubscribe())) {

‎server/home/home-web/src/main/java/io/holoinsight/server/home/web/security/custom/AlarmRuleLevelAuthorizationChecker.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,25 @@
66
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
77
import com.google.common.reflect.TypeToken;
88
import io.holoinsight.server.common.J;
9-
import io.holoinsight.server.common.dao.entity.MetricInfo;
10-
import io.holoinsight.server.common.dao.entity.dto.MetricInfoDTO;
11-
import io.holoinsight.server.common.service.RequestContextAdapter;
9+
import io.holoinsight.server.common.MonitorPageRequest;
1210
import io.holoinsight.server.common.RequestContext;
13-
import io.holoinsight.server.common.dao.mapper.AlarmRuleMapper;
14-
import io.holoinsight.server.common.dao.mapper.AlertTemplateMapper;
11+
import io.holoinsight.server.common.dao.emuns.TimeFilterEnum;
1512
import io.holoinsight.server.common.dao.entity.AlarmRule;
1613
import io.holoinsight.server.common.dao.entity.AlertTemplate;
1714
import io.holoinsight.server.common.dao.entity.dto.AlarmRuleDTO;
1815
import io.holoinsight.server.common.dao.entity.dto.AlertRuleExtra;
1916
import io.holoinsight.server.common.dao.entity.dto.AlertSilenceConfig;
17+
import io.holoinsight.server.common.dao.entity.dto.MetricInfoDTO;
2018
import io.holoinsight.server.common.dao.entity.dto.NotificationConfig;
2119
import io.holoinsight.server.common.dao.entity.dto.NotificationTemplate;
2220
import io.holoinsight.server.common.dao.entity.dto.alarm.AlarmRuleConf;
2321
import io.holoinsight.server.common.dao.entity.dto.alarm.TimeFilter;
24-
import io.holoinsight.server.common.dao.emuns.TimeFilterEnum;
25-
import io.holoinsight.server.common.MonitorPageRequest;
2622
import io.holoinsight.server.common.dao.entity.dto.alarm.trigger.CompareConfig;
2723
import io.holoinsight.server.common.dao.entity.dto.alarm.trigger.DataSource;
2824
import io.holoinsight.server.common.dao.entity.dto.alarm.trigger.Trigger;
25+
import io.holoinsight.server.common.dao.mapper.AlarmRuleMapper;
26+
import io.holoinsight.server.common.dao.mapper.AlertTemplateMapper;
27+
import io.holoinsight.server.common.service.RequestContextAdapter;
2928
import io.holoinsight.server.home.web.common.ParaCheckUtil;
3029
import io.holoinsight.server.home.web.security.LevelAuthorizationCheckResult;
3130
import io.holoinsight.server.home.web.security.LevelAuthorizationMetaData;
@@ -86,13 +85,14 @@ public class AlarmRuleLevelAuthorizationChecker extends AbstractQueryChecker
8685

8786
private static final Set<String> silenceModes =
8887
new HashSet<>(Arrays.asList("default", "gradual", "fixed"));
89-
private static final Set<String> aggregators = new HashSet<>(Arrays.asList("sum", "avg", "mix",
90-
"max", "count", "none", "SUM", "AVG", "MIX", "MAX", "COUNT", "NONE"));
88+
private static final Set<String> aggregators = new HashSet<>(Arrays.asList("sum", "avg", "min",
89+
"max", "count", "none", "SUM", "AVG", "MIN", "MAX", "COUNT", "NONE"));
9190
private static final Set<String> metricTypes =
9291
new HashSet<>(Arrays.asList("app", "cache", "log", "oss", "trace", "system", "metric",
9392
"service", "function", "pg", "mongodb", "db", "miniProgram", "mysql"));
94-
private static final Set<String> products = new HashSet<>(Arrays.asList("JVM", "Function",
95-
"OceanBase", "Tbase", "PortCheck", "System", "MiniProgram", "Spanner", "IoT", "APM"));
93+
private static final Set<String> products = new HashSet<>(
94+
Arrays.asList("JVM", "Function", "OceanBase", "Tbase", "PortCheck", "System", "MiniProgram",
95+
"Spanner", "IoT", "APM", "Mysql", "SLB", "SOFAMQX", "Postgres", "Gateway"));
9696

9797
@Override
9898
public LevelAuthorizationCheckResult check(LevelAuthorizationMetaData levelAuthMetaData,

‎server/registry/registry-model/src/main/java/io/holoinsight/server/registry/model/Output.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package io.holoinsight.server.registry.model;
55

6+
import lombok.AllArgsConstructor;
67
import lombok.Getter;
78
import lombok.Setter;
89
import lombok.ToString;
@@ -22,6 +23,7 @@ public class Output {
2223
*/
2324
private String type;
2425
private Gateway gateway;
26+
private SLSGateway sls;
2527

2628
@ToString
2729
@Getter
@@ -32,4 +34,16 @@ public static class Gateway {
3234
*/
3335
private String metricName;
3436
}
37+
38+
@ToString
39+
@Getter
40+
@Setter
41+
@AllArgsConstructor
42+
public static class SLSGateway {
43+
private String endpoint;
44+
private String project;
45+
private String logstore;
46+
private String ak;
47+
private String sk;
48+
}
3549
}

0 commit comments

Comments
 (0)