[metricbeat][system] add swap field to system.process.memory metricset (#48334)

* [metricbeat][system] add swap field to system.process.memory metricset

* update docs

* update NOTICE.txt

* remove field mapping

* make changelog message more accurate

* revert removing of field mapping

* resolve PR comment

* Update metricbeat/module/system/process/_meta/fields.yml

Co-authored-by: Colleen McGinnis <colleen.j.mcginnis@gmail.com>

* make update

* update swap field ga version

---------

Co-authored-by: Colleen McGinnis <colleen.j.mcginnis@gmail.com>
(cherry picked from commit 90844ec)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	metricbeat/module/system/fields.go

Author: stefans-elastic

NOTICE.txt

@@ -11387,11 +11387,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-system-metrics
+<<<<<<< HEAD
 Version: v0.13.4
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
 Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.13.4/LICENSE.txt:
+=======
+Version: v0.13.6
+Licence type (autodetected): Apache-2.0
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.13.6/LICENSE.txt:
+>>>>>>> 90844ec02 ([metricbeat][system] add swap field to system.process.memory metricset (#48334))
 
                                  Apache License
                            Version 2.0, January 2004

changelog/fragments/1767864511-add-swap-field-to-system.process.memory-metric-set-in-metricbeats.yaml

@@ -0,0 +1,45 @@
+# REQUIRED
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: enhancement
+
+# REQUIRED for all kinds
+# Change summary; a 80ish characters long description of the change.
+summary: add swap field to system.process.memory metric set in metricbeat
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# description:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# impact:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# action:
+
+# REQUIRED for all kinds
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: metricbeat
+
+# AUTOMATED
+# OPTIONAL to manually add other PR URLs
+# PR URL: A link the PR that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+# pr: https://github.com/owner/repo/1234
+
+# AUTOMATED
+# OPTIONAL to manually add other issue URLs
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+# issue: https://github.com/owner/repo/1234

docs/reference/metricbeat/exported-fields-system.md

@@ -1047,6 +1047,14 @@ Memory-specific statistics per process.
     format: bytes
 
 
+**`system.process.memory.swap`** {applies_to}`stack: ga 8.19.11`
+:   The swap memory used by the process (supported only on Linux kernel version 2.6.34+).
+
+    type: long
+
+    format: bytes
+
+
 ## io [_io]
 
 Disk I/O Metrics, as forwarded from /proc/[PID]/io. Available on Linux only.

docs/reference/metricbeat/metricbeat-metricset-system-process.md

@@ -369,7 +369,8 @@ Here is an example document generated by this metricset:
                     "pct": 0.0008
                 },
                 "share": 16252928,
-                "size": 1886003200
+                "size": 1886003200,
+                "swap": 1302528
             },
             "num_threads": 9,
             "state": "sleeping"

go.mod

@@ -174,8 +174,13 @@ require (
 	github.com/elastic/bayeux v1.0.5
 	github.com/elastic/ebpfevents v0.8.0
 	github.com/elastic/elastic-agent-autodiscover v0.10.0
+<<<<<<< HEAD
 	github.com/elastic/elastic-agent-libs v0.26.2
 	github.com/elastic/elastic-agent-system-metrics v0.13.4
+=======
+	github.com/elastic/elastic-agent-libs v0.31.0
+	github.com/elastic/elastic-agent-system-metrics v0.13.6
+>>>>>>> 90844ec02 ([metricbeat][system] add swap field to system.process.memory metricset (#48334))
 	github.com/elastic/go-elasticsearch/v8 v8.19.0
 	github.com/elastic/go-freelru v0.16.0
 	github.com/elastic/go-quark v0.3.0

go.sum

@@ -366,10 +366,17 @@ github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQB
 github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
 github.com/elastic/elastic-agent-client/v7 v7.15.0 h1:nDB7v8TBoNuD6IIzC3z7Q0y+7bMgXoT2DsHfolO2CHE=
 github.com/elastic/elastic-agent-client/v7 v7.15.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
+<<<<<<< HEAD
 github.com/elastic/elastic-agent-libs v0.26.2 h1:zwytPWmTWSJG80oa9/5FJ6zue47ysI23eMo15LfeWy0=
 github.com/elastic/elastic-agent-libs v0.26.2/go.mod h1:fc2noLqosmQorIGbatJfVeh4CL77yiP8ot16/5umeoM=
 github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c=
 github.com/elastic/elastic-agent-system-metrics v0.13.4/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U=
+=======
+github.com/elastic/elastic-agent-libs v0.31.0 h1:3i/a0n40VPpx+vyB6oBZkTpcsjEGd2LKBiJjSI//j38=
+github.com/elastic/elastic-agent-libs v0.31.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ=
+github.com/elastic/elastic-agent-system-metrics v0.13.6 h1:Gwy3siqs5aHAP6RlLXel/irnedXvqdQ+tAzPq/2QOlY=
+github.com/elastic/elastic-agent-system-metrics v0.13.6/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA=
+>>>>>>> 90844ec02 ([metricbeat][system] add swap field to system.process.memory metricset (#48334))
 github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
 github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
 github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 h1:cWPqxlPtir4RoQVCpGSRXmLqjEHpJKbR60rxh1nQZY4=

metricbeat/module/system/fields.go

@@ -262,7 +262,8 @@
                     "pct": 0.0008
                 },
                 "share": 16252928,
-                "size": 1886003200
+                "size": 1886003200,
+                "swap": 1302528
             },
             "num_threads": 9,
             "state": "sleeping"
@@ -271,4 +272,4 @@
     "user": {
         "name": "alexk"
     }
-}
+}

metricbeat/module/system/process/_meta/data.json

@@ -111,6 +111,13 @@
           format: bytes
           description: >
             The shared memory the process uses.
+        - name: swap
+          type: long
+          format: bytes
+          version:
+              ga: 8.19.11
+          description: >
+            The swap memory used by the process (supported only on Linux kernel version 2.6.34+).
     - name: io
       type: group
       description: Disk I/O Metrics, as forwarded from /proc/[PID]/io. Available on Linux only.