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 2019/10/22 04:52:52 UTC
[skywalking] branch scope_name created (now f2b4244)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch scope_name
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at f2b4244 Makes the scope of alarm information more semantic.
This branch includes the following new commits:
new f2b4244 Makes the scope of alarm information more semantic.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Makes the scope of alarm information more
semantic.
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch scope_name
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f2b42440a7d99baadaee5c98fd0c0b5b750fc430
Author: Jared.Tan <ji...@daocloud.io>
AuthorDate: Tue Oct 22 12:51:56 2019 +0800
Makes the scope of alarm information more semantic.
---
docs/en/setup/backend/backend-alarm.md | 6 ++++--
.../skywalking/oap/server/core/alarm/provider/RunningRule.java | 1 +
.../oap/server/core/alarm/provider/AlarmMessageFormatterTest.java | 8 ++++++++
.../oap/server/core/alarm/provider/RunningRuleTest.java | 4 ++++
.../org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java | 1 +
.../skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java | 4 ++++
.../org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java | 3 +++
.../oap/server/core/alarm/ServiceInstanceMetaInAlarm.java | 4 ++++
.../skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java | 4 ++++
9 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/docs/en/setup/backend/backend-alarm.md b/docs/en/setup/backend/backend-alarm.md
index 0a2ee51..6012376 100644
--- a/docs/en/setup/backend/backend-alarm.md
+++ b/docs/en/setup/backend/backend-alarm.md
@@ -76,14 +76,16 @@ Example as following
```json
[{
"scopeId": 1,
- "name": "serviceA",
+ "scope": "SERVICE",
+ "name": "serviceA",
"id0": 12,
"id1": 0,
"alarmMessage": "alarmMessage xxxx",
"startTime": 1560524171000
}, {
"scopeId": 1,
- "name": "serviceB",
+ "scope": "SERVICE",
+ "name": "serviceB",
"id0": 23,
"id1": 0,
"alarmMessage": "alarmMessage yyy",
diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
index 0d6f81e..3c6a8a1 100644
--- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
+++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
@@ -148,6 +148,7 @@ public class RunningRule {
AlarmMessage alarmMessage = window.checkAlarm();
if (alarmMessage != AlarmMessage.NONE) {
alarmMessage.setScopeId(meta.getScopeId());
+ alarmMessage.setScope(meta.getScope());
alarmMessage.setName(meta.getName());
alarmMessage.setId0(meta.getId0());
alarmMessage.setId1(meta.getId1());
diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
index f46d764..05dcc98 100644
--- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
+++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
@@ -27,6 +27,10 @@ public class AlarmMessageFormatterTest {
AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc words {sdf");
String message = formatter.format(new MetaInAlarm() {
+ @Override public String getScope() {
+ return "SERVICE";
+ }
+
@Override public int getScopeId() {
return -1;
}
@@ -56,6 +60,10 @@ public class AlarmMessageFormatterTest {
AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc} words {name} - {id} .. {");
String message = formatter.format(new MetaInAlarm() {
+ @Override public String getScope() {
+ return "SERVICE";
+ }
+
@Override public int getScopeId() {
return -1;
}
diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
index 72cea04..12d6d99 100644
--- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
+++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
@@ -183,6 +183,10 @@ public class RunningRuleTest {
private MetaInAlarm getMetaInAlarm(int id) {
return new MetaInAlarm() {
+ @Override public String getScope() {
+ return "SERVICE";
+ }
+
@Override public int getScopeId() {
return DefaultScopeDefine.SERVICE;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java
index 4eb1dd7..7b23cc7 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java
@@ -32,6 +32,7 @@ public class AlarmMessage {
public static AlarmMessage NONE = new NoAlarm();
private int scopeId;
+ private String scope;
private String name;
private int id0;
private int id1;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java
index 27c4833..ad0f23a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java
@@ -33,6 +33,10 @@ public class EndpointMetaInAlarm extends MetaInAlarm {
private String[] tags;
private String[] properties;
+ @Override public String getScope() {
+ return DefaultScopeDefine.ENDPOINT_CATALOG_NAME;
+ }
+
@Override public int getScopeId() {
return DefaultScopeDefine.ENDPOINT;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java
index 8111284..f6e888c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java
@@ -21,6 +21,9 @@ package org.apache.skywalking.oap.server.core.alarm;
import java.util.Objects;
public abstract class MetaInAlarm {
+
+ public abstract String getScope();
+
public abstract int getScopeId();
public abstract String getName();
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java
index 1a4c8ee..2a79ced 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java
@@ -31,6 +31,10 @@ public class ServiceInstanceMetaInAlarm extends MetaInAlarm {
private String[] tags;
private String[] properties;
+ @Override public String getScope() {
+ return DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME;
+ }
+
@Override public int getScopeId() {
return DefaultScopeDefine.SERVICE_INSTANCE;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java
index d143e97..1bab784 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java
@@ -31,6 +31,10 @@ public class ServiceMetaInAlarm extends MetaInAlarm {
private String[] tags;
private String[] properties;
+ @Override public String getScope() {
+ return DefaultScopeDefine.SERVICE_CATALOG_NAME;
+ }
+
@Override public int getScopeId() {
return DefaultScopeDefine.SERVICE;
}