kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
lagagain 2024-04-16 08:39:53 +08:00 committed by GitHub
parent c551a9ddb6
commit d8921d5256
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/en/changes/changes.md
View File

@ -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

6
oap-server/server-starter/src/main/resources/otel-rules/windows.yaml
View File

@ -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

2
oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
View File

@ -339,7 +339,7 @@
"showUnit": true
},
"expressions": [
"avg(meter_vm_memory_swap_percentage)/100"
"avg(meter_vm_memory_swap_percentage)"
],
"metricMode": "Expression",
"typesOfMQE": [

10
oap-server/server-starter/src/main/resources/ui-initialized-templates/os_windows/windows-service.json
View File

@ -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": [

2
test/e2e-v2/cases/win/win-cases.yaml
View File

@ -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