You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/09/28 07:43:10 UTC
[incubator-skywalking] branch new-indicator created (now f411a51)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch new-indicator
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at f411a51 Add new indicators and change two indicator names.
This branch includes the following new commits:
new f411a51 Add new indicators and change two indicator names.
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.
[incubator-skywalking] 01/01: Add new indicators and change two
indicator names.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch new-indicator
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit f411a51e4d4eeb22fc93efb45cd76e53e4b6926a
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Sep 28 15:42:50 2018 +0800
Add new indicators and change two indicator names.
---
.../generated/endpoint/EndpointAvgIndicator.java | 4 +--
.../generated/endpoint/EndpointP50Indicator.java | 2 +-
.../generated/endpoint/EndpointP75Indicator.java | 2 +-
.../generated/endpoint/EndpointP90Indicator.java | 2 +-
.../generated/endpoint/EndpointP95Indicator.java | 2 +-
.../generated/endpoint/EndpointP99Indicator.java | 2 +-
.../generated/endpoint/EndpointSlaIndicator.java | 2 +-
.../EndpointRelationCpmIndicator.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 2 +-
.../generated/service/ServiceCpmIndicator.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 2 +-
.../generated/service/ServiceP75Indicator.java | 2 +-
.../generated/service/ServiceP90Indicator.java | 2 +-
.../generated/service/ServiceP95Indicator.java | 2 +-
.../generated/service/ServiceP99Indicator.java | 2 +-
.../service/ServiceRespTimeIndicator.java | 2 +-
.../generated/service/ServiceSlaIndicator.java | 2 +-
.../ServiceInstanceCpmIndicator.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 6 ++---
.../InstanceJvmCpuIndicator.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 2 +-
.../InstanceJvmOldGcTimeIndicator.java | 2 +-
.../InstanceJvmYoungGcCountIndicator.java | 2 +-
.../InstanceJvmYoungGcTimeIndicator.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 2 +-
...java => InstanceJvmMemoryHeapMaxIndicator.java} | 24 ++++++++---------
.../InstanceJvmMemoryNoheapIndicator.java | 2 +-
...va => InstanceJvmMemoryNoheapMaxIndicator.java} | 24 ++++++++---------
.../ServiceInstanceJVMMemoryDispatcher.java | 30 +++++++++++++++++++++-
.../ServiceRelationClientCallSlaIndicator.java | 2 +-
.../ServiceRelationClientCpmIndicator.java | 2 +-
.../ServiceRelationClientRespTimeIndicator.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 2 +-
.../ServiceRelationServerCpmIndicator.java | 2 +-
.../ServiceRelationServerRespTimeIndicator.java | 2 +-
.../src/main/resources/official_analysis.oal | 12 +++++----
36 files changed, 95 insertions(+), 65 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
index c7e104b..1fec151 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_avg", builder = EndpointAvgIndicator.Builder.class)
public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@@ -115,7 +115,7 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("endpoint_Avg", Scope.Endpoint, entityId);
+ return new AlarmMeta("endpoint_avg", Scope.Endpoint, entityId);
}
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java
index 0102e94..dd1086b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_p50", builder = EndpointP50Indicator.Builder.class)
public class EndpointP50Indicator extends P50Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java
index 02da822..301482c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_p75", builder = EndpointP75Indicator.Builder.class)
public class EndpointP75Indicator extends P75Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java
index cdba906..712d1af 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_p90", builder = EndpointP90Indicator.Builder.class)
public class EndpointP90Indicator extends P90Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java
index 436b985..f924853 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_p95", builder = EndpointP95Indicator.Builder.class)
public class EndpointP95Indicator extends P95Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java
index fa14beb..73b313c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_p99", builder = EndpointP99Indicator.Builder.class)
public class EndpointP99Indicator extends P99Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java
index 71a4138..86e12fa 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_sla", builder = EndpointSlaIndicator.Builder.class)
public class EndpointSlaIndicator extends PercentIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java
index be083fc..1651e0c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_relation_cpm", builder = EndpointRelationCpmIndicator.Builder.class)
public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "child_service_id") private int childServiceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java
index acf26d6..7b66108 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_relation_resp_time", builder = EndpointRelationRespTimeIndicator.Builder.class)
public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Setter @Getter @Column(columnName = "child_service_id") private int childServiceId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java
index c0619e1..da2c379 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_cpm", builder = ServiceCpmIndicator.Builder.class)
public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java
index a09301c..30fab81 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_p50", builder = ServiceP50Indicator.Builder.class)
public class ServiceP50Indicator extends P50Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java
index bd7bfa8..78b716d 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_p75", builder = ServiceP75Indicator.Builder.class)
public class ServiceP75Indicator extends P75Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java
index 810b783..0754d0e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_p90", builder = ServiceP90Indicator.Builder.class)
public class ServiceP90Indicator extends P90Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java
index ff2591f..3be4020 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_p95", builder = ServiceP95Indicator.Builder.class)
public class ServiceP95Indicator extends P95Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java
index 93da1af..76e23d8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_p99", builder = ServiceP99Indicator.Builder.class)
public class ServiceP99Indicator extends P99Indicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java
index b07dc5e..46cef31 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_resp_time", builder = ServiceRespTimeIndicator.Builder.class)
public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java
index 97a55ff..a77f30b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_sla", builder = ServiceSlaIndicator.Builder.class)
public class ServiceSlaIndicator extends PercentIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java
index 0949ea0..b850f40 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_instance_cpm", builder = ServiceInstanceCpmIndicator.Builder.class)
public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
index 5a69084..4225fb8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
@@ -38,10 +38,10 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "serviceinstance_resp_time", builder = ServiceInstanceRespTimeIndicator.Builder.class)
+@StorageEntity(name = "service_instance_resp_time", builder = ServiceInstanceRespTimeIndicator.Builder.class)
public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Override public String id() {
@@ -112,7 +112,7 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("serviceInstance_resp_time", Scope.ServiceInstance, entityId);
+ return new AlarmMeta("service_instance_resp_time", Scope.ServiceInstance, entityId);
}
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
index e494203..8e743e0 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_cpu", builder = InstanceJvmCpuIndicator.Builder.class)
public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java
index 0306793..8917f70 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_old_gc_count", builder = InstanceJvmOldGcCountIndicator.Builder.class)
public class InstanceJvmOldGcCountIndicator extends SumIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java
index da0a00a..0f6eb1b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_old_gc_time", builder = InstanceJvmOldGcTimeIndicator.Builder.class)
public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java
index 8d53cbf..5076a99 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_young_gc_count", builder = InstanceJvmYoungGcCountIndicator.Builder.class)
public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
index 1d8bce4..56da0cc 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_young_gc_time", builder = InstanceJvmYoungGcTimeIndicator.Builder.class)
public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
index 8ec556f..815b9d5 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_memory_heap", builder = InstanceJvmMemoryHeapIndicator.Builder.class)
public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java
similarity index 86%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java
index 8ec556f..f6c63d3 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java
@@ -38,10 +38,10 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "instance_jvm_memory_heap", builder = InstanceJvmMemoryHeapIndicator.Builder.class)
-public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements AlarmSupported {
+@StorageEntity(name = "instance_jvm_memory_heap_max", builder = InstanceJvmMemoryHeapMaxIndicator.Builder.class)
+public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
@@ -72,7 +72,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
if (getClass() != obj.getClass())
return false;
- InstanceJvmMemoryHeapIndicator indicator = (InstanceJvmMemoryHeapIndicator)obj;
+ InstanceJvmMemoryHeapMaxIndicator indicator = (InstanceJvmMemoryHeapMaxIndicator)obj;
if (entityId != indicator.entityId)
return false;
@@ -112,12 +112,12 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("instance_jvm_memory_heap", Scope.ServiceInstanceJVMMemory, entityId);
+ return new AlarmMeta("instance_jvm_memory_heap_max", Scope.ServiceInstanceJVMMemory, entityId);
}
@Override
public Indicator toHour() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -130,7 +130,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
@Override
public Indicator toDay() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -143,7 +143,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
@Override
public Indicator toMonth() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -154,9 +154,9 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
return indicator;
}
- public static class Builder implements StorageBuilder<InstanceJvmMemoryHeapIndicator> {
+ public static class Builder implements StorageBuilder<InstanceJvmMemoryHeapMaxIndicator> {
- @Override public Map<String, Object> data2Map(InstanceJvmMemoryHeapIndicator storageData) {
+ @Override public Map<String, Object> data2Map(InstanceJvmMemoryHeapMaxIndicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("entity_id", storageData.getEntityId());
map.put("service_instance_id", storageData.getServiceInstanceId());
@@ -167,8 +167,8 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
return map;
}
- @Override public InstanceJvmMemoryHeapIndicator map2Data(Map<String, Object> dbMap) {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ @Override public InstanceJvmMemoryHeapMaxIndicator map2Data(Map<String, Object> dbMap) {
+ InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
indicator.setEntityId((String)dbMap.get("entity_id"));
indicator.setServiceInstanceId(((Number)dbMap.get("service_instance_id")).intValue());
indicator.setSummation(((Number)dbMap.get("summation")).longValue());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java
index a42619f..4d847d1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_memory_noheap", builder = InstanceJvmMemoryNoheapIndicator.Builder.class)
public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java
similarity index 85%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java
index 8ec556f..6e831d4 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java
@@ -38,10 +38,10 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "instance_jvm_memory_heap", builder = InstanceJvmMemoryHeapIndicator.Builder.class)
-public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements AlarmSupported {
+@StorageEntity(name = "instance_jvm_memory_noheap_max", builder = InstanceJvmMemoryNoheapMaxIndicator.Builder.class)
+public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
@Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId;
@Override public String id() {
@@ -72,7 +72,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
if (getClass() != obj.getClass())
return false;
- InstanceJvmMemoryHeapIndicator indicator = (InstanceJvmMemoryHeapIndicator)obj;
+ InstanceJvmMemoryNoheapMaxIndicator indicator = (InstanceJvmMemoryNoheapMaxIndicator)obj;
if (entityId != indicator.entityId)
return false;
@@ -112,12 +112,12 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("instance_jvm_memory_heap", Scope.ServiceInstanceJVMMemory, entityId);
+ return new AlarmMeta("instance_jvm_memory_noheap_max", Scope.ServiceInstanceJVMMemory, entityId);
}
@Override
public Indicator toHour() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -130,7 +130,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
@Override
public Indicator toDay() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -143,7 +143,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
@Override
public Indicator toMonth() {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
@@ -154,9 +154,9 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
return indicator;
}
- public static class Builder implements StorageBuilder<InstanceJvmMemoryHeapIndicator> {
+ public static class Builder implements StorageBuilder<InstanceJvmMemoryNoheapMaxIndicator> {
- @Override public Map<String, Object> data2Map(InstanceJvmMemoryHeapIndicator storageData) {
+ @Override public Map<String, Object> data2Map(InstanceJvmMemoryNoheapMaxIndicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("entity_id", storageData.getEntityId());
map.put("service_instance_id", storageData.getServiceInstanceId());
@@ -167,8 +167,8 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
return map;
}
- @Override public InstanceJvmMemoryHeapIndicator map2Data(Map<String, Object> dbMap) {
- InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
+ @Override public InstanceJvmMemoryNoheapMaxIndicator map2Data(Map<String, Object> dbMap) {
+ InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
indicator.setEntityId((String)dbMap.get("entity_id"));
indicator.setServiceInstanceId(((Number)dbMap.get("service_instance_id")).intValue());
indicator.setSummation(((Number)dbMap.get("summation")).longValue());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java
index 3095ab4..f6c5866 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java
@@ -33,6 +33,8 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher<Serv
@Override public void dispatch(ServiceInstanceJVMMemory source) {
doInstanceJvmMemoryHeap(source);
doInstanceJvmMemoryNoheap(source);
+ doInstanceJvmMemoryHeapMax(source);
+ doInstanceJvmMemoryNoheapMax(source);
}
private void doInstanceJvmMemoryHeap(ServiceInstanceJVMMemory source) {
@@ -45,7 +47,7 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher<Serv
indicator.setTimeBucket(source.getTimeBucket());
indicator.setEntityId(source.getEntityId());
indicator.setServiceInstanceId(source.getServiceInstanceId());
- indicator.combine(source.getMax(), 1);
+ indicator.combine(source.getUsed(), 1);
IndicatorProcess.INSTANCE.in(indicator);
}
private void doInstanceJvmMemoryNoheap(ServiceInstanceJVMMemory source) {
@@ -58,6 +60,32 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher<Serv
indicator.setTimeBucket(source.getTimeBucket());
indicator.setEntityId(source.getEntityId());
indicator.setServiceInstanceId(source.getServiceInstanceId());
+ indicator.combine(source.getUsed(), 1);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doInstanceJvmMemoryHeapMax(ServiceInstanceJVMMemory source) {
+ InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
+
+ if (!new EqualMatch().setLeft(source.isHeapStatus()).setRight(true).match()) {
+ return;
+ }
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.setEntityId(source.getEntityId());
+ indicator.setServiceInstanceId(source.getServiceInstanceId());
+ indicator.combine(source.getMax(), 1);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doInstanceJvmMemoryNoheapMax(ServiceInstanceJVMMemory source) {
+ InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
+
+ if (!new EqualMatch().setLeft(source.isHeapStatus()).setRight(false).match()) {
+ return;
+ }
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.setEntityId(source.getEntityId());
+ indicator.setServiceInstanceId(source.getServiceInstanceId());
indicator.combine(source.getMax(), 1);
IndicatorProcess.INSTANCE.in(indicator);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java
index 4dfc6aa..c8a6c76 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_client_call_sla", builder = ServiceRelationClientCallSlaIndicator.Builder.class)
public class ServiceRelationClientCallSlaIndicator extends PercentIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java
index 281e936..a5a0763 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_client_cpm", builder = ServiceRelationClientCpmIndicator.Builder.class)
public class ServiceRelationClientCpmIndicator extends CPMIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java
index b0c5bb8..90593a6 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_client_resp_time", builder = ServiceRelationClientRespTimeIndicator.Builder.class)
public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java
index a3cd1b6..d11e6ca 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_server_call_sla", builder = ServiceRelationServerCallSlaIndicator.Builder.class)
public class ServiceRelationServerCallSlaIndicator extends PercentIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java
index 17763ab..9d713da 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_server_cpm", builder = ServiceRelationServerCpmIndicator.Builder.class)
public class ServiceRelationServerCpmIndicator extends CPMIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java
index 5f68a46..2a23c76 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_server_resp_time", builder = ServiceRelationServerRespTimeIndicator.Builder.class)
public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private String entityId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git a/oap-server/server-core/src/main/resources/official_analysis.oal b/oap-server/server-core/src/main/resources/official_analysis.oal
index b8fd744..f233e49 100644
--- a/oap-server/server-core/src/main/resources/official_analysis.oal
+++ b/oap-server/server-core/src/main/resources/official_analysis.oal
@@ -43,11 +43,11 @@ service_relation_client_resp_time = from(ServiceRelation.latency).filter(detectP
service_relation_server_resp_time = from(ServiceRelation.latency).filter(detectPoint == DetectPoint.SERVER).longAvg();
// Service Instance Scope metric
-serviceInstance_resp_time= from(ServiceInstance.latency).longAvg();
+service_instance_resp_time= from(ServiceInstance.latency).longAvg();
service_instance_cpm = from(ServiceInstance.*).cpm();
// Endpoint scope metric
-endpoint_Avg = from(Endpoint.latency).longAvg();
+endpoint_avg = from(Endpoint.latency).longAvg();
endpoint_sla = from(Endpoint.*).percent(status == true);
endpoint_p99 = from(Endpoint.latency).p99(10);
endpoint_p95 = from(Endpoint.latency).p95(10);
@@ -61,9 +61,11 @@ endpoint_relation_resp_time = from(EndpointRelation.rpcLatency).filter(detectPoi
// JVM instance metric
instance_jvm_cpu = from(ServiceInstanceJVMCPU.usePercent).doubleAvg();
-instance_jvm_memory_heap = from(ServiceInstanceJVMMemory.max).filter(isHeap == true).longAvg();
-instance_jvm_memory_noheap = from(ServiceInstanceJVMMemory.max).filter(isHeap == false).longAvg();
+instance_jvm_memory_heap = from(ServiceInstanceJVMMemory.used).filter(heapStatus == true).longAvg();
+instance_jvm_memory_noheap = from(ServiceInstanceJVMMemory.used).filter(heapStatus == false).longAvg();
+instance_jvm_memory_heap_max = from(ServiceInstanceJVMMemory.max).filter(heapStatus == true).longAvg();
+instance_jvm_memory_noheap_max = from(ServiceInstanceJVMMemory.max).filter(heapStatus == false).longAvg();
instance_jvm_young_gc_time = from(ServiceInstanceJVMGC.time).filter(phrase == GCPhrase.NEW).longAvg();
instance_jvm_old_gc_time = from(ServiceInstanceJVMGC.time).filter(phrase == GCPhrase.OLD).longAvg();
instance_jvm_young_gc_count = from(ServiceInstanceJVMGC.count).filter(phrase == GCPhrase.NEW).sum();
-instance_jvm_old_gc_count = from(ServiceInstanceJVMGC.count).filter(phrase == GCPhrase.OLD).sum();
+instance_jvm_old_gc_count = from(ServiceInstanceJVMGC.count).filter(phrase == GCPhrase.OLD).sum();
\ No newline at end of file