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

[Automatic Import] move base-fields into fields folder #193960

Merged
merged 2 commits into from
Sep 25, 2024
Merged

[Automatic Import] move base-fields into fields folder #193960

merged 2 commits into from
Sep 25, 2024

Conversation

haetamoudi
Copy link
Contributor

@haetamoudi haetamoudi commented Sep 25, 2024 •
edited by kibanamachine
Loading

Summary

Currently when using Automatic import, base-fields.yml is created outside the fields folder.
When running elastic-package build on a generated integration, we get the following warnings:

Error: building package failed: invalid content found in built zip package: found 8 validation errors:
   1. item [base-fields.yml] is not allowed in folder [/Projects/abc-1.0.0/build/packages/abc-1.0.0.zip/data_stream/abc]
   5. expected field "data_stream.type" with type "constant_keyword" not found in datastream "abc"
   6. expected field "data_stream.dataset" with type "constant_keyword" not found in datastream "abc"
   7. expected field "data_stream.namespace" with type "constant_keyword" not found in datastream "abc"
   8. expected field "@timestamp" with type "date" not found in datastream "abc"

This is fixed by moving the file inside the correct fields folder.

@haetamoudi haetamoudi added bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development Team:Security-Scalability Team label for Security Integrations Scalability Team Feature:AutomaticImport labels Sep 25, 2024
@haetamoudi haetamoudi self-assigned this Sep 25, 2024
@haetamoudi haetamoudi requested a review from a team as a code owner September 25, 2024 10:01
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-scalability (Team:Security-Scalability)

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #7 / discover/context_awareness extension getRowIndicatorProvider should render log.level row indicators on Surrounding documents page

Metrics [docs]

✅ unchanged

History

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

cc @haetamoudi

@haetamoudi haetamoudi merged commit 0ee92df into elastic:main Sep 25, 2024
24 checks passed
@haetamoudi haetamoudi deleted the automatic-import-move-base-fields-into-fields-folder branch September 25, 2024 12:47
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.15 Backport failed because of merge conflicts
❌ 8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 193960

Questions ?

Please refer to the Backport tool documentation

@haetamoudi haetamoudi mentioned this pull request Sep 25, 2024
Merged
haetamoudi added a commit to haetamoudi/kibana that referenced this pull request Sep 25, 2024
@haetamoudi
[Automatic Import] move base-fields into fields folder (elastic#193960)
bba5505 
(cherry picked from commit 0ee92df)

# Conflicts:
#	x-pack/plugins/integration_assistant/server/integration_builder/fields.test.ts
@haetamoudi haetamoudi mentioned this pull request Sep 25, 2024
Merged
@haetamoudi
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
✅ 8.x
✅ 8.15

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

Questions ?

Please refer to the Backport tool documentation

haetamoudi added a commit to haetamoudi/kibana that referenced this pull request Sep 25, 2024
@haetamoudi
[Automatic Import] move base-fields into fields folder (elastic#193960)
9a5dabf 
(cherry picked from commit 0ee92df)

# Conflicts:
#	x-pack/plugins/integration_assistant/server/integration_builder/fields.test.ts
haetamoudi added a commit that referenced this pull request Sep 26, 2024
@haetamoudi
[8.15] [Automatic Import] move base-fields into fields folder (#193960)…
12cb67d 
… (#194025)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Automatic Import] move base-fields into fields folder
(#193960)](#193960)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Hanna
Tamoudi","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-25T12:47:16Z","message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","v9.0.0","backport:prev-major","Team:Security-Scalability","Feature:AutomaticImport"],"number":193960,"url":"https://github.com/elastic/kibana/pull/193960","mergeCommit":{"message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193960","number":193960,"mergeCommit":{"message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7"}}]}]
BACKPORT-->
haetamoudi added a commit that referenced this pull request Sep 26, 2024
@haetamoudi
[8.x] [Automatic Import] move base-fields into fields folder (#193960) (
b49a0cc 
#194024)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Automatic Import] move base-fields into fields folder
(#193960)](#193960)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Hanna
Tamoudi","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-25T12:47:16Z","message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","v9.0.0","backport:prev-major","Team:Security-Scalability","Feature:AutomaticImport"],"number":193960,"url":"https://github.com/elastic/kibana/pull/193960","mergeCommit":{"message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193960","number":193960,"mergeCommit":{"message":"[Automatic
Import] move base-fields into fields folder
(#193960)","sha":"0ee92df29b88b882557b9b74e1807642484cccd7"}}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhapas bhapas bhapas approved these changes

Assignees

@haetamoudi haetamoudi

Labels
backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development bug Fixes for quality problems that affect the customer experience Feature:AutomaticImport release_note:skip Skip the PR/issue when compiling release notes Team:Security-Scalability Team label for Security Integrations Scalability Team v8.15.2 v8.16.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@haetamoudi @elasticmachine @kibana-ci @kibanamachine @bhapas