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 2020/01/10 09:10:42 UTC
[skywalking] branch percentile updated: Fix e2e and OAL script
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch percentile
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/percentile by this push:
new 604feef Fix e2e and OAL script
604feef is described below
commit 604feef09e678b044f0b2faf3acf4ac2fa62e69e
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jan 10 17:10:19 2020 +0800
Fix e2e and OAL script
---
.../src/main/resources/official_analysis.oal | 6 +---
.../skywalking/e2e/metrics/MetricsQuery.java | 32 ++++++++--------------
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/oap-server/server-bootstrap/src/main/resources/official_analysis.oal b/oap-server/server-bootstrap/src/main/resources/official_analysis.oal
index 48ebcf4..a68e6a4 100755
--- a/oap-server/server-bootstrap/src/main/resources/official_analysis.oal
+++ b/oap-server/server-bootstrap/src/main/resources/official_analysis.oal
@@ -17,11 +17,7 @@
*/
// All scope metrics
-all_p99 = from(All.latency).p99(10);
-all_p95 = from(All.latency).p95(10);
-all_p90 = from(All.latency).p90(10);
-all_p75 = from(All.latency).p75(10);
-all_p50 = from(All.latency).p50(10);
+all_percentile = from(All.latency).percentile(10);
all_heatmap = from(All.latency).thermodynamic(100, 20);
// Service scope metrics
diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
index 62c0d76..51dd4a5 100644
--- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
+++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java
@@ -24,32 +24,24 @@ import org.apache.skywalking.e2e.AbstractQuery;
* @author kezhenxu94
*/
public class MetricsQuery extends AbstractQuery<MetricsQuery> {
- public static String SERVICE_P99 = "service_p99";
- public static String SERVICE_P95 = "service_p95";
- public static String SERVICE_P90 = "service_p90";
- public static String SERVICE_P75 = "service_p75";
- public static String SERVICE_P50 = "service_p50";
+ public static String SERVICE_SLA = "service_sla";
+ public static String SERVICE_CPM = "service_cpm";
+ public static String SERVICE_RESP_TIME = "service_resp_time";
public static String SERVICE_APDEX = "service_apdex";
public static String[] ALL_SERVICE_METRICS = {
- SERVICE_P99,
- SERVICE_P95,
- SERVICE_P90,
- SERVICE_P75,
- SERVICE_P50,
+ SERVICE_SLA,
+ SERVICE_CPM,
+ SERVICE_RESP_TIME,
SERVICE_APDEX
};
- public static String ENDPOINT_P99 = "endpoint_p99";
- public static String ENDPOINT_P95 = "endpoint_p95";
- public static String ENDPOINT_P90 = "endpoint_p90";
- public static String ENDPOINT_P75 = "endpoint_p75";
- public static String ENDPOINT_P50 = "endpoint_p50";
+ public static String ENDPOINT_CPM = "endpoint_cpm";
+ public static String ENDPOINT_AVG = "endpoint_avg";
+ public static String ENDPOINT_SLA = "endpoint_sla";
public static String[] ALL_ENDPOINT_METRICS = {
- ENDPOINT_P99,
- ENDPOINT_P95,
- ENDPOINT_P90,
- ENDPOINT_P75,
- ENDPOINT_P50
+ ENDPOINT_CPM,
+ ENDPOINT_AVG,
+ ENDPOINT_SLA,
};
public static String SERVICE_INSTANCE_RESP_TIME = "service_instance_resp_time";