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

Clean up Kibana, remove Elasticsearch loading and 5.x version #10451

Merged
merged 2 commits into from
Jan 31, 2019

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Jan 31, 2019

In 5.x the dashboards were loaded through Elasticsearch and not Kibana. For 6.x and 7.x dashboards are loaded through the Kibana API. The old code is removed in this PR.

Also some code is cleaned up around talking to 5.x Kibana APIs.

In 5.x the dashboards were loaded through Elasticsearch and not Kibana. For 6.x and 7.x dashboards are loaded through the Kibana API. The old code is removed in this PR.

Also some code is cleaned up around talking to 5.x Kibana APIs.
@ruflin ruflin self-assigned this Jan 31, 2019
@ruflin ruflin requested a review from a team as a code owner January 31, 2019 08:30
@ruflin
Copy link
Member Author

ruflin commented Jan 31, 2019

The goal of this code is to make the implementation of #10450 easier / cleaner.

@ruflin
Copy link
Member Author

ruflin commented Jan 31, 2019

CI failure in Journalbeat is related to not being able to push a docker image but not related to this PR.

Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

LGTM, this may need an entry in the developers changelog.

func ImportDashboards(
ctx context.Context,
beatName, hostname, homePath string,
kibanaConfig, esConfig, dashboardsConfig *common.Config,
kibanaConfig, dashboardsConfig *common.Config,
msgOutputter MessageOutputter,
) error {
Copy link
Member

Choose a reason for hiding this comment

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

Does it need an entry in the developers changelog?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, will add one in my follow up PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

@ruflin ruflin merged commit b054f08 into elastic:master Jan 31, 2019
@ruflin ruflin deleted the es-kibana-load branch January 31, 2019 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants