From 178d8e10c0fe40b208e5d4e2907f1e2d6f7ab99e Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Sun, 12 Jan 2020 19:46:44 -0800 Subject: [PATCH 1/8] add new page statistics to system/memory --- metricbeat/docs/fields.asciidoc | 83 +++++++++++++++++++ metricbeat/module/system/fields.go | 2 +- .../module/system/memory/_meta/fields.yml | 33 ++++++++ metricbeat/module/system/memory/memory.go | 31 +++++++ 4 files changed, 148 insertions(+), 1 deletion(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index e45d2fbfb06..c2b7a61f4f8 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -31134,6 +31134,89 @@ type: long The percentage of used swap memory. +type: scaled_float + +format: percent + +-- + +[float] +=== page_stats + +memory page statistics + + +*`system.memory.page_stats.pgscan_kswapd.pages`*:: ++ +-- +pages scanned by kswapd + +type: long + +format: number + +-- + +*`system.memory.page_stats.pgscan_direct.pages`*:: ++ +-- +pages scanned directly + +type: long + +format: number + +-- + +*`system.memory.page_stats.pgfree.pages`*:: ++ +-- +pages freed by the system + +type: long + +format: number + +-- + +*`system.memory.page_stats.pgsteal_kswapd.pages`*:: ++ +-- +number of pages reclaimed by kswapd + +type: long + +format: number + +-- + +*`system.memory.page_stats.pgsteal_direct.pages`*:: ++ +-- +number of pages reclaimed directly + +type: long + +format: number + +-- + +*`system.memory.page_stats.direct_efficiency.pct`*:: ++ +-- +direct reclaim efficiency percentage + +type: scaled_float + +format: percent + +-- + +*`system.memory.page_stats.kswapd_efficiency.pct`*:: ++ +-- +kswapd reclaim efficiency percentage + type: scaled_float format: percent diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 46cd3f41ddf..854799432dd 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSystem returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/system. func AssetSystem() string { - return "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" + return "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" } diff --git a/metricbeat/module/system/memory/_meta/fields.yml b/metricbeat/module/system/memory/_meta/fields.yml index 26b3f78097d..394b17c34ba 100644 --- a/metricbeat/module/system/memory/_meta/fields.yml +++ b/metricbeat/module/system/memory/_meta/fields.yml @@ -102,6 +102,39 @@ description: > The percentage of used swap memory. + - name: page_stats + type: group + description: memory page statistics + fields: + - name: pgscan_kswapd.pages + type: long + format: number + description: pages scanned by kswapd + - name: pgscan_direct.pages + type: long + format: number + description: pages scanned directly + - name: pgfree.pages + type: long + format: number + description: pages freed by the system + - name: pgsteal_kswapd.pages + type: long + format: number + description: number of pages reclaimed by kswapd + - name: pgsteal_direct.pages + type: long + format: number + description: number of pages reclaimed directly + - name: direct_efficiency.pct + type: scaled_float + format: percent + description: direct reclaim efficiency percentage + - name: kswapd_efficiency.pct + type: scaled_float + format: percent + description: kswapd reclaim efficiency percentage + - name: hugepages type: group prefix: "[float]" diff --git a/metricbeat/module/system/memory/memory.go b/metricbeat/module/system/memory/memory.go index 57c6d588892..76b3e6c0541 100644 --- a/metricbeat/module/system/memory/memory.go +++ b/metricbeat/module/system/memory/memory.go @@ -103,7 +103,38 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { "pages": vmstat.SwapRa, "cached": vmstat.SwapRaHit, } + pageStats := common.MapStr{ + "pgscan_kswapd": common.MapStr{ + "pages": vmstat.PgscanKswapd, + }, + "pgscan_direct": common.MapStr{ + "pages": vmstat.PgscanDirect, + }, + "pgfree": common.MapStr{ + "pages": vmstat.Pgfree, + }, + "pgsteal_kswapd": common.MapStr{ + "pages": vmstat.PgstealKswapd, + }, + "pgsteal_direct": common.MapStr{ + "pages": vmstat.PgstealDirect, + }, + } + // This is similar to the vmeff stat gathered by sar + // these ratios calculate thhe efficiency of page reclaim + if vmstat.PgscanDirect != 0 { + pageStats["direct_efficiency"] = common.MapStr{ + "pct": common.Round(float64(vmstat.PgstealDirect)/float64(vmstat.PgscanDirect), common.DefaultDecimalPlacesCount), + } + } + + if vmstat.PgscanKswapd != 0 { + pageStats["kswapd_efficiency"] = common.MapStr{ + "pct": common.Round(float64(vmstat.PgstealKswapd)/float64(vmstat.PgscanKswapd), common.DefaultDecimalPlacesCount), + } + } + memory["page_stats"] = pageStats } memory["swap"] = swap From f5c6a2049e63caf6db5242dd85f9c87d1d363fe6 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 06:34:25 -0800 Subject: [PATCH 2/8] update field descriptions --- metricbeat/module/system/memory/_meta/fields.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/system/memory/_meta/fields.yml b/metricbeat/module/system/memory/_meta/fields.yml index 394b17c34ba..ab80bf3ba28 100644 --- a/metricbeat/module/system/memory/_meta/fields.yml +++ b/metricbeat/module/system/memory/_meta/fields.yml @@ -129,11 +129,11 @@ - name: direct_efficiency.pct type: scaled_float format: percent - description: direct reclaim efficiency percentage + description: direct reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. - name: kswapd_efficiency.pct type: scaled_float format: percent - description: kswapd reclaim efficiency percentage + description: kswapd reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. - name: hugepages type: group From b2af4a31e730f7c17ed622db6473507c0c6ef047 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 06:35:31 -0800 Subject: [PATCH 3/8] make update --- metricbeat/docs/fields.asciidoc | 4 ++-- metricbeat/module/system/fields.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c2b7a61f4f8..c7d1eb4a8dd 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -31204,7 +31204,7 @@ format: number *`system.memory.page_stats.direct_efficiency.pct`*:: + -- -direct reclaim efficiency percentage +direct reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. type: scaled_float @@ -31215,7 +31215,7 @@ format: percent *`system.memory.page_stats.kswapd_efficiency.pct`*:: + -- -kswapd reclaim efficiency percentage +kswapd reclaim efficiency percentage. A lower percentage indicates the system is struggling to reclaim memory. type: scaled_float diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 854799432dd..48c0b5f7338 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSystem returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/system. func AssetSystem() string { - return "eJzsfe+OGzcS53c/BeHDIuO9GdnjTbLZ+XCAY2/uBkjWhsfBLnA4yFR3SeIOm+yQbMnK0x9YZP9nq7ullkYOIgSOLXWTvyoWi1XFYvGGPMLujuidNpA8I8Qww+GOPH/AL54/IyQGHSmWGibFHflfzwghxP1ItKEm0yQBo1ikrwlnj0DefviVUBGTBBKpdiTTdAXXxKypIVQBiSTnEBmIyVLJhJg1EJmCooaJlUcxe0aIXktl5pEUS7a6I0Zl8IwQBRyohjuyos8IWTLgsb5DQDdE0AQqZNiP2aX2WSWz1H8TIMV+PrvXPpNICkOZ0ITLiHLfWk7fzD9f7bfadyQVFF+Get+DoILixrZTgWL56RGQpVSEEs3EigP2R+SSUJJk3DB8r8LB/FNnWv5pElElhMW1r3NSuBSrxg97qLEfC/2tRSWyZAGqRFV78n+QD6AiEIauQAcBZRrULI1MEJaOKId4vuSSNh9YSpVQc0dS1/448J/WkL9IV8hoS45hCRCdgjCECQRGdEoj6KCtRoFh0aOehrUWHE1kJsyRwLy8XCJzH0EJ4GOomJDBvRwegU6wCC6Pw1IQLrc3qWJSMbMjqZIRaA16CDVn4/ShKFnML5DniGoA8PMJ8gBAckuZuUBeCmKBkSspSMz044thdJxTR4zDp367PCZrUBsWWdPMmnRrKmJu/7GmKt5aa44JA0plqemdj+q387F+MtRaLs3XNC4W72EUPvXYHIDcAOWXNzJMECY2kmfCULVzKmCxQz9nw5TJKMc3tmvGAb9d71LLEi1Vq7Mt1TV+SbMGlS+BUs1aL7zZUMbpggORgu/s4vmrYF8GMfKcevFyGVT4cml2lCsXpVnLm7RUWY9ZH+edWTdvyoFyvlk+UNg6SRVob33hCEhtZu5hKW6EnT+c/Q5NN5FUZoYmW8Y5WdMNWAeVfmFJlpAN5RlOms+3r179hfzVdfcZ2241VvZTa5dyBTTeEUMfrXww7VtlwkhCowjFzumWTbvRABYL5Q/tmpL3oh0i0NetZncyIxEVbtCqLC+CNysF1ICyXwjHN/KTVAS+0CTlcE3Ykvyt1awTKfs6NeT7V3+x0K6tXDnh8mGPWZRms5ybn530LIDc/tA5OH8sF/aP5SR+ve7XH8Xb+Yqs1j/t8gCFf1q301i3RpoLZaS1BUETRzauqPcxBxSc+/f/tlqoyyj5V2kZDbJPrCV1kSwYG6a+WELGLvSXSchRq/1lkjR8yb9Q/Aes+5dJyeSL/1dF5qEWwGUS+bWaAZfGzSFWwHUeCNEQ50wuYzboXAdob1gMn1rRva9lZ/qS93S/jl3QC9xMvOhNuKfeCjl8RXxq5Icucn/uPVR5YuWUyWdNVozZfrBNVPYf7D/J/fsijWxgDl7+Gb9HYf8Mjucj7LZSNTcOfPz4juiY3o4fbiTPdtknbKAY5XO3eI6ANxDCN9r3kKe7kU9rpklCd0RIQxZghWPDYreMU85Lprfa9DH6HoIU0HiGGx4TTh60lCoWhu3EiowdISsyOoushC8zznc9+LaKGTg5QOzlQITIwcXODN9Ry03B0EsHgMdmEEYdNnkvyM9MZF/cFhdrdkUadqCGyEjlW8LNnpQzL2mCUK2zxHIGnyKa/Y526He3rweN4NMzyOIwIKbhUd7YQDa1Wu1nG4qVXXdOKPYJ49YniKSItV/evFrBGTtoYJ8MopuzvcbiqQGGMcbSroP3L9/3A7Te2wxHW8FvGWgzS0CtQM9TUHMNURB7yMPsAd/cqsdp7rvUBPvEXXLiKHE7tltQQH7LIIOYGImTIYYN6/VtPFlORM5LF/Z5asJq43XWgSrRM61b6Ct0HjBA5x2ZaSnBEfEE7FltJiDjx3K9LWzfFuam7R5e0noJota/mJYQugFFV1D1aZZSNaQsOCJGWgvUOiwQj5n/ZxwVJ2KnHBZH0vnGpTFpJhqYfMbTzWpubZTTkILWzxUTjr0v7DBZ1AM1wDBKUIefmA7sg3AQK7M+CRHnnObTCpILX8C808o6XohcD44QK0xVc+sFEnX/8v2047HI9G46aj6EI/dxpqyRuF2zaF0noXtRvFpQEW9ZbNYkM4yz36ntFplQPvViRt65xzU1mXKPyCjKrOPicubKlEdNIi41Dn09izFnCQijZLo7JphUhq38cch2m+MDRDRvdL5gZtLQX4HWNmyHrA23hPH0W0ElXo/z2nKTGraBXHpSKXnhsn/76h/ft0Z5yTjUTr6Sg6KGZTOt3OXypylSmAuizxRTwAAh7upU+G2kdfkzkSq2YRysn4F7U/mKNwtCd5N0PjLAOSqIWU2pvSOfX8aweWl/vf0cRGT7PQEU20YTCnwx34ZBYMB9nkrWEek7GAs2bDUttt3iTRgNSusJwwa2fSJkDNpKi52j+E07cl6BpOBJpX2/VFt086m5VuGXAjiEacj3M3HNjXGFd/s5lmk4b+DYdjgS3tOvbg3Q+/IUClHUdoE5ah3zIuVaqixllUUs3wmjq5WCFS22wijnTuU0DreUrx59eufQzZB/1dWPR0OWMmt6xrXpc8S0/hRQex3y5roKOHH7pD48sm3CQeP4lFSTWEa6FQ0IcJ3s18B7WdGHvoUz5D0Qz0TUgI050ARoJ8uTAcSZ2gMwpI7Ph9CpvSsEmvJMI09ftF0eLml8jPqwLp5tI/dhj5zwz2+fj1XC9icmVvMljYxUd9a1G6eIf67AL9xLTrUhCROZgfAcfv7dJSH9zmPtUDjPby8K7W0Abhg3piA+lUwEZIHErMhJGJZa2CbnqYYiLDBTUPRk0tUhVUfShA+FKTrtoeGWdnZVwY4y71wTrRCFrzc2QXjibG4HrmsOd3/9qPO5G7/aJXYQrDN6tc4/KzP70KLyY174Qi7jygVHYwkaE6+YiHgWFw9HUrgsj8UuNycjGq1BEyra9tciWy5BaXKlofBVPWtoZDLKZw0z5OLdsUED62g7zF5vI3mDrZUVASHGvFHLuT4rfq+1HJwR5AwWqSeows+KDN4bosArQ+0i+8wKEYgIyALMFvzJdy/SmNVQjdX4EQoWRbCf5pMkhhRErHPN+/7BxckSqYDEYCjj+pqkqAZJtIbosfCRKzL8uUMkyNP7UJ7d4Sl/b3AfhPIo4+jIL6gdlgov6mliTjvk9QV+gaTc4MAQwMtUyehlAgkTS3nd5oX9SFXtEF+rgkP3pFQqhRJhy3rrFrjVUMWAtn0v+3kvyPuH/xCGhFKis6SpAHMZYoJGuHWQi9B7Qf7NRCy3+tq/D7+1J7YfRVmIhX99qFh0qDcyRMWRXjVHBnqJ7b2V1iztSxDe0qZm69Z5qYIl+3JHnv9fJOv/Nc2reijFSh62Upot1lJh2rBIuy2fcr/Q4qjVT82lORQs7Y98PLHfXhIzVJSeSq2j4TMO71NpxHJTdhRcmZlZ2josPgBzDVOUG2HYFEJIrcrNTD8CJk4HgIn+/hXQmK4x3+xoGMj7okFSb3AAAlwiRsf89kHAFsm6uqf+tWntbNgkLLbw6Qrm6PQdZq3mSzZmqxQaeaSGTVc6omL+aGEfKFg5N4OnU1qovdxHVAjnybiu+wDGTEF0oAY4BqDrlzfTcqr40Bk4GzDbWxFMaaVOtHhngPIzjm4ZXXFoFUScsmToSCPa8w11N9reYXcPzGG5ZBEDEe3OqI9c3zlaUmKo6KNO4G4Qnga463sg8KDOXGcrCAnG2Y1dC8RLzVPbucNkPbyIlVuzFYJ8kkMqJb90u/eXSmCGCUI5lxEOUUnOFF5gDwFH2RH1NM2aXHVmw5KJ7PhpRKeM6hwsRApc9u/TEpKjIIvMuPBGQJ5GUqYzlfLsxAtZH2FyAyqSScJGT40YljTjJpQgMZiGI+b3O9e9SyJdSjUOvF1uZlXfrgk8tGC0kFWGPuQvVujt0PKkYfSHeEH6mNmCNQRRRUtQzhc0epyk67e5E1thDea/J5nG4+I65cz+ZYlVW7c0rcIrjtqD2UpVRTR+R823UdlS899UiwbU7p7Jf8dCD8tG1sj56gWAWY/cZMXNyyb4IcUDZGbOmu/XPAGtQXQVBKyEVp4SoYIIWP/ZExeCih5h0rz/qhOCbQ9k2OmQqALJQMYwMQOlpDoNW1zTvrSJQ8TEasBYnQuTBhH3I2JiFitplfVJEDERyQTTzf3YlQeSfLcDOHZKgDIzK7kfYHUTnGlC+Zbu2ovlK+trvaNqaw1+EZMfH96RBUQ00+B3iqzppiCVypShku4yMcXS7ArgHLUe+TYq65H/xi5GNKaGXlevRbuu3jfXuKyNTLseUc5ok5cpNeuC7lng1YSt3Dmu4iK7do9YBm7EEjhk79/zDJtunJx4rjIhmFg9D2fXpR1XwPWT335zCPXpER0e2OPq8B7brw7pMUpizsTEY7zMOCfWJ6EivrHNOyfeSDvqyjgXy+G+9okwdvKaQGYBVasswZQFDSlV1M/6YE4wWwmpYE4XcgN35PWrb38IkpxpUAdMJVez+LB5FG0PHVZrEjKx8oHTepLa0N5BbIK9y8V/oRUYcV/Oj5QAEBumpLAjRzZUMbrgPuoRlAJ3jYdVoaF6ObRSooz8pAB+fHh37ZInnJJ9/0D+E1YZ9RtTyHTRxLcffr3RKURsyaJqGDEtq62NDRR21rwko/beune0AgXoTFUj7yuG2QTrKpficn4itMVNKBasi8NqJiJw0uP1RRevm0Avb0OxUQPQWzLFWCClRcptlsa4Wt6bigmlWcI4VT49I9jtX2wvBSOrHcRMp5zuShvKyDRX2XkRwHa9tzBzO+rXflUchk3NMau3XDVcK/f/tLKey6xjy0VmiKKiKySE6Vmv2mfkmyzeU3CWnFkvhAvRNgE7mTglXpehuHd49/DTao9QbYkSXdw2esegs5i2+T1COROxLqftGjqOxbVS0MnwbAG3UzJ2Pepb7/rWqycKG5cSkBdH9T5Wld1rukcElNZPtqll0X8EzWIrsw9gyAP7HWaNaRggSEZRljK3E5ZQ+4d75urjm19e7Cf18jTzdPTpNVVPJYTYdxwiJtOdR9rDfsAB2es/MQ7FM1J5CymPM7hFS4MXJxcrZ7piSi8DxYNdPrJdu7yVPbXKkCmIoxaFxgn+Og80tj94JeAsYWam5XL03vBQAZFL43rJMwh6oBc2RbDJmq9UaTuigiyARGtrbMRNO4caQsUOV6U+Vqxpy9WbihW26VOxotK2ZQWWsV4AUTS/m0BJaTrcw9DEO3hK/pIf3xcejy7LxrmesGQhFmdCk5vqR5c8nwCWZm616N8q6gIoKGOfLRNjTbVvSK9ZiikTrQaFFDeWHb5lZKCGWgfIv5rLjWphrDfbikaRnrjSAAYTL03379BVsZIksTiCo0YTqrWMGAaJtsys3dEKy+awZX+PPhEWxhLfGELzVu/fuVCFLwubt46tId35QY1gq3SxZ5OH1PaLzfp0TLKt56n7Xo6aNZz81zpbOC/jG+3KTLiqNqNYhr2dg2ntiA4Zt+XfzbEozUpeEB2tIc44aPQ0KFZ4dgdhqX4sMkX8PAq2+ca9k+tnKYySnHvNtpVFRLPoSulr8vanB1QgHz+FG7W/a0NF7MDk9cX5jiwpU2VTXs+kSlp9waSgPJDyiNzBQ7zuTFjhVOUnwvJhLI4vbYGt1mZGPn6qwAi2q4By76E1QGkwunLnbdD/DNqjpLxjpD4AyGR/hjKvgkfJim1AWNuTyX3ZVsOyO4IKjQyYr6Qpgffv8mhMU3r2AuhQFwdBCE8C+/lwiNrobC2kTvYSGS31zA9YMLGKjE5o2UMq9oNj4a89SlikZF52G1OS5JYoWGWcKrsqdjblWPKNzvWEkSjLCrTMVASa6LXMeIx2CRSZZyN48lsmDT09Sz41zjN3MsZNZMrDh/YQUq4maXWOqkzk81MK8HOTXFFNYlgyZ/Z1c7kqHF2nm0PcQ1ft1Lx7IzB3ZwXKRwtxE9wHZcAqvGIiIZ6qwutstFYZMDcaa2ydVaLleWex147dnEwzzxRnfufJXa+JFXq2Wlet0b3sVeaC52sxL7v52zFfmT5goiozU5lAV+sSmIHBbSlWoA1aH0xkMtN+znU2zETDRalPYnd3fphrA9nkimE4GKdmU5kn61UNptdtKNeodGoTxk6KuorpVm52aiMrgNN0fzJ3m3SzVtIYDvHZmWBlRXeN6sKVAPDYyBUSyQJX8uefPI1667Z1rW7Pk3XMGnaeQV/WNMNaaXi50HKvXqqoOyvVtRFy8QCmCK6FQ9V/k+Pi5EtoEZ/OSzK7aslXTBBBhayVmfYzrRiPHgMjNE7DfCYa7YkCD/KbvBeUVz4NZDTlnz+t6eLzxNa03589j9VYvT+0Iui10jZWBVT95x55HzXHXYLONLQWtFTBF8AxQSKRcVd2dhhfflv42RBeuQ3bF2OgpqDCERayP20o/9TSh46XrILKlvYsyJaCAI3W+GhDwvYs30z3i9jerVkyTnv6w2w+LOwyQ/9UoCdSoOMVZQLJDHfQOjeGyZAZ2rezOILwahk2v7m32HWGv8obUUYTnNAvl0P0GoqoYLUu19SUu/2uS6S6DL24RaZeV8pSm2fLWr+9e/mk0RpeODclEK/GjZ6K5Z7poeuD5d6SMp6dPp5S3+v1ngsStC5KTLltv6vGmL4g21ZabflRgAVOhhOst5emG9aQ19uKMqVAmLqiwEpfWKzElSf2c6izvSnnVsGsS9UrrTQbuxi3mVVjyh5D4lhmXbwqyiNJXuCaTMPB3h8nmVoB6e0lqaDmZMMB7WzxqjXqqKxGKqXHS7VXfIroycyWx8u3W5os6DVfOlsdz5mLVyZy2eDPPgXRHSU8RHE8Xqbp0hy3KW0X2/bcROlFqoqajrCLzKe3H8qapK17ZMYQeqmqoaoTmhQHdERPcOww7Yls+hr0hGdWk08thdHHpYMtjYJbl6k0mgPZvVk13r5wAUtXtXdOhQyXcBjMgAll5Y2QYpfITJcWqKsuKQXxVYY5UG1uFEQgDN/d4Gy7+vnjr90M4kyb2kHUJF1qcqXXCSQvrscqoxrzrJd+Zub9xDjcLGj0WCanl8z5+eOvBbkHUIW8PjM9H+wCgR1PPUZrBoqqaM0iyueOVfPLUo3VsHHhieWwvfVUlCOo6Amn+7p3bidhl95eJrdKj2ww3zqbrPPzML7l9c+/Hk1aVGyvqovazOt2cJsz8iBOPYHa7OZUWKEGeXSAdCRY5OuyKH7w9/o6am8cROL/hxfudaviaXUOFlLGOnFnT5KxOoIWpyvq3qlRbLUCBbF9Yl8ADKGPlIf/SjX/CuhGoD2Ek+e/2Keeu39qsrYiJMqzKz4Y4O5E4Ds8w2LkPvfXXSmBpSLwcE3Mqqc7BkqUnneGXU6QeIY19OyfmH0mKzepMHcoz1WOH5xyWaWjqzbgqQmRWcVJO5aUfQdyB5FyjmXRb73ZGaKo0CnFfZeiaPGLayJkd9x3WsNVaT23PV8M1/7VqLonl4QWjAzya1zqzJamF0PrQ7HtceDoZQI2LDJ4tc6lEPVLJRwbUSGkcWcVfNH0QZTmVC74Iwvp8BHpMj9yGVXrfP6ZJTN1lswBSTIum/BSJLZ5D7RTPKhrlqCUi/a5C938FdoLFKrYTr7OzsmezZpRbGLyPFmXJQPuX77PKyFKgWn+ltsuQ86SfzjhmIcN5dF6n3uMBR8lZ9Gus+DiTGdJQutXazLD4Y588PblQ/uBsZUZfRO1msCVg9Ggia8rGL4E9OSXcfbVS2uMYwkb4TLdwls5ceIImwhJpVq6Z9gYLCxuJSQdD8Q2OgqF5gDpKViSNzwOjZmy6GoFjGt3FJbfZbJg04+Qa3YUkhjo9CyJ8bKrMApyb77RZANqRzLB2SNwb+ow406lW7eUKrwbgAmiZeLP0lFONDOZV6nMkITuvBMbJi0Tj0Jum87l8dSVhFWOjazd5VBgnS4ei2+8zWYUg43V+8q6ZB5RW0Uryo66kr7x/snrq/fxiiZFlTu31HVNSWpap/OO6BejgMzsbtxQDEDAYQPhxePgept2LFy7dQBhDuxENLewZVhOD0Lx1ici2saJa/yaMIfl45v7d4QqRXfuXGWciZgKE65VHTP9mG+fTTSNqveZuJit62RP/6dc4LGHyiDhWQamjXWb92FCH3p6lmCzcT9LlpTxyZaySv+u3f7+cX7p2V+DCE5Uy5YkFIv2KLpFFE7f6iBKdC+mlZxKWAUbrwrNWvIYw/Dk9tXrb2+s+5ND2AfPzs8TGCQenzewPUQXSlZ4Isz224O20E+gGrorvDYVK84CDB22ZlVdhLzOi+tNn2HRwgyPyjLVJrSySEgaz4+qv/4Jj3/TmNQWpn19Ht1dvhaO6DJbHE+lzhY344icY/nXYJ+B6p+tDnGnxNAkzTvEGrLeFsM6bDNfKSmHgsFxt/ZQEef+1bWzUe1/RpMsbVdpK2p4f4FoHsn4KD493P/vt//n53fEtlOWJvMIv9Gu8GL7qoSKyZif9A+i6C2Z5mdcUW2sVa0rPHL9xcaiNPOpf8HTlcMr2JW1puvnDTt79hsg+xMsh/dfS4ps7aA3O8c0uBnuuBzVayXrDBPrhg9MRS+2bnyq4xgU9s3vQMrlrPN0waDY77lzLVwEsmNnsfd2n9Phyi9l6UHWfQXSYGjBbvuuL+u6w+qwXv3+U+jS72IFkBbYMa7vp7cffCu6NHKcej8uruiueehyzLqvi/ATZ9b1ftc1EUEQS5qwVq24oQjsc8d0zmVE+YyFi3K2vi6ujrn9x+vZq9nr2S2Rirx+9er27tW7H3+4e/PjP9/d/fDd376/u7sdZ9r+bHGQ+w+ExrHytUZZUcyPCnL/YfOt7ez+w+b74qEhtKVSNSdEp4gX9L1+fQh821UPJgWJNHABDP+IQCbmuKfuLCz3BAzn+VrqMKqe+wX//v3N69vbm9vbv9/87fuZ2M78L7NItm4n7sH84dNHoiCSKg4u+iofkxm5x9u35MJQrNK2YZQo2IDS7eX5/gPhUj52bpg12ACGx/OUZ3ouR11EVN63eCj5eFPNcgmR3yhNb1wILZZoCV/Bp5/fvchNfM8LO2guw1QKIIlsH1PidAG8drPVNTZgW/uft+h6Pl9KOVtQNVtJTsVqJtVq9tzy93n1i9amd3FJjm0jBgMqYSK/CcU2TyKZgK86TAWBZAFxDDGJZLorAoPUtMoM4QtrY9K7ly/TbMFZpLPlkn1BHINleY435x3qoLSF85+2Of/QIifTlZcqxgQl0Isb8Qc1ehB3XwrWt8aNv05sLwB/3cqBIAKBiMNQTH0D2E+V279Irem9OODLoZfbWd84w3SaY/iB5YNGi0T4rfEdd4aVerpeZpzPR4hC3Qbu3p5/wN9J4Pdjd+fl0pXpz+1nVu7J+wDBURZ0uyTpwfXc36AcC+Es6uYg9MYk9rrlvlJon0Mczv6wwJCH3eiqtf21gUCSwIRYii7Q+AmHjkw0WZ1926X1wA4fm56KTt0MmeDqkF/qB8OrrmQe8Lkuy22XoZnyvnqXh4vpqS6glrrL0X6HGXkrlQKdYuE1I/N6UxpwX/ul1Zgv9U6/FGBesnTz7UsTpfMEkhl531H2vzvNL1z89+hK7P2jSwYGgKRK13R/nnf3SA9Ei4jdXPeD5LuF2Ip8PrTd/N1LQZcOmZqAXJ/0832YXjkBPgttn55pwgNtLQKm163NrhMALPfBKt2O4mbEpYb5lnaWDjkJ2gZCqyPmJZJ5cEOojtuw5DJgF0CGoNY7MdfhC63OCjrHMRSzgqh5leuTYLY4hmBeMoFj0gwFnR10AWQM6mb858lQvx6CmlNt5jQK7cCcFXSOYwhmq2vOsoL0qzwmViHEhZMWT2q+/vruD2K+WkKe0HzN4ks0X/ePLhlovp7b+OtCvecvxexIG5dYjI4SfHZNfK5XM/DHGcQqFxX3lI8lHLnV5guzz5JwNkNgayCfPvmrjZ+ZSDMzzx9KGOcsnD4wIKHz/UNOK97sUDY1e/b/AwAA//8vlDOH" + return "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" } From f249636c5cad7b73e883cd7ab5ead2699f967ab2 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 06:50:58 -0800 Subject: [PATCH 4/8] update data.json --- .../module/system/memory/_meta/data.json | 56 +++++++++++++------ 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/metricbeat/module/system/memory/_meta/data.json b/metricbeat/module/system/memory/_meta/data.json index b38aaa7991f..01231bede4c 100644 --- a/metricbeat/module/system/memory/_meta/data.json +++ b/metricbeat/module/system/memory/_meta/data.json @@ -6,7 +6,8 @@ "module": "system" }, "metricset": { - "name": "memory" + "name": "memory", + "period": 10000 }, "service": { "type": "system" @@ -14,13 +15,13 @@ "system": { "memory": { "actual": { - "free": 671084544, + "free": 14247317504, "used": { - "bytes": 362037248, - "pct": 0.3504 + "bytes": 1407057920, + "pct": 0.0899 } }, - "free": 340848640, + "free": 4859097088, "hugepages": { "default_size": 2097152, "free": 0, @@ -38,28 +39,51 @@ "pct": 0 } }, + "page_stats": { + "direct_efficiency": { + "pct": 0.9976 + }, + "kswapd_efficiency": { + "pct": 0.6213 + }, + "pgfree": { + "pages": 4382105954 + }, + "pgscan_direct": { + "pages": 485820 + }, + "pgscan_kswapd": { + "pages": 77390925 + }, + "pgsteal_direct": { + "pages": 484631 + }, + "pgsteal_kswapd": { + "pages": 48081976 + } + }, "swap": { - "free": 0, + "free": 7846490112, "in": { - "pages": 0 + "pages": 1111 }, "out": { - "pages": 0 + "pages": 20255 }, "readahead": { - "cached": 0, - "pages": 0 + "cached": 28, + "pages": 65 }, - "total": 0, + "total": 7897870336, "used": { - "bytes": 0, - "pct": 0 + "bytes": 51380224, + "pct": 0.0065 } }, - "total": 1033121792, + "total": 15654375424, "used": { - "bytes": 692273152, - "pct": 0.6701 + "bytes": 10795278336, + "pct": 0.6896 } } } From 9e7141810b8f6d9f69b25507e532d0742f9d708d Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 08:04:42 -0800 Subject: [PATCH 5/8] update system tests --- metricbeat/module/system/test_system.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py index e81a67ee8f1..8e6e6cc30a3 100644 --- a/metricbeat/module/system/test_system.py +++ b/metricbeat/module/system/test_system.py @@ -42,7 +42,7 @@ SYSTEM_FSSTAT_FIELDS = ["count", "total_files", "total_size"] SYSTEM_MEMORY_FIELDS = ["swap", "actual.free", "free", "total", "used.bytes", "used.pct", "actual.used.bytes", - "actual.used.pct", "hugepages"] + "actual.used.pct", "hugepages", "page_stats"] SYSTEM_NETWORK_FIELDS = ["name", "out.bytes", "in.bytes", "out.packets", "in.packets", "in.error", "out.error", "in.dropped", "out.dropped"] From 088bcaa2834574b371ec7218452ba1e04622e3eb Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 10:15:09 -0800 Subject: [PATCH 6/8] update changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 1c5747f4884..cff0fc86dc1 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -573,6 +573,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add overview dashboard for AWS SNS module {pull}14977[14977] - Add `index` option to all modules to specify a module-specific output index. {pull}15100[15100] - Add a `system/service` metricset for systemd data. {pull}14206[14206] +- Expand data for the `system/memory` metricset {pull}15492[15492] *Packetbeat* From 34ffe9e128f314c614b2417a49382cfe850c0391 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 13:30:01 -0800 Subject: [PATCH 7/8] fix conflicts --- metricbeat/module/system/fields.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 34ca2dcdbfb..f2800f92a1b 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSystem returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/system. func AssetSystem() string { - return "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" + return "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" } From 8099c791ba39379c6c4cd7f32ae5da097470a6bf Mon Sep 17 00:00:00 2001 From: Alex Kristiansen Date: Mon, 13 Jan 2020 16:31:31 -0800 Subject: [PATCH 8/8] try to fix system python tests --- metricbeat/module/system/test_system.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py index 8e6e6cc30a3..bef0e8bedea 100644 --- a/metricbeat/module/system/test_system.py +++ b/metricbeat/module/system/test_system.py @@ -294,6 +294,9 @@ def test_memory(self): if not re.match("(?i)linux", sys.platform) and not "hugepages" in memory: # Ensure presence of hugepages only in Linux memory["hugepages"] = None + if not re.match("(?i)linux", sys.platform) and not "page_stats" in memory: + # Ensure presence of page_stats only in Linux + memory["page_stats"] = None self.assertItemsEqual(self.de_dot(SYSTEM_MEMORY_FIELDS), memory.keys()) # Check that percentages are calculated.