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

[Fleet] Do not defined aliases inside datastream template #89512

Merged
merged 6 commits into from Jan 28, 2021
Merged

[Fleet] Do not defined aliases inside datastream template #89512

merged 6 commits into from Jan 28, 2021

Conversation

nchaulet
Copy link
Member

Summary

Potentially resolve #89499

Do not define aliases inside datastream template.

@nchaulet nchaulet added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.12.0 labels Jan 27, 2021
@nchaulet nchaulet self-assigned this Jan 27, 2021
@nchaulet nchaulet requested a review from a team January 27, 2021 23:21
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

jen-huang
jen-huang approved these changes Jan 27, 2021
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Pending CI 🤞🏻

@spalger
Copy link
Contributor

spalger commented Jan 27, 2021

Thank you!

@spalger
Copy link
Contributor

spalger commented Jan 27, 2021

Mind applying 77b55ff (#89508) so that we can make sure this works with the latest snapshots of ES?

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@spalger spalger merged commit 9b5e41a into elastic:master Jan 28, 2021
@spalger spalger mentioned this pull request Jan 28, 2021
Merged
spalger added a commit to spalger/kibana that referenced this pull request Jan 28, 2021
@nchaulet @spalger
[Fleet] Do not defined aliases inside datastream template (elastic#89512
d2cef2b 
)

Co-authored-by: spalger <spalger@users.noreply.github.com>
@spalger
Copy link
Contributor

spalger commented Jan 28, 2021

Thanks for jumping on this @nchaulet and @jen-huang!

spalger added a commit that referenced this pull request Jan 28, 2021
@nchaulet @spalger
[Fleet] Do not defined aliases inside datastream template (#89512) (#…
983e2e4 
…89522)

Co-authored-by: spalger <spalger@users.noreply.github.com>

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Co-authored-by: spalger <spalger@users.noreply.github.com>
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jan 28, 2021
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into ilm/basic-a11…
e814056 
…y-tests

* 'master' of github.com:elastic/kibana: (31 commits)
  [Discover] Add grid flyout jest test (elastic#89088)
  [Search Sessions] Improve session restoration back button (elastic#87635)
  [TSVB] Remove vis_type_timeseries_enhanced plugin (elastic#89274)
  [Security Solution] Init Osquery plugin (elastic#87109)
  [Fleet] Do not defined aliases inside datastream template (elastic#89512)
  skip flaky suite (elastic#86950)
  chore(NA): bazel machinery installation on kbn bootstrap (elastic#89469)
  [build/docker] Add support for centos ARM builds (elastic#84831)
  Convert default_watch.json to a JS object in order to avoid TS complaints (elastic#89488)
  [CI] Decrease number of Jest workers (elastic#89504)
  [Maps] remove maps_oss TS project (elastic#89502)
  Adds migration settings to Docker (elastic#89501)
  [Lens] Fix crash in transition from unique count to last value (elastic#88916)
  [kbn-es] Always use bundled JDK when starting Elasticsearch (elastic#89437)
  unskip getting_started/shakespeare test elasticsearch 64016 (elastic#89346)
  [Maps] migrate maps, maps_file_upload, and maps_legacy_licensing to TS projects (elastic#89439)
  skip flaky suite (elastic#89478)
  skip flaky suite (elastic#89476)
  skip flaky suite (elastic#89477)
  skip flaky suite (elastic#89475)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jan 28, 2021
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into ilm/rollover-…
494a041 
…updates-and-timeline-cleanup

* 'master' of github.com:elastic/kibana: (44 commits)
  [Discover] Add grid flyout jest test (elastic#89088)
  [Search Sessions] Improve session restoration back button (elastic#87635)
  [TSVB] Remove vis_type_timeseries_enhanced plugin (elastic#89274)
  [Security Solution] Init Osquery plugin (elastic#87109)
  [Fleet] Do not defined aliases inside datastream template (elastic#89512)
  skip flaky suite (elastic#86950)
  chore(NA): bazel machinery installation on kbn bootstrap (elastic#89469)
  [build/docker] Add support for centos ARM builds (elastic#84831)
  Convert default_watch.json to a JS object in order to avoid TS complaints (elastic#89488)
  [CI] Decrease number of Jest workers (elastic#89504)
  [Maps] remove maps_oss TS project (elastic#89502)
  Adds migration settings to Docker (elastic#89501)
  [Lens] Fix crash in transition from unique count to last value (elastic#88916)
  [kbn-es] Always use bundled JDK when starting Elasticsearch (elastic#89437)
  unskip getting_started/shakespeare test elasticsearch 64016 (elastic#89346)
  [Maps] migrate maps, maps_file_upload, and maps_legacy_licensing to TS projects (elastic#89439)
  skip flaky suite (elastic#89478)
  skip flaky suite (elastic#89476)
  skip flaky suite (elastic#89477)
  skip flaky suite (elastic#89475)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
@nchaulet nchaulet deleted the fix-alias-composed-datastream branch January 28, 2021 16:06
@spalger spalger mentioned this pull request Jan 28, 2021
Closed
@spalger spalger mentioned this pull request Jan 28, 2021
Merged
spalger added a commit to spalger/kibana that referenced this pull request Jan 28, 2021
@nchaulet @spalger
[Fleet] Do not defined aliases inside datastream template (elastic#89512
3ade6ab 
)

Co-authored-by: spalger <spalger@users.noreply.github.com>
spalger added a commit that referenced this pull request Jan 28, 2021
@spalger @nchaulet
[7.11] [Fleet] Do not defined aliases inside datastream template (#89512
149da79 
) (#89644)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jen-huang jen-huang jen-huang approved these changes

Assignees

@nchaulet nchaulet

Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.11.0 v7.12.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failing ES Promotion: composable index templates can no longer have both data stream and aliases definitions
5 participants
@nchaulet @elasticmachine @spalger @kibanamachine @jen-huang