Skip to content

Commit 3aefd21

Browse files
stefans-elasticmergify[bot]
authored andcommitted
[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 # docs/reference/metricbeat/exported-fields-system.md # docs/reference/metricbeat/metricbeat-metricset-system-process.md # go.mod # go.sum # metricbeat/module/system/fields.go
1 parent 9c75eba commit 3aefd21

9 files changed

Lines changed: 3113 additions & 2 deletions

File tree

NOTICE.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11320,11 +11320,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
1132011320

1132111321
--------------------------------------------------------------------------------
1132211322
Dependency : github.com/elastic/elastic-agent-system-metrics
11323+
<<<<<<< HEAD
1132311324
Version: v0.13.4
1132411325
Licence type (autodetected): Apache-2.0
1132511326
--------------------------------------------------------------------------------
1132611327

1132711328
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.13.4/LICENSE.txt:
11329+
=======
11330+
Version: v0.13.6
11331+
Licence type (autodetected): Apache-2.0
11332+
--------------------------------------------------------------------------------
11333+
11334+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.13.6/LICENSE.txt:
11335+
>>>>>>> 90844ec02 ([metricbeat][system] add swap field to system.process.memory metricset (#48334))
1132811336

1132911337
Apache License
1133011338
Version 2.0, January 2004
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# REQUIRED
2+
# Kind can be one of:
3+
# - breaking-change: a change to previously-documented behavior
4+
# - deprecation: functionality that is being removed in a later release
5+
# - bug-fix: fixes a problem in a previous version
6+
# - enhancement: extends functionality but does not break or fix existing behavior
7+
# - feature: new functionality
8+
# - known-issue: problems that we are aware of in a given version
9+
# - security: impacts on the security of a product or a user’s deployment.
10+
# - upgrade: important information for someone upgrading from a prior version
11+
# - other: does not fit into any of the other categories
12+
kind: enhancement
13+
14+
# REQUIRED for all kinds
15+
# Change summary; a 80ish characters long description of the change.
16+
summary: add swap field to system.process.memory metric set in metricbeat
17+
18+
# REQUIRED for breaking-change, deprecation, known-issue
19+
# Long description; in case the summary is not enough to describe the change
20+
# this field accommodate a description without length limits.
21+
# description:
22+
23+
# REQUIRED for breaking-change, deprecation, known-issue
24+
# impact:
25+
26+
# REQUIRED for breaking-change, deprecation, known-issue
27+
# action:
28+
29+
# REQUIRED for all kinds
30+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
31+
component: metricbeat
32+
33+
# AUTOMATED
34+
# OPTIONAL to manually add other PR URLs
35+
# PR URL: A link the PR that added the changeset.
36+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
37+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
38+
# Please provide it if you are adding a fragment for a different PR.
39+
# pr: https://github.com/owner/repo/1234
40+
41+
# AUTOMATED
42+
# OPTIONAL to manually add other issue URLs
43+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
44+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
45+
# issue: https://github.com/owner/repo/1234

0 commit comments

Comments
 (0)