Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[APM] Update Indices API to support sourcemap param #177847

Merged
merged 4 commits into from
Mar 4, 2024
Merged

[APM] Update Indices API to support sourcemap param #177847

merged 4 commits into from
Mar 4, 2024

Conversation

cauemarcondes
Copy link
Contributor

@cauemarcondes cauemarcondes commented Feb 28, 2024 •
edited by kibanamachine
Loading

closes #177820

Saved Object before:

 "attributes": {
    "apmIndices": {
      "onboarding": "caue",
      "sourcemap": "foo-*"
    },
    "isSpaceAware": true
  },
Screenshot 2024-02-28 at 17 47 12

Saved Object after:

"attributes": {
    "apmIndices": {
      "onboarding": "caue"
    },
    "isSpaceAware": true
  },

The API now accepts the sourcemap param.

@cauemarcondes cauemarcondes requested a review from a team as a code owner February 28, 2024 17:31
@botelastic botelastic bot added the Team:obs-ux-infra_services Observability Infrastructure & Services User Experience Team label Feb 28, 2024
@elasticmachine
Copy link
Contributor

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

@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

cauemarcondes
cauemarcondes commented Feb 28, 2024
View reviewed changes
x-pack/plugins/observability_solution/apm/scripts/test/api.js
@@ -102,11 +102,11 @@ if (server) {
const cmd = [
'node',
...(inspect ? ['--inspect-brk'] : []),
`../../../../../scripts/${ftrScript}`,
`../../../../../../scripts/${ftrScript}`,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@CoenWarmer just a FYI. I fixed the static path on APM, but I think we must look at other solutions. Some scripts my be broken due to the folder migration.

Copy link
Contributor

Choose a reason for hiding this comment

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

@cauemarcondes & @CoenWarmer - I've found a spot that was probably missed during a folder migration.

kibana/.buildkite/scripts/steps/functional/apm_cypress.sh

Line 33 in 1022ccd

node plugins/apm/scripts/test/e2e.js \

Sorry, that I commented it here, but I had a hard time finding the migration PR, this seems it's at least related to the owners :)

I'm assuming, if you would ask for full cypress testing on the PRs that includes APM, it would break like this: https://buildkite.com/elastic/kibana-kme-test/builds/319#018e0ee0-16ee-4224-902c-732706c3f857

sorenlouv
sorenlouv approved these changes Mar 2, 2024
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

Thanks for fixing

@cauemarcondes cauemarcondes enabled auto-merge (squash) March 4, 2024 12:12
MiriamAparicio
MiriamAparicio reviewed Mar 4, 2024
View reviewed changes
Copy link
Contributor

@MiriamAparicio MiriamAparicio left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this
LGTM 🌟

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@cauemarcondes cauemarcondes merged commit 505b928 into elastic:main Mar 4, 2024
16 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Mar 4, 2024
@cauemarcondes
[APM] Update Indices API to support sourcemap param (elastic#177847)
4672a79 
closes elastic#177820

Saved Object before:

```
 "attributes": {
    "apmIndices": {
      "onboarding": "caue",
      "sourcemap": "foo-*"
    },
    "isSpaceAware": true
  },
```
<img width="1826" alt="Screenshot 2024-02-28 at 17 47 12"
src="https://github.com/elastic/kibana/assets/55978943/e44d90ec-982c-4330-88dc-14f0f59bfce7">

Saved Object after:
```
"attributes": {
    "apmIndices": {
      "onboarding": "caue"
    },
    "isSpaceAware": true
  },
```

The API now accepts the `sourcemap` param.

(cherry picked from commit 505b928)
@kibanamachine kibanamachine mentioned this pull request Mar 4, 2024
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.13

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Mar 4, 2024
@kibanamachine @cauemarcondes
[8.13] [APM] Update Indices API to support sourcemap param (#177847) (#…
afa98a3 
…177933)

# Backport

This will backport the following commits from `main` to `8.13`:
- [[APM] Update Indices API to support sourcemap param
(#177847)](#177847)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT [{"author":{"name":"Cauê
Marcondes","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-03-04T13:26:30Z","message":"[APM]
Update Indices API to support sourcemap param (#177847)\n\ncloses
https://github.com/elastic/kibana/issues/177820\r\n\r\nSaved Object
before: \r\n\r\n```\r\n \"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\",\r\n \"sourcemap\": \"foo-*\"\r\n },\r\n
\"isSpaceAware\": true\r\n },\r\n```\r\n<img width=\"1826\"
alt=\"Screenshot 2024-02-28 at 17 47
12\"\r\nsrc=\"https://github.com/elastic/kibana/assets/55978943/e44d90ec-982c-4330-88dc-14f0f59bfce7\">\r\n\r\nSaved
Object after:\r\n```\r\n\"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\"\r\n },\r\n \"isSpaceAware\": true\r\n
},\r\n```\r\n\r\nThe API now accepts the `sourcemap`
param.","sha":"505b928dc1e30a70a2e4fe9d966e03174b2fbc2c","branchLabelMapping":{"^v8.14.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:obs-ux-infra_services","v8.13.0","v8.14.0"],"title":"[APM]
Update Indices API to support sourcemap
param","number":177847,"url":"https://github.com/elastic/kibana/pull/177847","mergeCommit":{"message":"[APM]
Update Indices API to support sourcemap param (#177847)\n\ncloses
https://github.com/elastic/kibana/issues/177820\r\n\r\nSaved Object
before: \r\n\r\n```\r\n \"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\",\r\n \"sourcemap\": \"foo-*\"\r\n },\r\n
\"isSpaceAware\": true\r\n },\r\n```\r\n<img width=\"1826\"
alt=\"Screenshot 2024-02-28 at 17 47
12\"\r\nsrc=\"https://github.com/elastic/kibana/assets/55978943/e44d90ec-982c-4330-88dc-14f0f59bfce7\">\r\n\r\nSaved
Object after:\r\n```\r\n\"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\"\r\n },\r\n \"isSpaceAware\": true\r\n
},\r\n```\r\n\r\nThe API now accepts the `sourcemap`
param.","sha":"505b928dc1e30a70a2e4fe9d966e03174b2fbc2c"}},"sourceBranch":"main","suggestedTargetBranches":["8.13"],"targetPullRequestStates":[{"branch":"8.13","label":"v8.13.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.14.0","branchLabelMappingKey":"^v8.14.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/177847","number":177847,"mergeCommit":{"message":"[APM]
Update Indices API to support sourcemap param (#177847)\n\ncloses
https://github.com/elastic/kibana/issues/177820\r\n\r\nSaved Object
before: \r\n\r\n```\r\n \"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\",\r\n \"sourcemap\": \"foo-*\"\r\n },\r\n
\"isSpaceAware\": true\r\n },\r\n```\r\n<img width=\"1826\"
alt=\"Screenshot 2024-02-28 at 17 47
12\"\r\nsrc=\"https://github.com/elastic/kibana/assets/55978943/e44d90ec-982c-4330-88dc-14f0f59bfce7\">\r\n\r\nSaved
Object after:\r\n```\r\n\"attributes\": {\r\n \"apmIndices\": {\r\n
\"onboarding\": \"caue\"\r\n },\r\n \"isSpaceAware\": true\r\n
},\r\n```\r\n\r\nThe API now accepts the `sourcemap`
param.","sha":"505b928dc1e30a70a2e4fe9d966e03174b2fbc2c"}}]}]
BACKPORT-->

---------

Co-authored-by: Cauê Marcondes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delanni delanni delanni left review comments

@MiriamAparicio MiriamAparicio MiriamAparicio approved these changes

@sorenlouv sorenlouv sorenlouv approved these changes

Assignees
No one assigned
Labels
release_note:fix Team:obs-ux-infra_services Observability Infrastructure & Services User Experience Team v8.13.0 v8.14.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[APM] Allow 'sourcemap' property on APM indices API
8 participants
@cauemarcondes @elasticmachine @apmmachine @kibana-ci @kibanamachine @sorenlouv @delanni @MiriamAparicio