From d8921d52565974cd858f0421567a73d98216e354 Mon Sep 17 00:00:00 2001
From: lagagain <lagagain@email.com>
Date: Tue, 16 Apr 2024 08:39:53 +0800
Subject: [PATCH] Rename Windows Metrics(swap -> virtual memory) (#12107)

* Fix/Change Windows metrics name(Swap -> Virtual Memory)
  - `memory_swap_free` -> `memory_virtual_memory_free`
  - `memory_swap_total` -> `memory_virtual_memory_total`
  - `memory_swap_percentage` -> `memory_virtual_memory_percentage`
* Fix/Change UI init setting for Windows Swap -> Virtual Memory
* Fix `Memory Swap Usage`/`Virtual Memory Usage` display with UI init.(Linux/Windows)
---
 docs/en/changes/changes.md                             |  6 ++++++
 .../src/main/resources/otel-rules/windows.yaml         |  6 +++---
 .../os_linux/linux-service.json                        |  2 +-
 .../os_windows/windows-service.json                    | 10 +++++-----
 test/e2e-v2/cases/win/win-cases.yaml                   |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 03c41b0a45cc..c5307685083a 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -99,6 +99,12 @@
 * Fix not throw error when part of expression not matched any expression node in the `MQE` and `PromQL.
 * Remove `kafka-fetcher/default/createTopicIfNotExist` as the creation is automatically since [#7326](https://github.com/apache/skywalking/issues/7326) (v8.7.0).
 * Fix inaccuracy nginx service metrics.
+* Fix/Change Windows metrics name(Swap -> Virtual Memory)
+  - `memory_swap_free` -> `memory_virtual_memory_free`
+  - `memory_swap_total` -> `memory_virtual_memory_total`
+  - `memory_swap_percentage` -> `memory_virtual_memory_percentage`
+* Fix/Change UI init setting for Windows Swap -> Virtual Memory
+* Fix `Memory Swap Usage`/`Virtual Memory Usage` display with UI init.(Linux/Windows)
 
 #### UI
 
diff --git a/oap-server/server-starter/src/main/resources/otel-rules/windows.yaml b/oap-server/server-starter/src/main/resources/otel-rules/windows.yaml
index ee667bdce3e0..de2a651111d5 100644
--- a/oap-server/server-starter/src/main/resources/otel-rules/windows.yaml
+++ b/oap-server/server-starter/src/main/resources/otel-rules/windows.yaml
@@ -45,11 +45,11 @@ metricsRules:
     exp: windows_os_physical_memory_free_bytes
   - name: memory_used
     exp: windows_cs_physical_memory_bytes - windows_os_physical_memory_free_bytes
-  - name: memory_swap_free
+  - name: memory_virtual_memory_free
     exp: windows_os_virtual_memory_free_bytes
-  - name: memory_swap_total
+  - name: memory_virtual_memory_total
     exp: windows_os_virtual_memory_bytes
-  - name: memory_swap_percentage
+  - name: memory_virtual_memory_percentage
     exp: 100 - ((windows_os_virtual_memory_free_bytes * 100) / windows_os_virtual_memory_bytes)
 
   #disk
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
index 41e71be8fc94..22704186e8be 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
@@ -339,7 +339,7 @@
             "showUnit": true
           },
           "expressions": [
-            "avg(meter_vm_memory_swap_percentage)/100"
+            "avg(meter_vm_memory_swap_percentage)"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_windows/windows-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_windows/windows-service.json
index 8b5b299b99a9..8cc7d74d4133 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_windows/windows-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_windows/windows-service.json
@@ -135,7 +135,7 @@
         "i": "8",
         "type": "Widget",
         "widget": {
-          "title": "Memory Swap (MB)"
+          "title": "Virtual Memory (MB)"
         },
         "graph": {
           "type": "Area",
@@ -144,8 +144,8 @@
           "showYAxis": true
         },
         "expressions": [
-          "meter_win_memory_swap_free/1024/1024",
-          "meter_win_memory_swap_total/1024/1024"
+          "meter_win_memory_virtual_memory_free/1024/1024",
+          "meter_win_memory_virtual_memory_total/1024/1024"
         ],
         "metricMode": "Expression",
         "typesOfMQE": [
@@ -169,7 +169,7 @@
         "i": "9",
         "type": "Widget",
         "widget": {
-          "title": "Memory Swap Usage"
+          "title": "Virtual Memory Usage"
         },
         "graph": {
           "type": "Card",
@@ -178,7 +178,7 @@
           "showUnit": true
         },
         "expressions": [
-          "avg(meter_win_memory_swap_percentage/100)"
+          "avg(meter_win_memory_virtual_memory_percentage)"
         ],
         "metricMode": "Expression",
         "typesOfMQE": [
diff --git a/test/e2e-v2/cases/win/win-cases.yaml b/test/e2e-v2/cases/win/win-cases.yaml
index 279e04bfad2f..ebfd25223e0c 100644
--- a/test/e2e-v2/cases/win/win-cases.yaml
+++ b/test/e2e-v2/cases/win/win-cases.yaml
@@ -18,5 +18,5 @@
 cases:
   - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
     expected: expected/service.yml
-  - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_win_memory_swap_total --service-name=10.211.55.3
+  - query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=meter_win_memory_virtual_memory_total --service-name=10.211.55.3
     expected: expected/metrics-has-value.yml