You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2020/08/21 06:32:19 UTC
[skywalking] 02/04: update.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch slack_alarm
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit a15111c52ce2ed8267f9f549cf4b0d009aa83ad1
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Thu Aug 20 17:41:41 2020 +0800
update.
---
.../oap/server/core/alarm/provider/slack/SlackhookCallback.java | 6 +++---
oap-server/server-bootstrap/src/main/resources/alarm-settings.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
index d6abf41..f21ce5a 100644
--- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
+++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
@@ -91,9 +91,9 @@ public class SlackhookCallback implements AlarmCallback {
GSON.fromJson(
String.format(
alarmRulesWatcher.getSlackSettings().getTextTemplate(),
- OffsetDateTime.ofInstant(Instant.ofEpochMilli(item.getStartTime()),
- ZoneId.systemDefault()),
- item.getId0(), item.getScope(), item.getName(), item.getAlarmMessage()
+ OffsetDateTime.ofInstant(
+ Instant.ofEpochMilli(item.getStartTime()), ZoneId.systemDefault()
+ ), item.getScope(), item.getName(), item.getAlarmMessage(), item.getId0()
),
JsonObject.class
)));
diff --git a/oap-server/server-bootstrap/src/main/resources/alarm-settings.yml b/oap-server/server-bootstrap/src/main/resources/alarm-settings.yml
index 84d032d..237a761 100755
--- a/oap-server/server-bootstrap/src/main/resources/alarm-settings.yml
+++ b/oap-server/server-bootstrap/src/main/resources/alarm-settings.yml
@@ -53,7 +53,7 @@ slackHooks:
"type": "section",
"text": {
"type": "mrkdwn",
- "text": ":alarm_clock: [%s] *Apache Skywalking Alarm* \n [%s]: %s %s : %s "
+ "text": ":alarm_clock: *Apache Skywalking Alarm* ,%s \n [%s], %s *%s* , %s."
}
}
webhooks: