Skip to content

[Ingest Manager] Adjust dataset aggs to use datastream fields instead#74226

Closed
ruflin wants to merge 6 commits intoelastic:7.9from
ruflin:datastream-adjustments
Closed

[Ingest Manager] Adjust dataset aggs to use datastream fields instead#74226
ruflin wants to merge 6 commits intoelastic:7.9from
ruflin:datastream-adjustments

Conversation

@ruflin
Copy link
Copy Markdown
Contributor

@ruflin ruflin commented Aug 4, 2020

Elastic Agent and Elasticsearch are switching over from using dataset.* to datastream.*. This adjust the aggregation on the dataset page to get the datastreams.

For this to work properly, the most recent version of Elasticsearch 7.9 must be used and is pending updates on all the packages to ship also the datastream fields, see elastic/integrations#213

Elastic Agent and Elasticsearch are switching over from using dataset.* to datastream.*. This adjust the aggregation on the dataset page to get the datastreams.

For this to work properly, the most recent version of Elasticsearch 7.9 must be used and is pending updates on all the packages to ship also the datastream fields, see elastic/integrations#213
@ruflin ruflin self-assigned this Aug 4, 2020
@ruflin ruflin requested a review from jen-huang August 4, 2020 08:54
@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 4, 2020

@elastic/ingest-management Can you think of any other places where we query / agg data based on the dataset.* fields?

@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 4, 2020

A note on testing these changes as it requires building ES from source:

  • Check out elasticsearch from 7.9 branch
  • Run ./gradlew run
  • Adjust config of Kibana to use the following:
elasticsearch.username: "elastic-admin"
elasticsearch.password: "elastic-password"
  • Checkout out Beats repo 7.9 and build agent from source
  • Run PLATFORMS=darwin mage package (assuming you use darwin)
  • Go to build/platforms, extract the binary and use it.

The package registry should already contain the most recent packages with the changed format (releasing now).

@skh
Copy link
Copy Markdown
Contributor

skh commented Aug 4, 2020

I've created #74257 to discuss what needs to be done for this change to work.

@jen-huang
Copy link
Copy Markdown
Contributor

Did a simple smoke test using this PR, 7.9 elasticsearch from source, 7.9 agent from source, with default config (just system integration). Datasets page, metrics dashboard, and ES data streams look good:

image

image

image

@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 5, 2020

@jen-huang @skh I updated this PR with the most recent data_stream renaming. As soon as PR's on ES and Agent side are merged, I'll start testing this locally.

We will also need to forward port this change.

@ruflin ruflin added Ingest Management:beta1 Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0 labels Aug 5, 2020
@skh
Copy link
Copy Markdown
Contributor

skh commented Aug 5, 2020

We will also need to forward port this change.

Is there a reason not to use the normal merging strategy (master first, backport to 7.x and 7.9 as needed)?

@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 5, 2020

@skh Main reason is that on 7.9 we are bit under time pressure and I would like to have this change in very soon so we can start testing.

I suggest after we get this into 7.9, we open master and then backport to 7.x

@skh
Copy link
Copy Markdown
Contributor

skh commented Aug 5, 2020

under time pressure

The difference between the normal workflow and merging to 7.9 first is once CI run / about 2 hours. If we can't afford these two hours, are we positively sure we should be making these changes at all?

@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 5, 2020

Yes, changes are already in Elasticsearch: elastic/elasticsearch#60715

@skh As an alternative, could you help me open a PR against master directly with the backports before it is merged?

@ruflin ruflin changed the base branch from 7.9 to master August 5, 2020 09:21
@ruflin ruflin changed the base branch from master to 7.9 August 5, 2020 09:21
@skh
Copy link
Copy Markdown
Contributor

skh commented Aug 5, 2020

@ruflin ok to close this in favour of #74342 ?

@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@jen-huang
Copy link
Copy Markdown
Contributor

Closing in favor of #74342 (already merged and backported).

@jen-huang jen-huang closed this Aug 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants