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

Update package output structure #514

Merged
merged 8 commits into from
Jun 29, 2020

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented Jun 16, 2020

This change contains several changes to the output generated for the package API endpoint:

  • dataset.id is renamed to dataset.name
  • datasources is renamed to config_templates. Currently only in the output, packages can follow later.
  • config_templates (aka datasources) do not pregenerate the content anymore to simply config building in Kibana
  • template_content is removed

Further change is done to use Dataset(s) instead of DataSet(s) in the code for consistency.

@ruflin
Copy link
Contributor Author

ruflin commented Jun 16, 2020

@jen-huang This is related to Phase 3: elastic/beats#19082 You should be able to use this branch to test changes in Kibana.

@ruflin ruflin self-assigned this Jun 16, 2020
@elasticmachine
Copy link

elasticmachine commented Jun 16, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Started by upstream project "Beats/package-storage/master" build number 40]

  • Start Time: 2020-06-29T20:55:39.536+0000

  • Duration: 8 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 143
Skipped 0
Total 143

@ruflin
Copy link
Contributor Author

ruflin commented Jun 22, 2020

Part of #517

@ruflin ruflin added the Ingest Management:beta1 Group issues for ingest management beta1 label Jun 22, 2020
@jen-huang
Copy link
Contributor

I'm hitting errors with mage build using this branch now. There are some conflicts with master if I try to merge. Can you try?

@ruflin ruflin force-pushed the config_templates-dataset_content branch from a41fea9 to cada7b0 Compare June 24, 2020 07:07
@ruflin
Copy link
Contributor Author

ruflin commented Jun 24, 2020

@jen-huang I rebased on master, now things should work as expected.

ruflin added 8 commits June 29, 2020 14:17
This change contains several changes to the output generated for the package API endpoint:

* dataset.id is renamed to dataset.name
* datasources is renamed to config_templates. Currently only in the output, packages can follow later.
* config_templates (aka datasources) do not pregenerate the content anymore to simply config building in Kibana
* template_content is removed

Further change is done to use `Dataset(s)` instead of `DataSet(s)` in the code for consistency.
@ruflin ruflin force-pushed the config_templates-dataset_content branch from 3e88577 to 9bf9866 Compare June 29, 2020 12:19
@ruflin ruflin marked this pull request as ready for review June 29, 2020 15:09
@ruflin ruflin requested a review from mtojek June 29, 2020 15:10
Copy link
Contributor

@mtojek mtojek left a comment

Choose a reason for hiding this comment

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

Approved, but please make sure if the import-beats is not impacted with this change.

@ruflin ruflin merged commit 5628ef3 into elastic:master Jun 29, 2020
@ruflin ruflin deleted the config_templates-dataset_content branch June 29, 2020 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ingest Management:beta1 Group issues for ingest management beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants