Skip to content

[aws_<service>_otel] Improvements#19683

Draft
mrg-elastic wants to merge 83 commits into
elastic:mainfrom
mrg-elastic:aws-otel-improvements
Draft

[aws_<service>_otel] Improvements#19683
mrg-elastic wants to merge 83 commits into
elastic:mainfrom
mrg-elastic:aws-otel-improvements

Conversation

@mrg-elastic

Copy link
Copy Markdown
Contributor

Proposed commit message

This PR improves aws otel dashboards design and ESQL queries.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.
  • I have verified that any added dashboard complies with Kibana's Dashboard good practices

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

@andrewkroh andrewkroh added Integration:aws_sqs_otel AWS SQS Metrics OpenTelemetry Assets dashboard Relates to a Kibana dashboard bug, enhancement, or modification. labels Jun 22, 2026
@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

Buildkite failed before tests ran because the post-checkout hook cannot merge the PR branch with current main. Current main has the AWS OTel package metadata at 0.3.0, while this PR is still adding 0.2.2 entries, causing content conflicts in the same manifest.yml and changelog.yml files.

Remediation

  • Merge/rebase current main into aws-otel-improvements and resolve the AWS OTel package metadata conflicts.
  • For each affected package, keep the existing 0.3.0 changelog entry from main and add this PR's dashboard/query improvement as the next version after it, with matching manifest.yml versions.
  • Re-run Buildkite after the branch is mergeable; no package tests ran in this failed job.
Investigation details

Root Cause

This is a configuration/mergeability failure during Buildkite checkout, not a source test failure. The failing job switched to current main at 199908edee and attempted to create pr_merge_19683, but automatic merge failed on package metadata files.

The conflict is explained by the package metadata state:

  • main has packages/aws_ec2_otel/manifest.yml at version: 0.3.0 and a top changelog entry for 0.3.0 from PR 19637.
  • The PR branch has packages/aws_ec2_otel/manifest.yml at version: 0.2.2 and inserts a top changelog entry for 0.2.2.
  • The PR file list shows the same 0.2.1 -> 0.2.2 manifest bump and new 0.2.2 changelog entry pattern across aws_ec2_otel, aws_ecs_otel, aws_elb_metrics_otel, aws_lambda_otel, aws_rds_otel, and aws_sqs_otel.

Evidence

CONFLICT (content): Merge conflict in packages/aws_ec2_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_ec2_otel/manifest.yml
CONFLICT (content): Merge conflict in packages/aws_ecs_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_ecs_otel/manifest.yml
CONFLICT (content): Merge conflict in packages/aws_elb_metrics_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_elb_metrics_otel/manifest.yml
CONFLICT (content): Merge conflict in packages/aws_lambda_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_lambda_otel/manifest.yml
CONFLICT (content): Merge conflict in packages/aws_rds_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_rds_otel/manifest.yml
CONFLICT (content): Merge conflict in packages/aws_sqs_otel/changelog.yml
CONFLICT (content): Merge conflict in packages/aws_sqs_otel/manifest.yml
Automatic merge failed; fix conflicts and then commit the result.

Verification

  • Reviewed the failed Buildkite upload log for build 44842.
  • Checked PR metadata: GitHub reports mergeable_state: dirty.
  • Compared main and PR branch package metadata for the affected AWS OTel packages.
  • Reviewed prior detective comments; the earlier comment covered an older stale build, while this failure is now active again against current main.

Follow-up

Later Buildkite statuses on the PR show the same pipeline upload step is still failing on newer commits, so resolving the merge conflicts is the gating action before CI can exercise tests.


What is this? | From workflow: PR Buildkite Detective

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

mykola-elastic and others added 13 commits June 22, 2026 15:58
Make the six AWS OpenTelemetry content package READMEs (ec2, ecs, rds,
sqs, lambda, elb_metrics) consistent:

- Reference the aws_cloudwatch_input_otel input package as the data
  collection source in the "content only" paragraph.
- Pluralize the "Alerting Rule Templates" heading to match the
  Dashboards and SLO Templates headings.
- Fix a duplicated phrase in the aws_elb_metrics_otel intro line.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@elastic-vault-github-plugin-prod

Copy link
Copy Markdown

✅ All changelog entries have the correct PR link.

@elasticmachine

Copy link
Copy Markdown

💚 Build Succeeded

History

@andrewkroh andrewkroh added the documentation Improvements or additions to documentation. Applied to PRs that modify *.md files. label Jun 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dashboard Relates to a Kibana dashboard bug, enhancement, or modification. documentation Improvements or additions to documentation. Applied to PRs that modify *.md files. Integration:aws_ec2_otel AWS EC2 Metrics OpenTelemetry Assets Integration:aws_ecs_otel AWS ECS Metrics OpenTelemetry Assets Integration:aws_elb_metrics_otel AWS ELB Metrics OpenTelemetry Assets Integration:aws_lambda_otel AWS Lambda Metrics OpenTelemetry Assets Integration:aws_rds_otel AWS RDS Metrics OpenTelemetry Assets Integration:aws_sqs_otel AWS SQS Metrics OpenTelemetry Assets

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants