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

[Ingest Manager ] prepend kibana asset ids with package name #70502

Merged
merged 5 commits into from
Jul 6, 2020

Conversation

neptunian
Copy link
Contributor

@neptunian neptunian commented Jul 1, 2020

#65035

The kibana assets installed by the Ingest Manager could conflict with ones with the same ids installed by Beats. This change will keep separate versions by modifying the ids of the assets in the Ingest Manager, as well as the references to ids in Dashboard assets, before installing

Changes

  • prepends the id of each installed kibana asset with the package name
  • prepends the id of each asset the asset references (in the asset's references property)
  • only asset ids of type dashboard, visualization, search, and map are modified

Test

Screen Shot 2020-07-01 at 3 17 19 PM

- install a package and repeat

@neptunian neptunian self-assigned this Jul 1, 2020
@neptunian neptunian added Feature:Ingest Management Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0 v8.0.0 release_note:skip Skip the PR/issue when compiling release notes labels Jul 1, 2020
@neptunian neptunian marked this pull request as ready for review July 2, 2020 13:32
@neptunian neptunian requested a review from a team July 2, 2020 13:32
@elasticmachine
Copy link
Contributor

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

@neptunian
Copy link
Contributor Author

@elasticmachine merge upstream

@ruflin
Copy link
Member

ruflin commented Jul 2, 2020

@neptunian Please make sure to test at least the dashboards of the system package that they still work. We have also some links in this dashboard which might break (I'm pretty sure they will). But for these we should update the package. Please have a conversation with @fearful-symmetry about it.

Copy link
Contributor

@jfsiii jfsiii left a comment

Choose a reason for hiding this comment

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

I haven't run this locally or thought about all the interactions, but the code LGTM.

I appreciate pulling the related code into a new file.

@neptunian
Copy link
Contributor Author

Things seem to be working right but I missed that the links don't work. The links are in these markdown visualizations: https://github.com/elastic/integrations/blob/master/packages/nginx/kibana/visualization/97109780-a2a5-11e7-928f-5dbe6f6f5519-ecs.json#L14
It's possible to handle in the Ingest Management side, but I'm not sure what @ruflin has in mind for changing it on the package side.

@ruflin
Copy link
Member

ruflin commented Jul 2, 2020

@neptunian We should not handle the links on the Ingest Management side as these are basically a hack and hopefully going away in the future.

@neptunian
Copy link
Contributor Author

neptunian commented Jul 2, 2020

Okay. Looks like they exist in netflow, nginx, and system packages.

@neptunian
Copy link
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@neptunian
Copy link
Contributor Author

@jfsiii I made those changes you asked for. Can you look again? Thanks!

@neptunian neptunian merged commit 984ea07 into elastic:master Jul 6, 2020
neptunian added a commit to neptunian/kibana that referenced this pull request Jul 6, 2020
…#70502)

* prepend asset ids with package name

* fix type

* cleanup

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
neptunian added a commit that referenced this pull request Jul 7, 2020
…#70866)

* prepend asset ids with package name

* fix type

* cleanup

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
neptunian added a commit to neptunian/kibana that referenced this pull request Jul 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants