Skip to content

merge queue: merged #22398: [8.19] (backport #22390) fix flaky test TestApprovedMetrics - #22403

Closed
mergify[bot] wants to merge 2 commits into
8.19from
mergify/merge-queue/909689bf4f
Closed

mergify[bot] wants to merge 2 commits into
8.19from
mergify/merge-queue/909689bf4f

Conversation

@mergify

@mergify mergify Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Note

This is a merge queue draft opened by Mergify. Its pull request has merged, and nobody needs to act on it.
Mergify opened it for batch recursive-bourguignon-mjppm7 of the default queue, to test #22398 before it merged into 8.19.

🎉 What landed

Mergify merged its pull request into 8.19, then closed this draft:

This draft's code was built in this order:

  1. 8.19 at 6cbd077
  2. #22398, the pull request of this batch
Metadata for CI tooling, read by mergify ci
---
all_scopes: false
checking_base_sha: 6cbd077fb7cb33414e7c9f972015aa6edff83653
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 22398
    scopes: []
scopes: []
...
Required conditions of queue rule default for merge
Required conditions to stay in the queue

aelnahas and others added 2 commits November 6, 2026 13:42
* fix flaky test TestApprovedMetrics

commit attempts a fix on TestApprovedMetrics by filtering out
server aggregates to focus on agent metrics.

fixes: #21608

* remove additional tick in metricset.json

(cherry picked from commit 906852a)
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

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

@elastic-vault-github-plugin-prod

Copy link
Copy Markdown
Contributor

Dependency Update Analysis

Summary: This PR bumps Elastic Stack snapshot pins from 8.19.25-12af652c-SNAPSHOT to 8.19.25-39e70cc6-SNAPSHOT in test/CI infrastructure files; overall risk is low-to-moderate (contained scope, partial PR test coverage, no breaking usage found).

Elastic Stack snapshot pins 8.19.25-12af652c-SNAPSHOT → 8.19.25-39e70cc6-SNAPSHOT

Ecosystem: CI / container / snapshot image pins

Check Result
Breaking changes ✅ None found in repository usage patterns
Testable in PR ✅/⚠️ Partial — ci.yml runs on pull_request/merge_group and executes system-test + system-test-fips with docker compose up; k8s stack manifests are infra config and not directly exercised by default PR jobs
Changelog highlights (vOLD → vNEW)

Upstream release-note bodies for build IDs 12af652c → 39e70cc6 were not available from local metadata. The update source is .ci/updatecli/bump-elastic-stack-snapshot.yml, which tracks latest snapshot build IDs from artifacts-api/snapshots/<branch>.json.

CVE-focused assessment: no explicit CVE/GHSA entries were available for these snapshot build IDs. This PR only changes external stack image/version pins used for test/infra; it does not modify application authn/authz, parsing, crypto, or privilege logic in this repo.

Usage in this repository
  • Updated pins:
    • docker-compose.yml (elasticsearch-wolfi, kibana-wolfi, metricbeat images)
    • testing/infra/k8s/base/stack/{apm-server,elasticsearch,kibana}.yaml (spec.version)
  • Consuming paths:
    • systemtest/containers.go starts stack via docker compose -f ../docker-compose.yml
    • systemtest/cmd/buildapm/main.go reads docker-compose.yml to derive stack tag
    • script/check_docker_compose.sh validates snapshot tag currency
  • CI execution context:
    • .github/workflows/ci.yml (on: pull_request, merge_group) runs system-test and system-test-fips, including docker compose up -d.
Compatibility assessment
  • No repo code/API contract changes accompany this bump; only snapshot identifiers changed.
  • Version family remains 8.19.25 (build-id refresh), which lowers compatibility risk versus major/minor jumps.
  • Blast radius is bounded to test/CI/infra stack behavior; production apm-server module dependencies are unchanged.

Labels Applied

  • oblt-aw/ai/merge-ready — low-to-moderate risk, no breaking usage found, and CI/dev-infra scoped dependency bump with PR-context system-test coverage.

What is this? | From workflow: Observability Agentic Workflow — Pull Request

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

@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

💚 Build Succeeded

@mergify mergify Bot changed the title merge queue: checking #22398 on 8.19 (6cbd077) merge queue: merged #22398: [8.19] (backport #22390) fix flaky test TestApprovedMetrics Nov 6, 2026
@mergify mergify Bot closed this Nov 6, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/909689bf4f branch November 6, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant