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.

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

Allow data Streams enrich policies #200903

Conversation

SoniaSanzV
Copy link
Contributor

@SoniaSanzV SoniaSanzV commented Nov 20, 2024

Closes #187438

Summary

This PR introduces the data streams as source indices in the enrich policies. For that, it uses the groups functionality, so the indices are separated from the data streams.

datastreams_enrich_policy.mov

Strings

I've changed some of the existing strings but left other as they were. I'll be happy to also change those if folks feel that should be the case.

I've added a hint text and changed the label for the box in the creation step (marked in yellow)
Screenshot 2024-11-20 at 12 35 32

I haven't change the label for the indices group (green) and I've followed the same structure for the new group category (yellow)

Screenshot 2024-11-20 at 12 37 51 Screenshot 2024-11-20 at 12 38 16

I haven't change the 'Source indices' text in the Summary (green) because in the request tab the correspondan field in the request is indices (blue)

Screenshot 2024-11-20 at 12 38 53 Screenshot 2024-11-20 at 12 39 19

I also haven't change the 'Source indices' text in the table or in the detail flyout (green) since both indices and data streams are treated like indices.

Screenshot 2024-11-20 at 12 39 52 Screenshot 2024-11-20 at 12 40 25

Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

  • Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
  • Documentation was added for features that require explanation or tutorials
  • Unit or functional tests were updated or added to match the most common scenarios
  • If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the docker list
  • This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The release_note:breaking label should be applied in these situations.
  • Flaky Test Runner was used on any tests changed
  • The PR description includes the appropriate Release Notes section, and the correct release_node:* label is applied per the guidelines

@SoniaSanzV SoniaSanzV requested a review from a team as a code owner November 20, 2024 12:23
@SoniaSanzV SoniaSanzV self-assigned this Nov 20, 2024
@SoniaSanzV SoniaSanzV added Feature:Index Management Index and index templates UI release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more labels Nov 20, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-management (Team:Kibana Management)

@SoniaSanzV SoniaSanzV changed the title Index management/allow datastreams enrich policies #187438 Allow data Streams enrich policies Nov 20, 2024
Copy link
Contributor

@florent-leborgne florent-leborgne left a comment

Choose a reason for hiding this comment

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

Copy LGTM 🌆 Just some super small suggestions

noMatches: i18n.translate(
'xpack.idxMgmt.enrichPolicyCreate.indicesSelector.dataStream.noMatchingOption',
{
defaultMessage: 'No data stream match your search criteria.',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
defaultMessage: 'No data stream match your search criteria.',
defaultMessage: 'No data streams match your search criteria.',

Making it parallel with plural "indices"

sourcePlaceholder: i18n.translate(
'xpack.idxMgmt.enrichPolicyCreate.indicesSelector.placeholder',
{
defaultMessage: 'Select source indices and/or data streams.',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
defaultMessage: 'Select source indices and/or data streams.',
defaultMessage: 'Select source indices and data streams.',

or "or", but I'd prefer to not use "and/or"

@mattkime
Copy link
Contributor

mattkime commented Nov 21, 2024

A couple of thoughts -

Do we want to separate indices and data streams in the list for selection? I think it might make more sense to show them alphabetized together. The resolve api can get both indices and data streams. It also gets aliases. https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-resolve-index-api.html

The Based on your indices text strikes me as odd - its a list label inside the list. It also seems to imply that the field label could do a bit more work.

We should probably be hiding system and hidden indices in this list.

@jovana-andjelkovic is probably the best person to weigh in

@SoniaSanzV
Copy link
Contributor Author

A couple of thoughts -

Do we want to separate indices and data streams in the list for selection? I think it might make more sense to show them alphabetized together. The resolve api can get both indices and data streams. It also gets aliases. https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-resolve-index-api.html

The Based on your indices text strikes me as odd - its a list label inside the list. It also seems to imply that the field label could do a bit more work.

We should probably be hiding system and hidden indices in this list.

@jovana-andjelkovic is probably the best person to weigh in

Thank you for your comment @mattkime! The groups functionality was the proposal that @alisonelizabeth and @jovana-andjelkovic agreed here, but I lack the deeper knowledge to judge whether it makes sense to show them together or separately. I'll do some research to have an opinion.

@mattkime
Copy link
Contributor

@SoniaSanzV It looks like there's already been conversation on how the indices and data streams are ordered so I consider the issue resolved and your implementation to be correct.

We should still consider hiding system and hidden indices.

@SoniaSanzV SoniaSanzV force-pushed the index_management/allow_datastreams_enrich_policies_#187438 branch from 0f4325b to fdea243 Compare November 21, 2024 06:53
@sabarasaba
Copy link
Member

@elasticmachine merge upstream

Copy link
Member

@sabarasaba sabarasaba left a comment

Choose a reason for hiding this comment

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

Nice work @SoniaSanzV! Changes lgtm, tested locally and works great 🚀 Left one nit and I also think we should add an api integration test for the new server route, let me know what you think!

@@ -95,15 +95,15 @@ export const configurationFormSchema: FormSchema = {

sourceIndices: {
label: i18n.translate('xpack.idxMgmt.enrichPolicyCreate.configurationStep.sourceIndicesLabel', {
defaultMessage: 'Source indices',
Copy link
Member

Choose a reason for hiding this comment

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

nit: maybe we should rename the key of the i18n.translate to be sourceLabel instead of sourceIndicesLabel (same for the error)

@@ -105,6 +111,33 @@ export function registerCreateRoute({ router, lib: { handleEsError } }: RouteDep
}
}
);
router.post(
Copy link
Member

Choose a reason for hiding this comment

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

Can we add a unit test for this route here and an api integration test similar to this one ?

@SoniaSanzV SoniaSanzV force-pushed the index_management/allow_datastreams_enrich_policies_#187438 branch from 139df16 to f167983 Compare November 27, 2024 10:19
Copy link
Member

@sabarasaba sabarasaba left a comment

Choose a reason for hiding this comment

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

latest changes lgtm, nice work!

@SoniaSanzV SoniaSanzV enabled auto-merge (squash) November 27, 2024 14:25
@SoniaSanzV SoniaSanzV force-pushed the index_management/allow_datastreams_enrich_policies_#187438 branch from f167983 to 21d71a2 Compare November 27, 2024 15:14
@jovana-andjelkovic
Copy link

@SoniaSanzV I wonder if it's confusing to have "Source" as input field, and its values everywhere else referred to as "Source indices"?

Not sure if .alerts-observability.uptime.alerts-default example is a data stream or an index? Would the Request tab show data streams under indices: or would they be their own property?

@SoniaSanzV SoniaSanzV merged commit 8629b1d into elastic:main Nov 27, 2024
8 checks passed
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
indexManagement 698.2KB 699.2KB +996.0B

History

cc @SoniaSanzV

@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 27, 2024
Closes [elastic#187438](elastic#187438)

## Summary

This PR introduces the data streams as source indices in the enrich
policies. For that, it uses the groups functionality, so the indices are
separated from the data streams.

https://github.com/user-attachments/assets/1716d57b-b8c7-417a-b75c-33378f3269ca

### Strings
I've changed some of the existing strings but left other as they were.
I'll be happy to also change those if folks feel that should be the
case.

I've added a hint text and changed the label for the box in the creation
step (marked in yellow)
<img width="400" alt="Screenshot 2024-11-20 at 12 35 32"
src="https://github.com/user-attachments/assets/794a7063-3f75-4f3d-996c-12ca8b9ed9b6">

I haven't change the label for the indices group (green) and I've
followed the same structure for the new group category (yellow)
<table>
  <tr>
    <td style="padding-right: 10px;">
<img alt="Screenshot 2024-11-20 at 12 37 51"
src="https://github.com/user-attachments/assets/89a554a6-57e4-4208-bde4-d4868dec11bc">
    </td>
    <td>
<img alt="Screenshot 2024-11-20 at 12 38 16"
src="https://github.com/user-attachments/assets/d82c7ae3-79c9-432e-aa3c-8ca02502e18f">
    </td>
  </tr>
</table>

I haven't change the 'Source indices' text in the Summary (green)
because in the request tab the correspondan field in the request is
indices (blue)
<table>
  <tr>
    <td style="padding-right: 10px;">
<img alt="Screenshot 2024-11-20 at 12 38 53"
src="https://github.com/user-attachments/assets/80623ded-11e3-4661-9fa8-ad84182a72a3">
    </td>
    <td>
<img alt="Screenshot 2024-11-20 at 12 39 19"
src="https://github.com/user-attachments/assets/f2ad6449-1a3a-448a-8598-c8c9eb41a717">
    </td>
  </tr>
</table>

I also haven't change the 'Source indices' text in the table or in the
detail flyout (green) since both indices and data streams are treated
like indices.
<table>
  <tr>
    <td style="padding-right: 10px;">
<img width="898" alt="Screenshot 2024-11-20 at 12 39 52"
src="https://github.com/user-attachments/assets/8165fe3f-0286-4ad1-a40d-44e19e4eef29">
    </td>
    <td>
<img width="892" alt="Screenshot 2024-11-20 at 12 40 25"
src="https://github.com/user-attachments/assets/bb046aa4-2a6c-40e0-bb32-ecb4a13adea9">
    </td>
  </tr>
</table>

### Checklist

Check the PR satisfies following conditions.

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_node:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)

(cherry picked from commit 8629b1d)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.x

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 Nov 27, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [Allow data Streams enrich policies
(#200903)](#200903)

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

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

<!--BACKPORT [{"author":{"name":"Sonia Sanz
Vivas","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-27T18:50:35Z","message":"Allow
data Streams enrich policies (#200903)\n\nCloses
[#187438](https://github.com/elastic/kibana/issues/187438)\r\n\r\n##
Summary\r\n\r\nThis PR introduces the data streams as source indices in
the enrich\r\npolicies. For that, it uses the groups functionality, so
the indices are\r\nseparated from the data
streams.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/1716d57b-b8c7-417a-b75c-33378f3269ca\r\n\r\n###
Strings\r\nI've changed some of the existing strings but left other as
they were.\r\nI'll be happy to also change those if folks feel that
should be the\r\ncase.\r\n\r\nI've added a hint text and changed the
label for the box in the creation\r\nstep (marked in yellow)\r\n<img
width=\"400\" alt=\"Screenshot 2024-11-20 at 12 35
32\"\r\nsrc=\"https://github.com/user-attachments/assets/794a7063-3f75-4f3d-996c-12ca8b9ed9b6\">\r\n\r\nI
haven't change the label for the indices group (green) and
I've\r\nfollowed the same structure for the new group category
(yellow)\r\n<table>\r\n <tr>\r\n <td style=\"padding-right:
10px;\">\r\n<img alt=\"Screenshot 2024-11-20 at 12 37
51\"\r\nsrc=\"https://github.com/user-attachments/assets/89a554a6-57e4-4208-bde4-d4868dec11bc\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 38
16\"\r\nsrc=\"https://github.com/user-attachments/assets/d82c7ae3-79c9-432e-aa3c-8ca02502e18f\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI haven't change the 'Source indices'
text in the Summary (green)\r\nbecause in the request tab the
correspondan field in the request is\r\nindices (blue)\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img alt=\"Screenshot
2024-11-20 at 12 38
53\"\r\nsrc=\"https://github.com/user-attachments/assets/80623ded-11e3-4661-9fa8-ad84182a72a3\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 39
19\"\r\nsrc=\"https://github.com/user-attachments/assets/f2ad6449-1a3a-448a-8598-c8c9eb41a717\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI also haven't change the 'Source
indices' text in the table or in the\r\ndetail flyout (green) since both
indices and data streams are treated\r\nlike indices.\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img width=\"898\"
alt=\"Screenshot 2024-11-20 at 12 39
52\"\r\nsrc=\"https://github.com/user-attachments/assets/8165fe3f-0286-4ad1-a40d-44e19e4eef29\">\r\n
</td>\r\n <td>\r\n<img width=\"892\" alt=\"Screenshot 2024-11-20 at 12
40
25\"\r\nsrc=\"https://github.com/user-attachments/assets/bb046aa4-2a6c-40e0-bb32-ecb4a13adea9\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\n### Checklist\r\n\r\nCheck the PR
satisfies following conditions. \r\n\r\nReviewers should verify this PR
satisfies this list as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8629b1da8e392880632b197b4d5b031353a39f28","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Feature:Index
Management","Team:Kibana
Management","release_note:skip","v9.0.0","backport:prev-minor"],"title":"Allow
data Streams enrich
policies","number":200903,"url":"https://github.com/elastic/kibana/pull/200903","mergeCommit":{"message":"Allow
data Streams enrich policies (#200903)\n\nCloses
[#187438](https://github.com/elastic/kibana/issues/187438)\r\n\r\n##
Summary\r\n\r\nThis PR introduces the data streams as source indices in
the enrich\r\npolicies. For that, it uses the groups functionality, so
the indices are\r\nseparated from the data
streams.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/1716d57b-b8c7-417a-b75c-33378f3269ca\r\n\r\n###
Strings\r\nI've changed some of the existing strings but left other as
they were.\r\nI'll be happy to also change those if folks feel that
should be the\r\ncase.\r\n\r\nI've added a hint text and changed the
label for the box in the creation\r\nstep (marked in yellow)\r\n<img
width=\"400\" alt=\"Screenshot 2024-11-20 at 12 35
32\"\r\nsrc=\"https://github.com/user-attachments/assets/794a7063-3f75-4f3d-996c-12ca8b9ed9b6\">\r\n\r\nI
haven't change the label for the indices group (green) and
I've\r\nfollowed the same structure for the new group category
(yellow)\r\n<table>\r\n <tr>\r\n <td style=\"padding-right:
10px;\">\r\n<img alt=\"Screenshot 2024-11-20 at 12 37
51\"\r\nsrc=\"https://github.com/user-attachments/assets/89a554a6-57e4-4208-bde4-d4868dec11bc\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 38
16\"\r\nsrc=\"https://github.com/user-attachments/assets/d82c7ae3-79c9-432e-aa3c-8ca02502e18f\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI haven't change the 'Source indices'
text in the Summary (green)\r\nbecause in the request tab the
correspondan field in the request is\r\nindices (blue)\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img alt=\"Screenshot
2024-11-20 at 12 38
53\"\r\nsrc=\"https://github.com/user-attachments/assets/80623ded-11e3-4661-9fa8-ad84182a72a3\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 39
19\"\r\nsrc=\"https://github.com/user-attachments/assets/f2ad6449-1a3a-448a-8598-c8c9eb41a717\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI also haven't change the 'Source
indices' text in the table or in the\r\ndetail flyout (green) since both
indices and data streams are treated\r\nlike indices.\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img width=\"898\"
alt=\"Screenshot 2024-11-20 at 12 39
52\"\r\nsrc=\"https://github.com/user-attachments/assets/8165fe3f-0286-4ad1-a40d-44e19e4eef29\">\r\n
</td>\r\n <td>\r\n<img width=\"892\" alt=\"Screenshot 2024-11-20 at 12
40
25\"\r\nsrc=\"https://github.com/user-attachments/assets/bb046aa4-2a6c-40e0-bb32-ecb4a13adea9\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\n### Checklist\r\n\r\nCheck the PR
satisfies following conditions. \r\n\r\nReviewers should verify this PR
satisfies this list as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8629b1da8e392880632b197b4d5b031353a39f28"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/200903","number":200903,"mergeCommit":{"message":"Allow
data Streams enrich policies (#200903)\n\nCloses
[#187438](https://github.com/elastic/kibana/issues/187438)\r\n\r\n##
Summary\r\n\r\nThis PR introduces the data streams as source indices in
the enrich\r\npolicies. For that, it uses the groups functionality, so
the indices are\r\nseparated from the data
streams.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/1716d57b-b8c7-417a-b75c-33378f3269ca\r\n\r\n###
Strings\r\nI've changed some of the existing strings but left other as
they were.\r\nI'll be happy to also change those if folks feel that
should be the\r\ncase.\r\n\r\nI've added a hint text and changed the
label for the box in the creation\r\nstep (marked in yellow)\r\n<img
width=\"400\" alt=\"Screenshot 2024-11-20 at 12 35
32\"\r\nsrc=\"https://github.com/user-attachments/assets/794a7063-3f75-4f3d-996c-12ca8b9ed9b6\">\r\n\r\nI
haven't change the label for the indices group (green) and
I've\r\nfollowed the same structure for the new group category
(yellow)\r\n<table>\r\n <tr>\r\n <td style=\"padding-right:
10px;\">\r\n<img alt=\"Screenshot 2024-11-20 at 12 37
51\"\r\nsrc=\"https://github.com/user-attachments/assets/89a554a6-57e4-4208-bde4-d4868dec11bc\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 38
16\"\r\nsrc=\"https://github.com/user-attachments/assets/d82c7ae3-79c9-432e-aa3c-8ca02502e18f\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI haven't change the 'Source indices'
text in the Summary (green)\r\nbecause in the request tab the
correspondan field in the request is\r\nindices (blue)\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img alt=\"Screenshot
2024-11-20 at 12 38
53\"\r\nsrc=\"https://github.com/user-attachments/assets/80623ded-11e3-4661-9fa8-ad84182a72a3\">\r\n
</td>\r\n <td>\r\n<img alt=\"Screenshot 2024-11-20 at 12 39
19\"\r\nsrc=\"https://github.com/user-attachments/assets/f2ad6449-1a3a-448a-8598-c8c9eb41a717\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\nI also haven't change the 'Source
indices' text in the table or in the\r\ndetail flyout (green) since both
indices and data streams are treated\r\nlike indices.\r\n<table>\r\n
<tr>\r\n <td style=\"padding-right: 10px;\">\r\n<img width=\"898\"
alt=\"Screenshot 2024-11-20 at 12 39
52\"\r\nsrc=\"https://github.com/user-attachments/assets/8165fe3f-0286-4ad1-a40d-44e19e4eef29\">\r\n
</td>\r\n <td>\r\n<img width=\"892\" alt=\"Screenshot 2024-11-20 at 12
40
25\"\r\nsrc=\"https://github.com/user-attachments/assets/bb046aa4-2a6c-40e0-bb32-ecb4a13adea9\">\r\n
</td>\r\n </tr>\r\n</table>\r\n\r\n### Checklist\r\n\r\nCheck the PR
satisfies following conditions. \r\n\r\nReviewers should verify this PR
satisfies this list as well.\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [ ] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] If a plugin
configuration key changed, check if it needs to be\r\nallowlisted in the
cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This was checked for breaking HTTP API changes, and any
breaking\r\nchanges have been approved by the breaking-change committee.
The\r\n`release_note:breaking` label should be applied in these
situations.\r\n- [ ] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [ ] The PR description includes
the appropriate Release Notes section,\r\nand the correct
`release_node:*` label is applied per
the\r\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8629b1da8e392880632b197b4d5b031353a39f28"}}]}]
BACKPORT-->

Co-authored-by: Sonia Sanz Vivas <[email protected]>
@SoniaSanzV
Copy link
Contributor Author

Sorry @jovana-andjelkovic , I had this PR set to auto-merge and I miss your comment before it was merged. I've taken a few screenshots with much more specific names that I can answer what you are asking. I don't think having "Source" in the first step is bad, since is the only place we separate the concept of index and datastream. From that point, everything is treated as an index. But we can come back to te previous copy if you think is better. Or even do what Matt suggested here.

ing ing
ing ing
ing

@jovana-andjelkovic
Copy link

@SoniaSanzV thank you for these screenshots, super helpful! Yeah I agree with @mattkime that "based on your.." feels odd, I would rather go with just:

  • Indices
  • Data streams

I'm a bit confused why we show in response both indices and data streams under indices:, but I would assume data streams are considered in this case a "catch all" (.*) for backing indices that belong to it and hence it belongs in there 🤔

I wouldn't change back the name of the source field, it feels more correct to me. Anyways, I don't think it's a huge deal if we leave it as is, but if we decide to open separate issue to look at the copy, let's consult a tech writer.

CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Dec 12, 2024
Closes [elastic#187438](elastic#187438)

## Summary

This PR introduces the data streams as source indices in the enrich
policies. For that, it uses the groups functionality, so the indices are
separated from the data streams.


https://github.com/user-attachments/assets/1716d57b-b8c7-417a-b75c-33378f3269ca

### Strings
I've changed some of the existing strings but left other as they were.
I'll be happy to also change those if folks feel that should be the
case.

I've added a hint text and changed the label for the box in the creation
step (marked in yellow)
<img width="400" alt="Screenshot 2024-11-20 at 12 35 32"
src="https://github.com/user-attachments/assets/794a7063-3f75-4f3d-996c-12ca8b9ed9b6">

I haven't change the label for the indices group (green) and I've
followed the same structure for the new group category (yellow)
<table>
  <tr>
    <td style="padding-right: 10px;">
<img alt="Screenshot 2024-11-20 at 12 37 51"
src="https://github.com/user-attachments/assets/89a554a6-57e4-4208-bde4-d4868dec11bc">
    </td>
    <td>
<img alt="Screenshot 2024-11-20 at 12 38 16"
src="https://github.com/user-attachments/assets/d82c7ae3-79c9-432e-aa3c-8ca02502e18f">
    </td>
  </tr>
</table>

I haven't change the 'Source indices' text in the Summary (green)
because in the request tab the correspondan field in the request is
indices (blue)
<table>
  <tr>
    <td style="padding-right: 10px;">
<img alt="Screenshot 2024-11-20 at 12 38 53"
src="https://github.com/user-attachments/assets/80623ded-11e3-4661-9fa8-ad84182a72a3">
    </td>
    <td>
<img alt="Screenshot 2024-11-20 at 12 39 19"
src="https://github.com/user-attachments/assets/f2ad6449-1a3a-448a-8598-c8c9eb41a717">
    </td>
  </tr>
</table>

I also haven't change the 'Source indices' text in the table or in the
detail flyout (green) since both indices and data streams are treated
like indices.
<table>
  <tr>
    <td style="padding-right: 10px;">
<img width="898" alt="Screenshot 2024-11-20 at 12 39 52"
src="https://github.com/user-attachments/assets/8165fe3f-0286-4ad1-a40d-44e19e4eef29">
    </td>
    <td>
<img width="892" alt="Screenshot 2024-11-20 at 12 40 25"
src="https://github.com/user-attachments/assets/bb046aa4-2a6c-40e0-bb32-ecb4a13adea9">
    </td>
  </tr>
</table>

### Checklist

Check the PR satisfies following conditions. 

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_node:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) Feature:Index Management Index and index templates UI release_note:skip Skip the PR/issue when compiling release notes Team:Kibana Management Dev Tools, Index Management, Upgrade Assistant, ILM, Ingest Node Pipelines, and more v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Index Management] Creating enrich policies should allow selecting data streams
7 participants