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

fix spelling errors(rebootName -> robotName) in WeLinkAlarm. (#6860)

This commit is contained in:
高云峰 2021-04-28 20:36:16 +08:00 committed by GitHub
parent 1ff0e42ab8
commit d98b8ee977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
View File

@ -21,16 +21,20 @@ package org.apache.skywalking.oap.server.core.alarm.provider;
import java.io.InputStream;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.HashMap;
import java.util.stream.Collectors;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.alarm.provider.dingtalk.DingtalkSettings;
import org.apache.skywalking.oap.server.core.alarm.provider.feishu.FeishuSettings;
import org.apache.skywalking.oap.server.core.alarm.provider.grpc.GRPCAlarmSetting;
import org.apache.skywalking.oap.server.core.alarm.provider.slack.SlackSettings;
import org.apache.skywalking.oap.server.core.alarm.provider.wechat.WechatSettings;
import org.apache.skywalking.oap.server.core.alarm.provider.welink.WeLinkSettings;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
@ -257,28 +261,24 @@ public class RulesReader {
/**
* Read WeLink hook config into {@link WeLinkSettings}
*/
@SuppressWarnings("unchecked")
private void readWeLinkConfig(Rules rules) {
Map welinkConfig = (Map) yamlData.get("welinkHooks");
if (welinkConfig != null) {
WeLinkSettings welinkSettings = new WeLinkSettings();
Object textTemplate = welinkConfig.getOrDefault("textTemplate", "");
welinkSettings.setTextTemplate((String) textTemplate);
List<Map<String, Object>> welinkWebHooks = (List<Map<String, Object>>) welinkConfig.get("webhooks");
if (welinkWebHooks != null) {
welinkWebHooks.forEach(welinkWebhook -> {
String clientId = (String) welinkWebhook.getOrDefault("client_id", "");
String clientSecret = (String) welinkWebhook.getOrDefault("client_secret", "");
String accessTokenUrl = (String) welinkWebhook.getOrDefault("access_token_url", "");
String messageUrl = (String) welinkWebhook.getOrDefault("message_url", "");
String groupIds = (String) welinkWebhook.getOrDefault("group_ids", "");
String rebootName = (String) welinkWebhook.getOrDefault("robot_name", "reboot");
welinkSettings.getWebhooks()
.add(new WeLinkSettings.WebHookUrl(clientId, clientSecret, accessTokenUrl, messageUrl,
rebootName, groupIds
));
});
}
rules.setWelinks(welinkSettings);
Map<String, Object> welinkConfig = (Map<String, Object>) yamlData.getOrDefault(
"welinkHooks",
Collections.EMPTY_MAP
);
String textTemplate = (String) welinkConfig.get("textTemplate");
List<Map<String, String>> welinkWebHooks = (List<Map<String, String>>) welinkConfig.get("webhooks");
if (StringUtil.isBlank(textTemplate) || CollectionUtils.isEmpty(welinkWebHooks)) {
return;
}
List<WeLinkSettings.WebHookUrl> webHookUrls = welinkWebHooks.stream().map(
WeLinkSettings.WebHookUrl::generateFromMap
).collect(Collectors.toList());
WeLinkSettings welinkSettings = new WeLinkSettings();
welinkSettings.setTextTemplate(textTemplate);
welinkSettings.setWebhooks(webHookUrls);
rules.setWelinks(welinkSettings);
}
}

13
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
View File

@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.core.alarm.provider.welink;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -56,5 +57,17 @@ public class WeLinkSettings {
private final String robotName;
// The groupIds message to send
private final String groupIds;
public static WebHookUrl generateFromMap(Map<String, String> params) {
String clientId = params.get("client_id");
String clientSecret = params.get("client_secret");
String accessTokenUrl = params.get("access_token_url");
String messageUrl = params.get("message_url");
String groupIds = params.get("group_ids");
String robotName = params.getOrDefault("robot_name", "robot");
return new WebHookUrl(clientId, clientSecret, accessTokenUrl, messageUrl,
robotName, groupIds
);
}
}
}

2
oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
View File

@ -74,7 +74,7 @@ public class WeLinkHookCallbackTest implements Servlet {
webHooks.add(new WeLinkSettings.WebHookUrl("clientId", "clientSecret",
"http://127.0.0.1:" + port + "/welinkhook/api/auth/v2/tickets",
"http://127.0.0.1:" + port + "/welinkhook/api/welinkim/v1/im-service/chat/group-chat",
"rebootName", "1,2,3"
"robotName", "1,2,3"
));
Rules rules = new Rules();
String template = "Apache SkyWalking Alarm: \n %s.";