From c88d88dcd532f020c5a26b9ea1b70d234d7eb1ad Mon Sep 17 00:00:00 2001 From: Monica Sarbu Date: Thu, 13 Oct 2016 22:32:53 +0200 Subject: [PATCH] Make system.memory.actual.free equal to system.memory.free on Windows (#2765) --- CHANGELOG.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 2 +- metricbeat/etc/fields.yml | 5 ++--- metricbeat/module/system/memory/_meta/fields.yml | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 1f5ac11368a..4450152764f 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -36,6 +36,7 @@ https://github.com/elastic/beats/compare/v5.0.0-rc1...5.0[Check the HEAD diff] - Fix high CPU usage on macOS when encountering processes with long command lines. {issue}2747[2747] - Fix high value of `system.memory.actual.free` and `system.memory.actual.used`. {issue}2653[2653] - Change several `OpenProcess` calls on Windows to request the lowest possible access provilege. {issue}1897[1897] +- Fix system.memory.actual.free high value on Windows. {issue}2653[2653] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 703c4f66681..c1affe90bd0 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -3998,7 +3998,7 @@ type: long format: bytes -Actual free memory in bytes. It is calculated based on the OS. On Linux it consists of the free memory plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is the amount of unreserved and uncommitted memory currently in the user-mode portion of the virtual address space of the calling process. +Actual free memory in bytes. It is calculated based on the OS. On Linux it consists of the free memory plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is equal to `system.memory.free`. [float] diff --git a/metricbeat/etc/fields.yml b/metricbeat/etc/fields.yml index 54d08de20ea..25ee2aceea3 100644 --- a/metricbeat/etc/fields.yml +++ b/metricbeat/etc/fields.yml @@ -2488,9 +2488,8 @@ format: bytes description: > Actual free memory in bytes. It is calculated based on the OS. On Linux it consists of the free memory - plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is the - amount of unreserved and uncommitted memory currently in the user-mode portion of the virtual address space - of the calling process. + plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is equal + to `system.memory.free`. - name: used.pct type: scaled_float diff --git a/metricbeat/module/system/memory/_meta/fields.yml b/metricbeat/module/system/memory/_meta/fields.yml index eb666417ef3..c3dbe765df2 100644 --- a/metricbeat/module/system/memory/_meta/fields.yml +++ b/metricbeat/module/system/memory/_meta/fields.yml @@ -46,9 +46,8 @@ format: bytes description: > Actual free memory in bytes. It is calculated based on the OS. On Linux it consists of the free memory - plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is the - amount of unreserved and uncommitted memory currently in the user-mode portion of the virtual address space - of the calling process. + plus caches and buffers. On OSX it is a sum of free memory and the inactive memory. On Windows, it is equal + to `system.memory.free`. - name: used.pct type: scaled_float