(skywalking) branch master updated: Sync UI and fix apdex topn order (#12724)

[wusheng]

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 dc762efc17 Sync UI and fix apdex topn order (#12724)
dc762efc17 is described below

commit dc762efc1777d1b906ca48b351124dfb59672d6a
Author: Wan Kai <wankai...@foxmail.com>
AuthorDate: Thu Oct 24 18:47:58 2024 +0800

    Sync UI and fix apdex topn order (#12724)
---
 docs/en/changes/changes.md                                        | 1 +
 .../resources/ui-initialized-templates/general/general-root.json  | 2 +-
 .../main/resources/ui-initialized-templates/mesh/mesh-root.json   | 2 +-
 skywalking-ui                                                     | 2 +-
 test/e2e-v2/cases/storage/expected/topN-OP-service.yml            | 8 ++++++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 37ca677a69..312b6571e1 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -20,6 +20,7 @@
 * Support the endpoint list widget query with duration parameter.
 * Support ranges for Value Mappings.
 * Add service global topN widget on `General-Root` and `Mesh-Root` dashboard.
+* Fix initialization dashboards.
 
 #### Documentation
 * Update release document to adopt newly added revision-based process.
diff --git 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
index dcd0a0c217..6af24bb99f 100644
--- 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
+++ 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
@@ -203,7 +203,7 @@
           "i": "101",
           "type": "Widget",
           "expressions": [
-            "top_n(service_apdex,10,des,attr0='GENERAL')/10000"
+            "top_n(service_apdex,10,asc,attr0='GENERAL')/10000"
           ],
           "graph": {
             "type": "TopList",
diff --git 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
index 6bce7dce12..c74c7cb29f 100644
--- 
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
+++ 
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
@@ -243,7 +243,7 @@
           "i": "104",
           "type": "Widget",
           "expressions": [
-            "top_n(service_apdex,10,des,attr0='MESH')/10000"
+            "top_n(service_apdex,10,asc,attr0='MESH')/10000"
           ],
           "graph": {
             "type": "TopList",
diff --git a/skywalking-ui b/skywalking-ui
index 4c60f69aef..224e761d70 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 4c60f69aef71e1e91b5cb4dc8b1e9c60c3be0004
+Subproject commit 224e761d70a005a21aa2f4fc4effde57dcfc4a5d
diff --git a/test/e2e-v2/cases/storage/expected/topN-OP-service.yml 
b/test/e2e-v2/cases/storage/expected/topN-OP-service.yml
index 4ac5c7cbe5..ddf3d2c880 100644
--- a/test/e2e-v2/cases/storage/expected/topN-OP-service.yml
+++ b/test/e2e-v2/cases/storage/expected/topN-OP-service.yml
@@ -15,13 +15,17 @@
 
 type: SORTED_LIST
 results:
+  {{- contains .results }}
   - metric:
       labels: []
     values:
-      - id: e2e-service-consumer
+      {{- contains .values }}
+      - id: {{ notEmpty .id }}
         value: "100"
         traceid: null
-      - id: e2e-service-provider
+      - id: {{ notEmpty .id }}
         value: "100"
         traceid: null
+      {{- end }}
+  {{- end }}
 error: null