Skip to content

[9.2](backport #48830) Update elastic-agent-system-metrics to fix #48690#49025

Merged
belimawr merged 4 commits into9.2from
mergify/bp/9.2/pr-48830
Feb 24, 2026
Merged

[9.2](backport #48830) Update elastic-agent-system-metrics to fix #48690#49025
belimawr merged 4 commits into9.2from
mergify/bp/9.2/pr-48830

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 21, 2026

Proposed commit message

See title

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works. Where relevant, I have used the stresstest.sh script to run them under stress conditions and race detector to verify their stability.
  • I have added an entry in ./changelog/fragments using the changelog tool.

## Disruptive User Impact
## Author's Checklist

How to test this PR locally

The reproduction steps are a modified version of #48690. Here the discard output is used.

cat <<'EOF' > repro.yml
logging.level: error
metricbeat.modules:
- module: system
  metricsets: ["cpu"]
  hostfs: "/hostfs"
  period: 10s
output.discard:
    enabled: true
EOF

docker run --rm \
  --name=metricbeat \
  --volume="$(pwd)/repro.yml:/usr/share/metricbeat/metricbeat.yml:ro" \
  --volume="/var/run/docker.sock:/var/run/docker.sock:ro" \
  --volume="/sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro" \
  --volume="/proc:/hostfs/proc:ro" \
  --volume="/:/hostfs:ro" \
  docker.elastic.co/beats/metricbeat:9.3.0 metricbeat -e

Because the log level is set to error in the configuration file and this PR fixes the error, there will be no logs.

Related issues

## Use cases
## Screenshots
## Logs

This is an automatic backport of pull request #48830 done by [Mergify](https://mergify.com).

@belimawr @mergify
Update elastic-agent-system-metrics to fix #48690 (#48830)
e86c56f 
(cherry picked from commit 5b79ccc)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 21, 2026
@mergify mergify bot requested a review from a team as a code owner February 21, 2026 00:20
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 21, 2026
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 21, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 21, 2026

Cherry-pick of 5b79ccc has failed:

On branch mergify/bp/9.2/pr-48830
Your branch is up to date with 'origin/9.2'.

You are currently cherry-picking commit 5b79ccc9d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 21, 2026

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@github-actions github-actions bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Feb 21, 2026
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 21, 2026

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 21, 2026
@mergify mergify bot mentioned this pull request Feb 21, 2026
Merged
6 tasks
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 23, 2026

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 23, 2026

CI failure is in golangci-lint on macos-latest only (job 64568823032); Linux and Windows lint jobs passed.

Root cause from logs:

  • golangci-lint run --timeout=30m --whole-files was used.
  • The run ended with level=error msg="Timeout exceeded: try increasing it by passing --timeout option" and golangci-lint exit with code 4.
  • This happened after a long run (Ran golangci-lint in 2729718ms, ~45m), so the job is failing due to lint timeout rather than lint findings (0 issues. reported).

Recommended minimal remediation:

  1. Increase lint timeout in .github/workflows/golangci-lint.yml (at least for macos-latest, or globally) from --timeout=30m to --timeout=60m.
  2. If you want to keep 30m, reduce lint scope for backport PRs (for example, avoid --whole-files where possible) to shorten runtime.

Tests run by me:

  • Reviewed workflow run 22318148354 job list and failed job logs; no local test execution.

What is this? | From workflow: PR CI Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 24, 2026

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.2/pr-48830 upstream/mergify/bp/9.2/pr-48830
git merge upstream/9.2
git push upstream mergify/bp/9.2/pr-48830

@belimawr belimawr enabled auto-merge (squash) February 24, 2026 21:41
@belimawr belimawr merged commit 80beac3 into 9.2 Feb 24, 2026
206 checks passed
@belimawr belimawr deleted the mergify/bp/9.2/pr-48830 branch February 24, 2026 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@belimawr belimawr belimawr approved these changes

Assignees

@belimawr belimawr

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @belimawr