diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 1ceabcb9c57..9c736fd6c64 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -145,6 +145,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Preliminary AIX support {pull}27954[27954] - Add option to skip older k8s events {pull}29396[29396] - Add `add_resource_metadata` configuration to Kubernetes module. {pull}29133[29133] +- Add `memory.workingset.limit.pct` field in Kubernetes container/pod metricset. {pull}29547[29547] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c1e7087125c..2553dc415ed 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -41959,6 +41959,18 @@ format: bytes -- +*`kubernetes.container.memory.workingset.limit.pct`*:: ++ +-- +Working set memory usage as a percentage of the defined limit for the container (or total node allocatable memory if unlimited) + + +type: scaled_float + +format: percent + +-- + *`kubernetes.container.memory.pagefaults`*:: + -- @@ -43023,6 +43035,18 @@ format: bytes -- +*`kubernetes.pod.memory.working_set.limit.pct`*:: ++ +-- +Working set memory usage as a percentage of the defined limit for the pod containers (or total node allocatable memory if unlimited) + + +type: scaled_float + +format: percent + +-- + *`kubernetes.pod.memory.rss.bytes`*:: + diff --git a/metricbeat/module/kubernetes/container/_meta/fields.yml b/metricbeat/module/kubernetes/container/_meta/fields.yml index 8bd8bd6449a..81b99f75c0c 100644 --- a/metricbeat/module/kubernetes/container/_meta/fields.yml +++ b/metricbeat/module/kubernetes/container/_meta/fields.yml @@ -126,6 +126,11 @@ format: bytes description: > Working set memory usage + - name: limit.pct + type: scaled_float + format: percent + description: > + Working set memory usage as a percentage of the defined limit for the container (or total node allocatable memory if unlimited) - name: pagefaults type: double description: > diff --git a/metricbeat/module/kubernetes/container/container_test.go b/metricbeat/module/kubernetes/container/container_test.go index 30009846169..816464d7b9d 100644 --- a/metricbeat/module/kubernetes/container/container_test.go +++ b/metricbeat/module/kubernetes/container/container_test.go @@ -69,10 +69,11 @@ func TestEventMapping(t *testing.T) { "memory.majorpagefaults": 0, // calculated pct fields: - "cpu.usage.node.pct": 0.005631997, - "cpu.usage.limit.pct": 0.005631997, - "memory.usage.node.pct": 0.01, - "memory.usage.limit.pct": 0.1, + "cpu.usage.node.pct": 0.005631997, + "cpu.usage.limit.pct": 0.005631997, + "memory.usage.node.pct": 0.01, + "memory.usage.limit.pct": 0.1, + "memory.workingset.limit.pct": 0.09943977591036414, "name": "nginx", diff --git a/metricbeat/module/kubernetes/container/data.go b/metricbeat/module/kubernetes/container/data.go index 53a795624d9..ad2e1243339 100644 --- a/metricbeat/module/kubernetes/container/data.go +++ b/metricbeat/module/kubernetes/container/data.go @@ -135,6 +135,7 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common. if memLimit > 0 { containerEvent.Put("memory.usage.limit.pct", float64(container.Memory.UsageBytes)/memLimit) + containerEvent.Put("memory.workingset.limit.pct", float64(container.Memory.WorkingSetBytes)/memLimit) } events = append(events, containerEvent) diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index 73b71223fe1..e634e74a200 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -32,5 +32,5 @@ func init() { // AssetKubernetes returns asset data. // This is the base64 encoded zlib format compressed contents of module/kubernetes. func AssetKubernetes() string { - return "eJzsfc9z47aS/33+CpRPzrccHb7Hqa1XlXhe9nmTzHjtmcxha0uByJaEmAIYALRH76/fAsAfEAmApAjKHls6pDK21f1BdwPobjQaP6IH2L9HD8UKOAUJ4h1CksgM3qOLX+sfXrxDKAWRcJJLwuh79I93CCHU/AHageQkUd/mkAEW8B5t8DuEBEhJ6Ea8R/9zIUR2cYUutlLmF/+rfrdlXC4TRtdk8x6tcSbgHUJrAlkq3msGPyKKd9CCpz5ynysOnBV5+RMHPPW5oWvGd1j9GGGaIiGxJEKSRCC2RjlLBdphijeQotXe4rMoKdhobEQ4JwL4I/D6Ny5QAWAt+f10e4MMQUuU1edQpNWnDc2Gx+HvAoRcJBkBKg/+pML5APsnxtPW7wJo1eda00PwDZJC6bViJIIoOAhW8ATi4bgzlCFFTtptAKJYzYnBR74DI2F5fABIk0WXSVYICfxKMxU5TuCqls4PQVyPwFfxYP3r8+db1CHZsUyWRhSF5tkh2eVJJVC5VIziq6HEoFmgDos2lpTvl7yg8WB8BbkFjuQWKh6oECBQyveozagN5oHQNrcJSH4lNFWra0m9RyW7nNG4a1RFEm0xTTO1SllCCaJpr90TkahFXZNEa1ZpZsAy8QhcEBbRNEqCNYruMNsQtOQONreJEKpJ4iLcZr4DuWUR7VFPTAfRzqCZiGiG9YjbVCu2OWcJCOHk6DJE135v00vyYiEg6fy+opmyYpW1173OQK5vvyABCaNpG1nDaQc7xvdqWycpULlY7RvPrMs3Y3Tj+KXxy94j35cPUP2s/ggRiiqeJYY+iI+EywJnp0RYsuwDuE7FguVAFwkrOqtfL7QD1h+L3Qq4WnEVQbQmGdR/wLhfjUJiLiGNYDT3xmCQIDQBvcSUxl3xcE4AFQhEs/56Xy249vYXhVjkwBOgkmSw+H/eEbLVX5C4FGB+sRwjh2rOVyDQjiScldMJNXD8OnENQxS7ifoJ40qKXZFhSR4BuViFoE033gqapqR3qIp+LxBB/g1mZsfU9BjQCsEotVqQQ1qNsSAdYBypYgvmHBpW5AMYRM6ogGdVr4EwRr9d0PMr2EY5WMNdoDFUXEJxk+o6/fFtqhqYc6cxaZBFiL+Xt2errRIfCAvkyLK0hhzPyYvoLThzNzazDEugyf4YS3ZpS1QEr5SJKgTm38Q4Tvae1AspngnVmOh4wayK5AHkSbeckjXaEiHZhuMdMiD8YIe6EmNQVDSNJocqbx7PocFCbUfY/HAYmGfQY4N6uCaTgnO1jk2X3Q1dZ2SzlQNMndENLygldBM1VGnWz0RvWurbqGQUziqDTNKFkXuUlbxJ+pfaFAhLzcXJHhcpkQt49CliLHtND2l67vEahhwUNEgj8qxItpk3ew2VmNBpZxyWdGt6UY44dGS5lGTnTuWmWLZ/0ZOwuVcEUYeglV4ZvIv3ZShvv6BC4A04BOEbtg1Ff9c7D12AQlQPBsm4i3A/8T4GNhPHotxm4w1rq0+PhO3PdW12Su7XjEMpfIqpd8s6wIspU4LxwR4AeSBcYxiQ9rCsgbEUFrlzX2pwiQRnkC7XGcO+P6zCjjLSiTEGJV8sEK5oqn+ztU4NSSZxprEjnGUswRKvMlDfCw42Izsiv7/RprAmFFIDv87AN0vhpfqJVyKIrFFB9XchdR/iZWwzPIfcM6rf2Ea54ms2ckHCj5hk2G3+0xclXzSMhs29vqAaDde2lk89WJTgHCdE7pUD7KZer6vlX74F+RhrHi4bteC9BbnohX24WIhaD/xnFtN2ebcfj6JuZp+1HTSzxTsg61CEQ9j9iIdLsRoCyWOdc0DSBuKAdHimFS2V9FYW7bYd9hzMzedcvzSRGEF4B/zC/czfLfQjXU2PBaAX720OGfMEh7M0CL/PaUuId0oX0CubJXf39+E5UkF+YvyB0I0Af3LsdUjkqxkoEiCHSSbHG1jjInMkGMedYLsxNRktxQh5ONX7J/6L8ZMh0ty8uOpZxJhcR6wBehtxxh1jUte5iL2QsBsdcrwV18ctJ9slP8dmbhmVvvjzxWgniTu+OCIOO/vPWZYBNxckJp0CXNfEyusWcc4AnqVM9ZSV66cuhT1xCaz6bzx2H/EOhlVa/5vRiHxv6JpjIXmRyIJDl/i54NcM51zwey74PRf8DhjGueDXDeRc8DsY47ng91zwey74nV7w6/Ayx5YAPzH+8HcBhdvjPGbrU6BBOZymLG/6dv6bIVjX35WbeciXKOiaUCK2UdyJLzWxIaxxmsaw4a+VXhTBHkNOIZfbqDw1xd7pIzmJMl8bvnaVs6buDsxYCotEBeyJZO74+hjDhUeSaE8ipg+sjzEqyiGD3QLO5DZG7XjDvKaK3KmgOer2w5wMHs/R1XB2twcHS/5B1msS4BT4gojlDgvpycmsGMsAtx29vovt2+Zmu9Y1EajF410bja5ofddmPyJh9XkLdnsOUyFb5axA7UN6btS/kVssEeaANkCBY2n6iVT1xOW6esCBUBXYKuH+2u5ugkYkw/wG5tF1UNrXZntVXBCHhPFUGLnXxifJDszPcswlSYoMcyMEtMUCsUQXqacOhPqbEu9yB8ruYhJK+60JF3JZsqKenh7jC4A/VwDVODUP1PBQP2tblX0hZHZAikUPniYXIjqncgaDhG9yuDX8buiUlgBp00CAPAJ1iCNh+X4pmQtBs6dh0Qr1/Km3ILo7TWkouNoK2405juT+eZ/XR+5hjo48pM/owxz1MX7V24JDzrg0zS2IcOgiNIFm7bqx5myHnrYk2WrhmLWBiGZldOeGomaeP6p9QhFGjA7FYuXccYolnq6x30tKCAvBEqJ3hScit8E5FNKbewkd75HVdsChoxAUWrAGnCwdLFqaAWE0PFMaQJVelnFPBv6zJFuaxLoxBrf3G/9YYhBP3bQpLmNNEpFqEpgJ8IT7ZmN1erKM3ovmj7IXjS2Q8GFNQSIegH2h5O8CkD5SIGui3EpmAXGklOplHLL1MiP0ISKYu9/UOs5BKDRlnyLfNkLoI8seIV06MM61OlU8XXIJrVM4J/Et56fbm7qTUWk9AXXFbWmleD+Uba16GMddPOwFK8B0vvlaUR4h+rgT9svNhx7edtJiSsxnXVXUceb5luL5lqLnE/+WovZYv/cLiuebCu6/Od9U6Hzi3VQ4F6R3IJ8L0n3QzwXpPQXpFKSynmhrN//2yk3wDhIgjzrf76NVn0pw7jrXHIx6KKJvPk51Hum1K+Uzx1TsiJQvSS+fnXqpDzXOt0Cqz0B5/nK+ADJaROe7H/anI563ce3DKl/wXDlvwzpNx4AG10vpFdAg8vULqP2cgnqzPMes4WSn/MKZ+j/494d+Bn1M0MCZjoanUYbMeDQu3XKz037w+B0EDdxF0NsW5IB9Bo1Z9t6kEN27UR3KHtzhmpLtzln6XSa7z7Fq9TnHqvbn+1LKdxirvolTphdzqtIB9hLb8Yxp+/imWj2qzbXuviPa7XfKHo+MAmIc7RgH+49LwooE5tDXCTLyqdv5eKkD/EXOvHMjrHjT8ehuWG8loXgwYfyDbh1ELl//SaQRzFPnPNIfbLz642ojkrqBg5KJvrnaI5gcb2A544mogTX4fHZ5Gjz+01mrfci3/ZSI37rPpGlNf3C4Lt53tMs5+laHrwNPk4tOo9zgcHXese4AtFvkTOHSIee99TBVaof0LNPpdJ4Zc/HqIPJz3vcNToOB/WYO/di+bjOBq4zhNeyYPjMtaOEuM5GRBfvL1Kch4e4yAUgTOssc5P08F8GHG8aYnjL1/Gl3lDnOqkf3kgk2oBjSRyZKF5kQfFdPiFiIgq0nQqCmGefgzjFtCEMbiwzX6nCwPR1FAlD9Gpy6tAzvFBOAF1uXjh4x1u2GcR1i4ipyWG+YENg5VTm4J0wI4FRlBrrBtE0oot24nMO+xi/H3Iof2PKl3g73NBm0KQWZPhQrMG566azvaeLMkfdsbUUGYuDO0C/++z1NbhWcO0W29QwgW9c/6HvQ0Y9umnl48Q14GtCPyfs8YMx1xgu9733A1mlozvUf7wjdRFP7R0MaWbRHPQE5EOJE3zUIcoQB9KA8iTWEB+M3iU7WQCRbSItsWvteK3NQ0zunDbo8XlnaoHOV9Ug2fY15Lc+kyKIM7L60UoSlhF0uu6QrnvVqEJGtmqwuuud0zDkd0wfpnI45p2NGIjqnY87pmHM65pyOOadjnBiCnSkNf1dfyiCEMT0pO7FYuxPkcZsk/H84fVj6T5oiyRDQ1BqMe1saCHtKWmIEmsAEbCOaNiPcmEIzMWfpIuegwhSFQDey3fXqsx/JLUtRQxeVdMeBmKIdN/+AIjwYpunDg6JPIWXcGIN7RSrIszbA0l5P6e/eO+ZO/8baQTzNxXWBGLR/dnBMzCD7Ju27NuO6ivBdm8txt3CaJzpj3MU5ugdXRzzXNS7ibhYoJJZFvNvr+RYLfxmlewDtQYTKuOvhaEbosmzOfIWeMJH6fyTwHaE4/Pwp4NR/wd7d6HogygahZuKW74EDqQJyf3EaoRI2nY7cR4AxfHqb1nca/NpgJunvq9EQuqxRXesGo0pp1xyL7W+M5T/j5IGt11fon5zri3W3RZZdofp/y993Vas+jNfaVyvQ5TXb5RlISK8aSVxjSpm8K6hmwfgV+vTp919JlkH6Qzn8hXOijLk20/sGhK7L9l0WMXR95dij1H59+0U3XBOGZUDvlY9/EkglO0jRydqQGZHP/7JY3/DL6mtT197brKDSy/PjblRWldb7rrYmnNG/2CrWxmqoRdlWO0ciwzdWdF3i6NBon9VNZeCkY7ktZQ9598wYwqchgXKWkRal+k5Eoly3CY/vNIG+IaU8c9E8ad4xEsv7EUtRiBxo2rlXHtqgD7jbMX5lQkTFLy66jeXqjtqO3HvAFT4MIHOWbJHoZN8rCE9YOPt216sUFnJZWUA0HEro+gWCCgYvqHuCwLeZ2CvKvexTwGlGqJ9zn819KAnUrPFaAq+nlEaSMP12B1euyBqTzNLEkP8J/9MfcKQYdoweXqWZcpT/QdO711dVTrwyNptTnpEEDw8eejYc5+hKJkdeMO6/2TXkOR3P1Y+Dp1WanhmVWFQY3gzECzEFQXigWdM0gCX1g5ejRsELh0qxpGdipZHQCno69Vq8+mA2is0ztt9NfMvIcoUaglHmfI4djVsGb7DB6WshNVxcYfAJlhELR600Qtds5CrSN0UnxegfGoyNuVXTtkZ9KXJIptxgjYWxOw0mzc9YsFzz0w8sT50vp0QHZfh0AVVAhoRJ7ok9zElwB05zhUiON7C2h6+2aOcv9FyIihFirQO3TWOkOuxohxwDPAgdvMywvzjjIy+Mlqc6BwzDIgxDFEkC0I3L4iLRXIRYF1kXTYVkVL++4TuGstD6oaax3qbvRaY6cHK9yTTYGVGwEJbWi1ihiPIAV5UHPSkyN9cWJkcldyw1NhyQACkJ3YzV57yuecLommwKrrOgNdSmiKeS4+V9Z+tvXDiOswwyItoHbLGEaHF48VK0sVobTkB+7Il6HjudLjlNW3ubfOcqrOsTm2MnRnEOYtq7cv1KkH4HlT1RYZ4l7G6WDTrHC00R0VWvNQWQoUvYLNDFNWf0v9jqwu8aE7FMGJWcZe3bCtEgfzKqNqfAhhG6vJC8gIsrdLHGmVD/wzi6+A/KKPzjwm2NI49ix5mjIT7BHqvlfB4R2vnag83DI8iCPlD2RAN67/GYoqItXaehUOsp/jLfvIpZDxBOH01Sgn50yT5kR5dK/FdIC1+JvpS830YKWqaGgzHqpHoAjfKAT19JgDlfW+YchCicb2XFEp5pxHVbMjpaiikRD6eA+4GIh8lgWSGXbL1UmGeE+qmQn9YK79E4c5KeQqa3Nx+OEukcVRFW/7b5ChHqp9rsbnFubvUYy77iPaAmRL4VprqD+eleZ7Nk/lxFBh99zfv6qiNqxTwr8hJtuPu8leCaRXe6DeJcpmnrJpgeqhUyKxzdBbL9CkItYOCCCAlUPrKs2MXyrxqyyNBtUouc7fRf/qjWT/jxuQtV/jDwFAlPIVto1gw7Zy95OJ+iCFWCjh2EKfLEScJ4qp9YZpZOPO4r43gDyyTDnRaNg7nfGyJIE6lzMR17QkMKAXx2mWSY7GYzziTDL9hEb/+4DtinGcKkR+R/JjSFtBKGn1VZ1LYsrWbCjLhrKhqr6RV/Vii5aQJu2lhnzZe7dq+EERx+0iSQIuHmMeP8uv3jeuGbTu7tc9KcifRsxpYJuSTtrbs8Rzw+ZaPgKdLo5jZGmD6OcRkIHFdyM+MNgBbM8grAXXUF4Bao2iUWi8Wxlf8x0U3LTFQlazMlsNoKr7i58F510bZLN6ZVtVmzsqr2EpHq2masLbGh+otcXlKJ2kHd0p35x/NVph2P69lK0gZgYyvdl3kuoW2Alp1pak5otdfbZwMOBc47mkLjFcxTUHAoxXWRZfuKW680rVtR+tzn74JJHG1psWhGWVzmKxe/K7H+t8baVzTeltIYBIaDORWCFF1uMU/1BiUg/SHU9ilOJHA4UO/dCkXvWBb2CM3MUV+9Qn+qof6pxvqnGuyfnv3DMfAjxmfOW5UojfnhPM8ICCRZN2IM/9MfYarlgCSxEh4ltWe/d3Nf4gjkM7JCSOA+J3wAjxsqgVOcoZvb2uTL8btZwjfzhUlBajWyihj68PHePwVqlscPs8PQE1tkDKfLFc4wTSaJ9TeGU/RzSac2KA/TKVO8GliHRl0DQDdchcZTTERT8KGvGKiQbYpNVGz+5aITLjPzFnI5RaVpqMXw4At2dAnrIovn2FcUo3n2ISH0JWvchaq1SOr6P3QJaoM2++B9OYK293eCUONAeLUPdVS0MbN/ajVqrdzTA5/PJ0T0DGFHp8Z+KMBniz/6TLCJDuY2QisOOb6iaGZbrC3QAvsybLCyvAHAWnnXdtp12pJsZ2Gf3c87QOP39nLOHokgzFe4OeJwqaHUeH02Ct+ZgT66WTruTo8KDDSV8ga2acC4p3hHEqwC5nJ3K08w3Edd5TnJiuis56S0/+8sNZdjU9DvVzWyIXSDME1RySW+P3Kg9h6vRD+vHcv6zVvd1muCUbwSR1uhUZpwvLFbt2DwOoSnfrr7TbwgnDBn4VU/8T4GNpPO5Ycum94n7Qe2TkKltK8Zh1LkFFNPw78WypfymPJMRVDnx3IPQL/+xy3v7u+HiaJ8EvT1v4D6tfP2aY9kcryBGd/VbC4DDn7r82SI+l/7jFp6dlhv9mwOelcqVqWZk9s63jUCZ6VZH9EQYfQiZ+EvJIPSMTXvWoeLStGoY+RXKqLm3n+vjBz9LtBrF4/2prySsQfx0p6Jvz14FL4ssNDRolfBhLI0UAg+RcUe20FR3d8vRlmeQVgrK4dwbBIDzC8cYAgYd0fR2GiM/1rC+b8AAAD//xhYgOU=" + return "eJzsfc9z47aS/33+CpRPzrccHb7Hqa1XlXhe9nmTmfHaM8lha0uByJaEmAIYALRH76/fAsAfEAmApAjKHls6pDK21f1BdwPobjQaP6IH2L9HD8UKOAUJ4h1CksgM3qOLX+sfXrxDKAWRcJJLwuh79I93CCHU/AHageQkUd/mkAEW8B5t8DuEBEhJ6Ea8R/9zIUR2cYUutlLmF/+rfrdlXC4TRtdk8x6tcSbgHUJrAlkq3msGPyKKd9CCpz5ynysOnBV5+RMHPPW5oWvGd1j9GGGaIiGxJEKSRCC2RjlLBdphijeQotXe4rMoKdhobEQ4JwL4I/D6Ny5QAWAt+f10e4MMQUuU1edQpNWnDc2Gx+HvAoRcJBkBKg/+pML5APsnxtPW7wJo1eda00PwDZJC6bViJIIoOAhW8ATi4bgzlCFFTtptAKJYzYnBR74DI2F5fABIk0WXSVYICfxKMxU5TuCqls4PQVyPwFfxYP3ry5db1CHZsUyWRhSF5tkh2eVJJVC5VIziq6HEoFmgDos2lpTvl7yg8WD8AXILHMktVDxQIUCglO9Rm1EbzAOhbW4TkPxKaKpW15J6j0p2OaNx16iKJNpimmZqlbKEEkTTXrsnIlGLuiaJ1qzSzIBl4hG4ICyiaZQEaxTdYbYhaMkdbG4TIVSTxEW4zXwHcssi2qOemA6inUEzEdEM6xG3qVZsc84SEMLJ0WWIrv3eppfkxUJA0vl9RTNlxSprr3udgVzffkUCEkbTNrKG0w52jO/Vtk5SoHKx2jeeWZdvxujG8Uvjl71Hvi8foPpZ/REiFFU8Swx9EB8JlwXOTomwZNkHcJ2KBcuBLhJWdFa/XmgHrD8VuxVwteIqgmhNMqj/gHG/GoXEXEIawWjujcEgQWgCeokpjbvi4ZwAKhCIZv31vlpw7e0vCrHIgSdAJclg8f+8I2SrvyBxKcD8YjlGDtWcr0CgHUk4K6cTauD4deIahih2E/UTxpUUuyLDkjwCcrEKQZtuvBU0TUnvUBX9XiCC/BvMzI6p6TGgFYJRarUgh7QaY0E6wDhSxRbMOTSsyAcwiJxRAc+qXgNhjH67oOdXsI1ysIa7QGOouITiJtV1+uPbVDUw505j0iCLEH8vb89WWyU+EBbIkWVpDTmekxfRW3DmbmxmGZZAk/0xluzSlqgIXikTVQjMv4lxnOw9qRdSPBOqMdHxglkVyQPIk245JWu0JUKyDcc7ZED4wQ51JcagqGgaTQ5V3jyeQ4OF2o6w+eEwMM+gxwb1cE0mBedqHZsuuxu6zshmKweYOqMbXlBK6CZqqNKsn4netNS3UckonFUGmaQLI/coK3mT9C+1KRCWmouTPS5SIhfw6FPEWPaaHtL03OM1DDkoaJBG5FmRbDNv9hoqMaHTzjgs6db0ohxx6MhyKcnOncpNsWz/oidhc68Iog5BK70yeBfvy1DefkWFwBtwCMI3bBuK/q53HroAhageDJJxF+F+4n0MbCaORbnNxhvWVp8eCduf69rslNyvGYdS+BRT75Z1gBdTpgTjgz0A8kC4xjAg7WFZA2MpLHLnvtTgEgnOIF2uM4Z9f1iFHWWkE2MMSr5YIFzRVP9ma50akkziTGNHOMtYgiVeZaC+FxxsRnZEfn+jTWFNKKQGfp2Bb5bCS/UTr0QQWaOC6u9C6j7Ey9hmeA65Z1S/sY1yxdds5IKEHzHJsNv8py9KvmgYDZt7fUE1Gq5tLZ96sCjBOU6I3CsH2E29XlfLv3wL8jHWPFw2asF7C3LRC/twsRC1HvjPLKbt8m4/HkXdzL5oO2hmi3dA1qEIh7D7EQ+XYjUEksc654CkDcQB6fBMK1oq6a0s2m077DmYm8+5fmkiMYLwDviF+5kfLfQjXU2PBaAX720OGfMEh7M0CL/PaUuId0oX0CubJXf39+E5UkF+YvyB0I0Af3LsdUjkDzNQJEAOXz1e5lTyDeW5p1WON7DGReZIyY4783cPvckBKkbIw6n2OPBfjJ8MkebmxVWvO4zJdcSqqbcRmd0xJnVlkNgLCbvRQdpbcRbdcrKDmHM065ZRGb08X1R7kkjtqyNGs89LOMsy4OZKyaRzk+uaWHlBJc6pybMU9p6y1v/UxcMnLhpW/43H7hPewbDa9H8zGpHvDV1zLCQvEllw6BI/l0ib4ZxLpM8l0ucS6QHDOJdIu4GcS6QHYzyXSJ9LpM8l0tNLpB1e5tii6SfGH/4uoHB7nMdsfQo0KIfTFDJO385/MwTrisVyMw/5EgVdE0rENoo78bUmNoQ1TtMYNvxHpRdFsMeQU8jlNipPTbF3+khOoszXhq9dF66puwMzlsIiUQF7Ipk7vj7GcOGRJNqTiOkD6wx1RTlksFvAmdzGqLZvmNdUkTsVNMdNhzAng8dzQjGc3e3BmYF/kPWaBDgFviBiucNCenIyK8YywG1Hr68VwLbpBaB1TQRq8XjXRqNrgN+12Y9IWH3Zgt3QxNQUVzkrUPuQnhv1b+QWS4Q5oA1Q4FiaDixVBXa5rh5wIFQFtkq4v7b7waARyTC/gXl0HZT2tdleFRfEIWE8FUbutfFJsgPzsxxzSZIiw9wIAW2xQCzRZf2pA6H+psS73IGyu5iE0n5rwoVclqyopwvK+JLpLxVANU7NAzU81M/aVmVfoZkdkGLRg6fJhYjOOabBIOGbHG4NHw2d0hIgbVoukEegDnEkLN8vJXMhaPY0LFqhnj/1FkR3pykNBVdbYbuVyZHcv+zz+jQ1zNGRh/QZfZijPqGtuoFwyBmXph0IEQ5dhCbQrH1K1pzt0NOWJFstHLM2ENGsjO7cUNTM8ye1TyjCiNGhWKycO06xxNM19rGkhLAQLCF6V3gichucQyG9uZfQ8R5ZbQccOgpBoQVrwMnSwaKlGRBGwzOlAVTpZRn3ZOA/S7KlSawbY3B7v/GPJQbx1G2u4jLWJBGpJoGZAE+4bzZWpyfL6N17fi+799gCCR/WFCTiAdhXSv4uAOkjBbImyq1kFhBHSqlexiFbLzNCHyKCuftNreMchEJTdnbybSOEPrLsEdKlA+Ncq1PF0yWX0DqFcxLfcn66val7P5XWE1BX3CZgivdD2Qish3HcxcNesAJM55uvFeURoo87Yb/efOjhbSctpsR81uVOHWee73We73V6PvHvdWqP9Xu/0nm+2+H+m/Pdjs4n3t2Ocwl/B/K5hN8H/VyQ3lOQTkEq64m2dvNvr9wE7yAB8qjz/T5a9akE565zzcGohyL65uNU55Feu1K+cEzFjkj5kvTyxamX+lDjfAuk+gyU5y/nCyCjRXS++2F/OuJ5G9c+rPIFzyX9NqzT9FhocL2U7goNIl+HhdrPKag3y3PMGk52yi+cqWOGf3/oZ9DHBA2c6Wh4GmXIjEfj0i03O+0Hj99B0MBdBL1tQQ7YZ9CYZe9NCtG9G9Wh7MEdrinZ7pyl32Wy+xyrVp9zrGp/vi+lfIex6ps4ZXoxpyodYC+xgdGYRplvqjmm2lzrxiqi3Vml7IrJKCDG0Y5xsP+4JKxIYA59vTMjn7qdj5c6wF/kzDu3Dos3HY9udPRWEooHE8Y/6NZB5PL1n0QawTx1ziO/w8kVp5nYTBPt9Z/yG0uq+14oLegLvz3VIDnewHLGg2QDa/Cx9vI0ePyH2lbXlW/7KYkS6xqYpjX9Zev6zoOjy9DRl2F8jYuaFH4a5eKLq2GRdXWi3VloCpcOOe9lkalSO6RnmU6nYc+Y+2oHAbPzmnRwGgxs03Po/vc16QncAA2vYce052lBCzfniYws2JanPkQKN+UJQJrQkOcgXeq5Pz/cMMa04qnnT7sRz3FWPboFjwz17RjSfidK850QfFcrjViIgh07QqCmGefghjttCEP7sQzX6nCwPY1YAlD9Gpy6tAxvsBOAF1uXjtY61qWQcY114ipyWEudENg5VTm4lU4I4FRlBprotE0oot24nMO+fjnHNBMY2Cmn3g73NBm0KQWZPhQrMG566azvaeI8WujZ2ooMxMCdoV/893ua3Co4d4ps671Jtq5/0PdyqB/dNPPw4hvwBqUfk/cdypjrjBd630OUrUPknOs/3hG6iab2T4Y0smiPemt0IMSJvmsQ5AgD6EF5EmsID8ZvEp2sgUi2kBbZtK7HVuagpndOG3R5vLK0QecG8JFs+voZW55JkUUZ2H1ppQhLCbtcdklXPOvVICJbNVlddM/pmHM6pg/SOR1zTseMRHROx5zTMed0zDkdc07HODEEG3oa/q52nkEIY1p5dmKxdgPN4zZJ+P9w+rD0nzRFkiGgqTUY97Y0EPaUtMQINIEJ2EY0bUa4MYVmYs7SRc5BhSkKge7/u+vVZz+SW5aihi4q6Y4DMUU7bv4BRXgwTNOHB0WfQsq4MQb3ilSQZ22Apb2e0t+9d8yd/o21g3iai+sCMWj/7OCYmEH2Tdp3bcZ1Tdi7NpfjLi81j1bGuMJ0dOuyjniua1zE3WNRSCyLeJf+8y0W/upT9wDagwhVv9fD0YzQZdnT+go9YSL1/0jgO0JxuHwPcOrvS+DuDz4QZYNQM3HL98CBVAG5vziNUAmbTiPzI8AYPr29/jt9kW0wk/T3h9EQuqxRXeu+rEpp1xyL7W+M5T/j5IGt11fon5zr+4i3RZZdofp/y993Vas+jNfaVyvQ5TXb5RlISK8aSVxjSpm8K6hmwfgV+vz5468kyyD9oRz+wjlRxtw26n06Q1fc+u7YGLq+QttRar++/ar71AnDMqD3ysc/CaSSHaToZN3bjMjnf5Ctb/hlmbGpUu7t8VDp5flxNyqrCqV9N4ITzuhfbBVrYzXUomyrnSOR4Rsrui5xdGi0z+qmMnDSsdyWsvW+e2YM4dOQQDnLSItSfZUkUa7bhDeLmkDfkFKeuWge+e4YieX9iKUoRA407VzHD23QB9ztGL8yIaLiFxfdxnJ1I3JH7j3gCh8GkDlLtkh0su8VhCcsnO3O61UKC7msLCAaDiV0/XBDBYMX1D1B4NtM7BXlXvYp4DQj1M+5z+Y+lARq1ngtgddTSiNJmH7yhCtXZI1JZmliyP+E/+kPOFIMO0YPbyBNOcr/oOnd68sxJ14Zm80pz0iChwcPPRuOc3QlkyPvZfdfiBvyCpHn6sfBizRNq5FKLCoMbwbihZiCIDzQ42oawJL6wYNbo+CFQ6VY0jOx0khoBT2dei1efTAbxeYZ2+8mPgFluUINwShzPseOfjeDN9jg9LWQGi6uMPgEy4iFo1YaoWs2chXpm6KTYvQPDcbG3KppW6O+FDkkUy7+xsLYnQaT5mcsWK756QeWp84HZ6KDMny6gCogQ8Ik98Qe5iS4A6e5QiTH02Hbw8dutPMXemVFxQix1oHbpp9UHXa0Q44BHoQOXmbYX5zxkRdGy1OdA4ZhEYYhiiQB6MZlcZFoLkKsi6yLpkIyqs3h8B1DWWj9vtVYb9P3kFUdOLmeshrsjChYCEvrIbFQRHmAq8qDnhSZm2sLk6OSO5YaGw5IgJSEbsbqc17XPGF0TTYF11nQGmpTxFPJ8fK+s/U3LhzHWQYZEe0DtlhCtDi8eCnaWK0NJyA/9kQ9b8ROl5ymrb1NvnMV1vWJzbETozgHMe1duX5cST8fy56oMK85djfLBp3jYauI6KpHrgLI0CVsFujimjP6X2x14XeNiVgmjErOsvZthWiQPxtVm1NgwwhdXkhewMUVuljjTKj/YRxd/AdlFP5x4bbGkUex48zREJ9gj9VyPo8I7XztwebhEWRBHyh7ogG993hMUdGWrtNQqPUUf5lPhcWsBwinjyYpQb9VZR+yo0sl/iukha9EX0rebyMFLVPDwRh1Uj2ARnnAp68kwJyvLXMOQhTOJ8ZiCc/0L7stGR0txZSIh1PA/UDEw2SwrJBLtl4qzDNC/VzIz2uF92icOUlPIdPbmw9HiXSOqgirG9d8hQj1C3d27y83t3qMZTv2HlATIt8KU934/XSP2lkyf64ig0++Vmx91RG1Yp4VeYk23LTfSnDNojvd1G4u07R1E0wP1QqZFY7u6dd+PKIWMHBBhAQqH1lW7GL5Vw1ZZOg2qUXOdvovf1TrJ/z43IUqvxt4ioSnkC00a4ads5c8nC94hCpBxw7CFHniJGE81S9TM0snHveVcbyBZZLhTovGwdzvDRGkidS5mI49oSGFAD67TDJMdrMZZ5LhF2yit79fB+zTDGHS2/s/E5pCWgnDz6osaluWVjNhRtw1FY3V9Io/K5TcNAE3bayz5stdu1fCCA4/aRJIkXDzmHF+3f5+vfBNJ/f2OWnORHptZMuEXJL21l2eIx6fslHwFGl0cxsjTB/HuAwEjiu5mfEGQAtmeQXgrroCcAtU7RKLxeLYyv+Y6KZlJqqStZkSWG2FV9xceK+6aNulG9Oq2qxZWVV7iUh1bTPWlthQ/UUuL6lE7aBu6c784/kq047H9WwlaQOwsZXuyzyX0DZAy840NSe02uvtswGHAucdTaHxCuYpKDiU4rrIsn3FrVea1q0ofe7zd8Ekjra0WDSjLC7zlYvflVj/W2PtKxpvS2kMAsPBnApBii63mKd6gxKQ/hBq+xQnEjgcqPduhaJ3LAt7hGbmqK9eoT/VUP9UY/1TDfZPz/7hGPgR4zPnrUqUxvxwnmcEBJKsGzGG/+mPMNVyQJJYCY+S2rPfu7kvcQTyGVkhJHCfEz6Axw2VwCnO0M1tbfLl+N0s4Zv5wqQgtRpZRQx9+HTvnwI1y+OH2WHoiS0yhtPlCmeYJpPE+hvDKfq5pFMblIfplCleDaxDo64BoBuuQuMpJqIp+NBXDFTINsUmKjb/ctEJl5l5C7mcotI01GJ48AU7uoR1kcVz7CuK0Tz7kBD6kjXuQtVaJHX9H7oEtUGbffC+HEHb+ztBqHEgvNqHOiramNk/tRq1Vu7pgc/nEyJ6hrCjU2M/FOCzxR99JthEB3MboRWHHF9RNLMt1hZogX0ZNlhZ3gBgrbxrO+06bUm2s7DP7ucdoPF7ezlnj0QQ5ivcHHG41FBqvD4bhe/MQB/dLB13p0cFBppKeQPbNGDcU7wjCVYBc7m7lScY7qOu8pxkRXTWc1La/yNLzeXYFPT7VY1sCN0gTFNUconvjxyovccr0a+Sx7J+88S59TZcFK/E0VZolCYcTxPXLRi8DuGpXzx/Ew8vJ8xZeNVPvI+BzaRz+aHLJvjgHxreOgmV0r5mHEqRU0w9Df9aKF/KG9QzFUGd3xg+AP36H7e8u78fJoryJdXX/3Cs77VVr2RyvIEZ39VsLgMOfuvzZIj6X/uMWnp2WG/2bA56VypWpZmT2zreNQJnpVkf0RBh9CJn4S8kg9IxNa8Uh4tK0ahj5Fcqoubef6+MHP0u0GsXj/amvJKxB/HSHgC/PXjiuyyw0NGiV8GEsjRQCD5FxR7bQVHd369GWZ5BWCsrh3BsEgPMLxxgCBh3R9HYaIz/WsL5vwAAAP//cSUrwA==" } diff --git a/metricbeat/module/kubernetes/pod/_meta/fields.yml b/metricbeat/module/kubernetes/pod/_meta/fields.yml index 0537faab52a..0b46d290839 100644 --- a/metricbeat/module/kubernetes/pod/_meta/fields.yml +++ b/metricbeat/module/kubernetes/pod/_meta/fields.yml @@ -94,6 +94,11 @@ format: bytes description: > Total working set memory + - name: limit.pct + type: scaled_float + format: percent + description: > + Working set memory usage as a percentage of the defined limit for the pod containers (or total node allocatable memory if unlimited) - name: rss type: group fields: diff --git a/metricbeat/module/kubernetes/pod/data.go b/metricbeat/module/kubernetes/pod/data.go index bb24d31905c..fdb604d4e17 100644 --- a/metricbeat/module/kubernetes/pod/data.go +++ b/metricbeat/module/kubernetes/pod/data.go @@ -128,6 +128,8 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common. } if memLimit > 0 { podEvent.Put("memory.usage.limit.pct", float64(usageMem)/memLimit) + podEvent.Put("memory.working_set.limit.pct", float64(workingSet)/memLimit) + } } @@ -137,6 +139,7 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common. } if memLimit > 0 { podEvent.Put("memory.usage.limit.pct", float64(workingSet)/memLimit) + podEvent.Put("memory.working_set.limit.pct", float64(workingSet)/memLimit) } } diff --git a/metricbeat/module/kubernetes/pod/pod_test.go b/metricbeat/module/kubernetes/pod/pod_test.go index 41340e5dede..37486ad58e8 100644 --- a/metricbeat/module/kubernetes/pod/pod_test.go +++ b/metricbeat/module/kubernetes/pod/pod_test.go @@ -64,9 +64,10 @@ func TestEventMapping(t *testing.T) { "cpu.usage.node.pct": 0.005631997, "cpu.usage.limit.pct": 0.005631997, - "memory.usage.bytes": 1462272, - "memory.usage.node.pct": 0.01, - "memory.usage.limit.pct": 0.1, + "memory.usage.bytes": 1462272, + "memory.usage.node.pct": 0.01, + "memory.usage.limit.pct": 0.1, + "memory.working_set.limit.pct": 0.09943977591036414, } for k, v := range testCases {