This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 97e4c3a591 Apply MQE on VIRTUAL_CACHE layer UI-templates (#11098)
97e4c3a591 is described below

commit 97e4c3a5916146b36751ed83ebf3c93ef5351b86
Author: pg.yang <[email protected]>
AuthorDate: Sun Jul 16 20:09:18 2023 +0800

    Apply MQE on VIRTUAL_CACHE layer UI-templates (#11098)
---
 docs/en/changes/changes.md                         |   1 +
 .../virtual_cache/virtual-cache-root.json          |  32 ++--
 .../virtual_cache/virtual-cache-service.json       | 197 ++++++++++++---------
 3 files changed, 133 insertions(+), 97 deletions(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index f14f370c86..c95561337d 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -47,6 +47,7 @@
 * Increase the default memory size to avoid OOM.
 * Apply MQE on `MYSQL`, `POSTGRESQL`, `REDIS`, `ELASTICSEARCH` and `DYNAMODB` 
layer UI-templates.
 * Bump up graphql-java to 21.0.
+* Apply MQE on Virtual-Cache layer UI-templates
 
 #### UI
 
diff --git 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json
 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json
index af6891646a..5a7e11ff19 100644
--- 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json
+++ 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json
@@ -38,32 +38,40 @@
             "showYAxis": false,
             "showGroup": false
           },
-          "metrics": [
+          "expressions": [
+            "avg(cache_access_resp_time)",
+            "avg(cache_access_sla)/100",
+            "avg(cache_access_cpm)"
+          ],
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "SINGLE_VALUE",
+            "SINGLE_VALUE",
+            "SINGLE_VALUE"
+          ],
+          "subExpressions": [
             "cache_access_resp_time",
-            "cache_access_sla",
+            "cache_access_sla/100",
             "cache_access_cpm"
           ],
-          "metricTypes": [
-            "readMetricsValues",
-            "readMetricsValues",
-            "readMetricsValues"
+          "subTypesOfMQE": [
+            "TIME_SERIES_VALUES",
+            "TIME_SERIES_VALUES",
+            "TIME_SERIES_VALUES"
           ],
           "moved": false,
           "metricConfig": [
             {
               "unit": "ms",
-              "label": "Access Latency",
-              "calculation": "average"
+              "label": "Access Latency"
             },
             {
               "label": "Successful Access Rate",
-              "unit": "%",
-              "calculation": "percentageAvg"
+              "unit": "%"
             },
             {
               "label": "Access Traffic",
-              "unit": "calls / min",
-              "calculation": "average"
+              "unit": "calls / min"
             }
           ]
         },
diff --git 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
index 3b9b7d6dbd..4d4417e18f 100644
--- 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
+++ 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
@@ -39,14 +39,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_access_resp_time"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "ms",
+              "label": "Response Time"
+            }
           ],
-          "value": "6",
-          "label": "Access_Avg_Response",
           "filters": {
             "dataIndex": 17,
             "sourceId": "4"
@@ -83,19 +88,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_access_sla"
+          "expressions": [
+            "cache_access_sla/100"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
           ],
           "metricConfig": [
             {
-              "calculation": "percentage"
+              "unit": "%",
+              "label": "Successful Rate"
             }
           ],
-          "value": "3",
-          "label": "Successful_Rate",
           "filters": {
             "dataIndex": 17,
             "sourceId": "4"
@@ -131,14 +136,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_access_cpm"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "calls / min",
+              "label": "Access Traffic"
+            }
           ],
