# Backport
This will backport the following commits from `main` to `9.0`:
- [[APM] Fix query for transaction marks
(#215819)](https://github.com/elastic/kibana/pull/215819)
<!--- Backport version: 9.6.6 -->
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)
<!--BACKPORT [{"author":{"name":"Sunghyun
Kim","email":"cqbqdd11519@gmail.com"},"sourceCommit":{"committedDate":"2025-04-01T15:05:42Z","message":"[APM]
Fix query for transaction marks (#215819)\n\n## Summary\n\nThere is a
bug in kibana 8.17, where no transaction marks are shown in\nthe APM's
transaction waterfall ui.\nThe marks are stored in the field
`transaction.marks.agent` of\ndocuments, but kibana apm server is
querying `transaction.agent.marks`.\n\nThis PR fixes the field
name.\n\n\nI also added `span.id` in the query source to include the
marks in the\nresponse, even if there is no `span.links` in the
transaction info.\n(I found the case from RUM data with
`transaction.marks.agent` but\nwithout `span.links`, so that the
response does not include marks\nbecause there is no `source` field in
the query result)\n\nI am not sure if it's the right way to fix it, as i
have no\nunderstanding about the relationsip between
`transaction.marks.agent`\nand `span.links`, so this PR is more like a
bug report.\n\n\n\n### Checklist\n\nCheck the PR satisfies following
conditions. \n\nReviewers should verify this PR satisfies this list as
well.\n\n- [ ] Any text added follows [EUI's
writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\nsentence case text and includes
[i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n-
[
]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [ ] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [ ] If a plugin
configuration key changed, check if it needs to be\nallowlisted in the
cloud and added to the
[docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\nchanges have been approved by the breaking-change committee.
The\n`release_note:breaking` label should be applied in these
situations.\n- [ ] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests changed\n- [ ] The PR description includes the
appropriate Release Notes section,\nand the correct `release_note:*`
label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n###
Identify risks\n\nDoes this PR introduce any risks? For example,
consider risks like hard\nto test bugs, performance regression,
potential of data loss.\n\nDescribe the risk, its severity, and
mitigation for each identified\nrisk. Invite stakeholders and evaluate
how to proceed before merging.\n\n- [ ] [See some
risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n-
[ ]
...\nNone","sha":"d4d1c2b6ddf98859e5d36654eab0ca71cefc8808","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","💝community","backport:all-open","ci:project-deploy-observability","Team:obs-ux-infra_services","v9.1.0"],"title":"[APM]
Fix query for transaction
marks","number":215819,"url":"https://github.com/elastic/kibana/pull/215819","mergeCommit":{"message":"[APM]
Fix query for transaction marks (#215819)\n\n## Summary\n\nThere is a
bug in kibana 8.17, where no transaction marks are shown in\nthe APM's
transaction waterfall ui.\nThe marks are stored in the field
`transaction.marks.agent` of\ndocuments, but kibana apm server is
querying `transaction.agent.marks`.\n\nThis PR fixes the field
name.\n\n\nI also added `span.id` in the query source to include the
marks in the\nresponse, even if there is no `span.links` in the
transaction info.\n(I found the case from RUM data with
`transaction.marks.agent` but\nwithout `span.links`, so that the
response does not include marks\nbecause there is no `source` field in
the query result)\n\nI am not sure if it's the right way to fix it, as i
have no\nunderstanding about the relationsip between
`transaction.marks.agent`\nand `span.links`, so this PR is more like a
bug report.\n\n\n\n### Checklist\n\nCheck the PR satisfies following
conditions. \n\nReviewers should verify this PR satisfies this list as
well.\n\n- [ ] Any text added follows [EUI's
writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\nsentence case text and includes
[i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n-
[
]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [ ] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [ ] If a plugin
configuration key changed, check if it needs to be\nallowlisted in the
cloud and added to the
[docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\nchanges have been approved by the breaking-change committee.
The\n`release_note:breaking` label should be applied in these
situations.\n- [ ] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests changed\n- [ ] The PR description includes the
appropriate Release Notes section,\nand the correct `release_note:*`
label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n###
Identify risks\n\nDoes this PR introduce any risks? For example,
consider risks like hard\nto test bugs, performance regression,
potential of data loss.\n\nDescribe the risk, its severity, and
mitigation for each identified\nrisk. Invite stakeholders and evaluate
how to proceed before merging.\n\n- [ ] [See some
risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n-
[ ]
...\nNone","sha":"d4d1c2b6ddf98859e5d36654eab0ca71cefc8808"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/215819","number":215819,"mergeCommit":{"message":"[APM]
Fix query for transaction marks (#215819)\n\n## Summary\n\nThere is a
bug in kibana 8.17, where no transaction marks are shown in\nthe APM's
transaction waterfall ui.\nThe marks are stored in the field
`transaction.marks.agent` of\ndocuments, but kibana apm server is
querying `transaction.agent.marks`.\n\nThis PR fixes the field
name.\n\n\nI also added `span.id` in the query source to include the
marks in the\nresponse, even if there is no `span.links` in the
transaction info.\n(I found the case from RUM data with
`transaction.marks.agent` but\nwithout `span.links`, so that the
response does not include marks\nbecause there is no `source` field in
the query result)\n\nI am not sure if it's the right way to fix it, as i
have no\nunderstanding about the relationsip between
`transaction.marks.agent`\nand `span.links`, so this PR is more like a
bug report.\n\n\n\n### Checklist\n\nCheck the PR satisfies following
conditions. \n\nReviewers should verify this PR satisfies this list as
well.\n\n- [ ] Any text added follows [EUI's
writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\nsentence case text and includes
[i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n-
[
]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [ ] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [ ] If a plugin
configuration key changed, check if it needs to be\nallowlisted in the
cloud and added to the
[docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\nchanges have been approved by the breaking-change committee.
The\n`release_note:breaking` label should be applied in these
situations.\n- [ ] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests changed\n- [ ] The PR description includes the
appropriate Release Notes section,\nand the correct `release_note:*`
label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n###
Identify risks\n\nDoes this PR introduce any risks? For example,
consider risks like hard\nto test bugs, performance regression,
potential of data loss.\n\nDescribe the risk, its severity, and
mitigation for each identified\nrisk. Invite stakeholders and evaluate
how to proceed before merging.\n\n- [ ] [See some
risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n-
[ ] ...\nNone","sha":"d4d1c2b6ddf98859e5d36654eab0ca71cefc8808"}}]}]
BACKPORT-->
Co-authored-by: Sunghyun Kim <cqbqdd11519@gmail.com>
# Backport
This will backport the following commits from `main` to `9.0`:
- [[Streams 🌊] Introduce GroupStreams
(#208126)](https://github.com/elastic/kibana/pull/208126)
<!--- Backport version: 9.6.4 -->
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)
<!--BACKPORT [{"author":{"name":"Chris
Cowan","email":"chris@elastic.co"},"sourceCommit":{"committedDate":"2025-02-04T10:12:35Z","message":"[Streams
🌊] Introduce GroupStreams (#208126)\n\n## 🍒 Summary\r\n \r\nThis PR adds
support to `/api/streams` endpoints for the\r\n`GroupStreamDefinition`
type. Group streams are simply a list of member\r\nstreams along with
dashboards. An example of the definition looks
like:\r\n\r\n```JSON\r\n{\r\n \"name\": \"nginx-logs\",\r\n \"stream\":
{\r\n \"grouped\": {\r\n \"description\": \"A collection of streams for
Nginx\",\r\n \"members\": [\r\n \"logs\",\r\n \"logs.nginx\"\r\n ]\r\n
}\r\n },\r\n \"dashboards\": []\r\n}\r\n```\r\nThe following APIs
support `GroupStreamDefinition`:\r\n\r\n- `GET /api/streams`\r\n- `GET
/api/streams/{id}`\r\n- `PUT /api/streams/{id}`\r\n- `DELETE
/api/streams/{id}`\r\n- `GET /api/streams/{id}/_details`\r\n\r\nThis PR
only includes the support to the APIs, I will submit a follow PR\r\nfor
the UI.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by: Joe
Reuter
<johannes.reuter@elastic.co>","sha":"2092c3d4ca2ae917420f992686fc7a704b393ea4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["v9.0.0","release_note:feature","backport:version","Feature:Streams","v9.1.0","v8.19.0"],"title":"[Streams
🌊] Introduce
GroupStreams","number":208126,"url":"https://github.com/elastic/kibana/pull/208126","mergeCommit":{"message":"[Streams
🌊] Introduce GroupStreams (#208126)\n\n## 🍒 Summary\r\n \r\nThis PR adds
support to `/api/streams` endpoints for the\r\n`GroupStreamDefinition`
type. Group streams are simply a list of member\r\nstreams along with
dashboards. An example of the definition looks
like:\r\n\r\n```JSON\r\n{\r\n \"name\": \"nginx-logs\",\r\n \"stream\":
{\r\n \"grouped\": {\r\n \"description\": \"A collection of streams for
Nginx\",\r\n \"members\": [\r\n \"logs\",\r\n \"logs.nginx\"\r\n ]\r\n
}\r\n },\r\n \"dashboards\": []\r\n}\r\n```\r\nThe following APIs
support `GroupStreamDefinition`:\r\n\r\n- `GET /api/streams`\r\n- `GET
/api/streams/{id}`\r\n- `PUT /api/streams/{id}`\r\n- `DELETE
/api/streams/{id}`\r\n- `GET /api/streams/{id}/_details`\r\n\r\nThis PR
only includes the support to the APIs, I will submit a follow PR\r\nfor
the UI.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by: Joe
Reuter
<johannes.reuter@elastic.co>","sha":"2092c3d4ca2ae917420f992686fc7a704b393ea4"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.x"],"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/208126","number":208126,"mergeCommit":{"message":"[Streams
🌊] Introduce GroupStreams (#208126)\n\n## 🍒 Summary\r\n \r\nThis PR adds
support to `/api/streams` endpoints for the\r\n`GroupStreamDefinition`
type. Group streams are simply a list of member\r\nstreams along with
dashboards. An example of the definition looks
like:\r\n\r\n```JSON\r\n{\r\n \"name\": \"nginx-logs\",\r\n \"stream\":
{\r\n \"grouped\": {\r\n \"description\": \"A collection of streams for
Nginx\",\r\n \"members\": [\r\n \"logs\",\r\n \"logs.nginx\"\r\n ]\r\n
}\r\n },\r\n \"dashboards\": []\r\n}\r\n```\r\nThe following APIs
support `GroupStreamDefinition`:\r\n\r\n- `GET /api/streams`\r\n- `GET
/api/streams/{id}`\r\n- `PUT /api/streams/{id}`\r\n- `DELETE
/api/streams/{id}`\r\n- `GET /api/streams/{id}/_details`\r\n\r\nThis PR
only includes the support to the APIs, I will submit a follow PR\r\nfor
the UI.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by: Joe
Reuter
<johannes.reuter@elastic.co>","sha":"2092c3d4ca2ae917420f992686fc7a704b393ea4"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
## Summary
- [x] Updates the AVC banner title and blog link
- [x] Banner will remain visible until EOY 2025
- [x] Confirm that the original AVC banner code (not the part that hides
it EOY of 2024) is present in 8.16, 8.17 and 8.x branches
# Screenshots
---------
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
