Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
d98b8ee9
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
d98b8ee9
编写于
4月 28, 2021
作者:
高
高云峰
提交者:
GitHub
4月 28, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix spelling errors(rebootName -> robotName) in WeLinkAlarm. (#6860)
上级
1ff0e42a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
23 deletion
+36
-23
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
...kywalking/oap/server/core/alarm/provider/RulesReader.java
+22
-22
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
...oap/server/core/alarm/provider/welink/WeLinkSettings.java
+13
-0
oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
...er/core/alarm/provider/welink/WeLinkHookCallbackTest.java
+1
-1
未找到文件。
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
浏览文件 @
d98b8ee9
...
...
@@ -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
);
}
}
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
浏览文件 @
d98b8ee9
...
...
@@ -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
);
}
}
}
oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
浏览文件 @
d98b8ee9
...
...
@@ -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"
,
"r
ebo
otName"
,
"1,2,3"
"r
ob
otName"
,
"1,2,3"
));
Rules
rules
=
new
Rules
();
String
template
=
"Apache SkyWalking Alarm: \n %s."
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录