-          "value": "4",
-          "label": "Cache_Traffic",
           "associate": [
             {
               "widgetId": "1"
@@ -170,20 +180,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_access_percentile"
+          "expressions": [
+            
"relabels(cache_access_percentile{_='0,1,2,3,4'},_='P50,P75,P90,P95,P99')"
           ],
-          "metricTypes": [
-            "readLabeledMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "SINGLE_VALUE"
           ],
           "metricConfig": [
             {
-              "label": "P50, P75, P90, P95, P99",
-              "labelsIndex": "0,1,2,3,4"
+              "unit": "ms",
+              "label": " Latency Percentile"
             }
           ],
-          "value": "5",
-          "label": "5",
           "associate": [
             {
               "widgetId": "1"
@@ -223,14 +232,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_read_resp_time"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "ms",
+              "label": "Response Time"
+            }
           ],
-          "value": "6",
-          "label": "Cache_Read_Avg_Response",
           "filters": {
             "dataIndex": 17,
             "sourceId": "4"
@@ -267,19 +281,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_read_sla"
+          "expressions": [
+            "cache_read_sla/100"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
           ],
           "metricConfig": [
             {
-              "calculation": "percentage"
+              "unit": "%",
+              "label": "Successful Rate"
             }
           ],
-          "value": "3",
-          "label": "Successful_Rate",
           "associate": [
             {
               "widgetId": "5"
@@ -315,14 +329,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_write_resp_time"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "ms",
+              "label": "Response Time"
+            }
           ],
-          "value": "6",
-          "label": "Read_Avg_Response",
           "filters": {
             "dataIndex": 17,
             "sourceId": "4"
@@ -359,19 +378,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_write_sla"
+          "expressions": [
+            "cache_write_sla/100"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
           ],
           "metricConfig": [
             {
-              "calculation": "percentage"
+              "unit": "%",
+              "label": "Successful Rate"
             }
           ],
-          "value": "3",
-          "label": "Successful_Rate",
           "filters": {
             "dataIndex": 17,
             "sourceId": "4"
@@ -407,14 +426,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_read_cpm"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "calls / min",
+              "label": "Read Traffic"
+            }
           ],
-          "value": "4",
-          "label": "Cache_Traffic",
           "associate": [
             {
               "widgetId": "5"
@@ -446,20 +470,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_read_percentile"
+          "expressions": [
+            
"relabels(cache_read_percentile{_='0,1,2,3,4'},_='P50,P75,P90,P95,P99')"
           ],
-          "metricTypes": [
-            "readLabeledMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "SINGLE_VALUE"
           ],
           "metricConfig": [
             {
-              "label": "P50, P75, P90, P95, P99",
-              "labelsIndex": "0,1,2,3,4"
+              "unit": "ms",
+              "label": "Latency Percentile"
             }
           ],
-          "value": "5",
-          "label": "5",
           "associate": [
             {
               "widgetId": "5"
@@ -496,14 +519,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
+          "expressions": [
             "cache_write_cpm"
           ],
-          "metricTypes": [
-            "readMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "TIME_SERIES_VALUES"
+          ],
+          "metricConfig": [
+            {
+              "unit": "calls / min",
+              "label": "Write Traffic"
+            }
           ],
-          "value": "4",
-          "label": "Database_Traffic",
           "associate": [
             {
               "widgetId": "9"
@@ -535,20 +563,19 @@
             "showXAxis": true,
             "showYAxis": true
           },
-          "metrics": [
-            "cache_write_percentile"
+          "expressions": [
+            
"relabels(cache_write_percentile{_='0,1,2,3,4'},_='P50,P75,P90,P95,P99')"
           ],
-          "metricTypes": [
-            "readLabeledMetricsValues"
+          "metricMode": "Expression",
+          "typesOfMQE": [
+            "SINGLE_VALUE"
           ],
           "metricConfig": [
             {
-              "label": "P50, P75, P90, P95, P99",
-              "labelsIndex": "0,1,2,3,4"
+              "unit": "ms",
+              "label": "Latency Percentile"
             }
           ],
-          "value": "5",
-          "label": "5",
           "associate": [
             {
               "widgetId": "9"
@@ -579,14 +606,13 @@
             "type": "TopList",
             "color": "purple"
           },
-          "metrics": [
-            "top_n_cache_read_command"
+          "expressions": [
+            "top_n(top_n_cache_read_command,10,des)"
           ],
-          "metricTypes": [
-            "readRecords"
+          "typesOfMQE": [
+            "RECORD_LIST"
           ],
-          "value": "2",
-          "label": "2"
+          "metricMode": "Expression"
         },
         {
           "x": 12,
@@ -602,12 +628,13 @@
             "type": "TopList",
             "color": "purple"
           },
-          "metrics": [
-            "top_n_cache_write_command"
+          "expressions": [
+            "top_n(top_n_cache_write_command,10,des)"
           ],
-          "metricTypes": [
-            "readRecords"
+          "typesOfMQE": [
+            "RECORD_LIST"
           ],
+          "metricMode": "Expression",
           "value": "2",
           "label": "2"
         }

Reply via email to