Skip to content

[APM] Fix Alerts environment query follow up#219571

Merged
jennypavlova merged 3 commits intoelastic:mainfrom
jennypavlova:fix-env-query
Apr 29, 2025
Merged

[APM] Fix Alerts environment query follow up#219571
jennypavlova merged 3 commits intoelastic:mainfrom
jennypavlova:fix-env-query

Conversation

@jennypavlova
Copy link
Member

@jennypavlova jennypavlova commented Apr 29, 2025

Summary

Follow up: #219228

To ensure the filtering is correct, I am adding this change as the previous alerts change might break other functionality where the not defined is missing

@jennypavlova jennypavlova self-assigned this Apr 29, 2025
@jennypavlova jennypavlova marked this pull request as ready for review April 29, 2025 15:03
@jennypavlova jennypavlova requested a review from a team April 29, 2025 15:03
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services)

Copy link
Contributor

@cauemarcondes cauemarcondes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@miloszmarcinkowski miloszmarcinkowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (code review only)

@jennypavlova jennypavlova enabled auto-merge (squash) April 29, 2025 15:16
@jennypavlova jennypavlova merged commit 0a60ccc into elastic:main Apr 29, 2025
10 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.0

https://github.com/elastic/kibana/actions/runs/14737460043

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.19 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.19:
- [APM][OTel] Change the alerts query to include environment not defined value (#219228)
9.0 Backport failed because of merge conflicts

You might need to backport the following PRs to 9.0:
- [APM][OTel] Change the alerts query to include environment not defined value (#219228)

Manual backport

To create the backport manually run:

node scripts/backport --pr 219571

Questions ?

Please refer to the Backport tool documentation

akowalska622 pushed a commit to akowalska622/kibana that referenced this pull request Apr 30, 2025
## Summary

Follow up: elastic#219228

To ensure the filtering is correct, I am adding this change as the
previous alerts change might break other functionality where the not
defined is missing
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 1, 2025
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 219571 locally
cc: @jennypavlova

crespocarlos pushed a commit to crespocarlos/kibana that referenced this pull request May 2, 2025
## Summary

Follow up: elastic#219228

To ensure the filtering is correct, I am adding this change as the
previous alerts change might break other functionality where the not
defined is missing

(cherry picked from commit 0a60ccc)

# Conflicts:
#	x-pack/solutions/observability/plugins/apm/common/utils/environment_query.test.ts
#	x-pack/solutions/observability/plugins/apm/common/utils/environment_query.ts
crespocarlos pushed a commit to crespocarlos/kibana that referenced this pull request May 2, 2025
## Summary

Follow up: elastic#219228

To ensure the filtering is correct, I am adding this change as the
previous alerts change might break other functionality where the not
defined is missing

(cherry picked from commit 0a60ccc)

# Conflicts:
#	x-pack/solutions/observability/plugins/apm/common/utils/environment_query.test.ts
#	x-pack/solutions/observability/plugins/apm/common/utils/environment_query.ts
@crespocarlos
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
9.0
8.19

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.
cc: @jennypavlova

crespocarlos added a commit that referenced this pull request May 5, 2025
# Backport

This will backport the following commits from `main` to `9.0`:
- [[APM] Fix Alerts environment query follow up
(#219571)](#219571)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"jennypavlova","email":"dzheni.pavlova@elastic.co"},"sourceCommit":{"committedDate":"2025-04-29T17:24:08Z","message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","backport
missing","v9.0.0","Team:obs-ux-infra_services","backport:version","v9.1.0","v8.19.0","v9.0.1"],"title":"[APM]
Fix Alerts environment query follow
up","number":219571,"url":"https://github.com/elastic/kibana/pull/219571","mergeCommit":{"message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/219571","number":219571,"mergeCommit":{"message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: jennypavlova <dzheni.pavlova@elastic.co>
crespocarlos added a commit that referenced this pull request May 5, 2025
# Backport

This will backport the following commits from `main` to `8.19`:
- [[APM] Fix Alerts environment query follow up
(#219571)](#219571)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"jennypavlova","email":"dzheni.pavlova@elastic.co"},"sourceCommit":{"committedDate":"2025-04-29T17:24:08Z","message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","backport
missing","v9.0.0","Team:obs-ux-infra_services","backport:version","v9.1.0","v8.19.0","v9.0.1"],"title":"[APM]
Fix Alerts environment query follow
up","number":219571,"url":"https://github.com/elastic/kibana/pull/219571","mergeCommit":{"message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/219571","number":219571,"mergeCommit":{"message":"[APM]
Fix Alerts environment query follow up (#219571)\n\n## Summary\n\nFollow
up: https://github.com/elastic/kibana/pull/219228/\n\nTo ensure the
filtering is correct, I am adding this change as the\nprevious alerts
change might break other functionality where the not\ndefined is
missing","sha":"0a60ccce642f787b97901c45e3d4848bb2381ae8"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: jennypavlova <dzheni.pavlova@elastic.co>
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 5, 2025
@mistic
Copy link
Contributor

mistic commented May 6, 2025

This PR didn't make it into the latest 9.0.1 BC. Updating the labels.

akowalska622 pushed a commit to akowalska622/kibana that referenced this pull request May 29, 2025
## Summary

Follow up: elastic#219228

To ensure the filtering is correct, I am adding this change as the
previous alerts change might break other functionality where the not
defined is missing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:version Backport to applied version labels release_note:fix Team:obs-ux-infra_services - DEPRECATED DEPRECATED - Use Team:obs-presentation. v8.19.0 v9.0.2 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants