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 d8921d5256 Rename Windows Metrics(swap -> virtual memory) (#12107)
d8921d5256 is described below
commit d8921d52565974cd858f0421567a73d98216e354
Author: lagagain <[email protected]>
AuthorDate: Tue Apr 16 08:39:53 2024 +0800
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 ++++++
.../server-starter/src/main/resources/otel-rules/windows.yaml | 6 +++---
.../ui-initialized-templates/os_linux/linux-service.json | 2 +-
.../ui-initialized-templates/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 03c41b0a45..c530768508 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 ee667bdce3..de2a651111 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 41e71be8fc..22704186e8 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 8b5b299b99..8cc7d74d41 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 279e04bfad..ebfd25223e 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
