diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 1b53c5e0e4..2e8fccb0f7 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -20,6 +20,7 @@ * [Breaking Change]: migrate from Spring Web to Armeria, now you should use the environment variable name `SW_OAP_ADDRESS` to change the OAP backend service addresses, like `SW_OAP_ADDRESS=localhost:12800,localhost:12801`, and use environment variable `SW_SERVER_PORT` to change the port. Other Spring-related configurations don't take effect anymore. +* UI-template: Fix metrics calculation in `general-service/mesh-service/faas-function` top-list dashboard. #### Documentation diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json index 09824cab8e..31aa98d4a9 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json @@ -323,12 +323,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "4-0-11", "label": "Function_Instances_Load" }, @@ -352,12 +346,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "4-0-12", "label": "4-0-12" }, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json index 0a44e484ef..319e31c3ef 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json @@ -520,12 +520,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "4-0-11", "label": "4-0-11" }, @@ -549,12 +543,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "4-0-12", "label": "4-0-12" }, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json index c633adf5c5..066a23da66 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json @@ -452,12 +452,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "0-0-11", "label": "0-0-11" }, @@ -481,12 +475,6 @@ "metricTypes": [ "sortMetrics" ], - "metricConfig": [ - { - "sortOrder": "DES", - "calculation": "percentage" - } - ], "value": "0-0-12", "label": "0-0-12" },