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

Add username password into kibana config before calling NewKibanaClient #10675

Merged
merged 5 commits into from
Feb 12, 2019
Merged

Add username password into kibana config before calling NewKibanaClient #10675

merged 5 commits into from
Feb 12, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

Turned out the fix in #10553 won't solve the issue because kibana.NewKibanaClient(kibanaConfig) is called before dashboards.ImportDashboards, which already requires the correct config including password and username as input. So moving the same code upfront before kibana.NewKibanaClient is called solves this issue.

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner February 11, 2019 15:40
@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. v7.0.0 Team:Integrations Label for the Integrations team labels Feb 11, 2019
@kaiyan-sheng kaiyan-sheng mentioned this pull request Feb 11, 2019
Closed
@kaiyan-sheng kaiyan-sheng self-assigned this Feb 11, 2019
@kaiyan-sheng
Copy link
Contributor Author

jenkins, test this

@ruflin
Copy link
Member

ruflin commented Feb 12, 2019

@kaiyan-sheng Could you add a system test to confirm this issue is fixed?

@ruflin
Copy link
Member

ruflin commented Feb 12, 2019

Rebase on master will fix the failing tests.

ruflin
ruflin approved these changes Feb 12, 2019
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. For me ok to merge now but please follow up with an integration test.

libbeat/cmd/instance/beat.go Show resolved Hide resolved
libbeat/cmd/test/filebeat_test.yml Show resolved Hide resolved
@kaiyan-sheng kaiyan-sheng merged commit 5d280da into elastic:master Feb 12, 2019
@kaiyan-sheng kaiyan-sheng deleted the fix_kibana_load branch February 12, 2019 18:36
kaiyan-sheng added a commit that referenced this pull request Feb 14, 2019
@kaiyan-sheng
Add username password into kibana config before calling NewKibanaClie…
457aaef 
…nt (#10675) (#10702)

* Add username password into kibana config before calling NewKibanaClient

* Add changelog

* Add unit test for initKibanaConfig

* Run make fmt

* Add comment on initKibanaConfig

(cherry picked from commit 5d280da)
@kaiyan-sheng kaiyan-sheng removed needs_backport PR is waiting to be backported to other branches. v7.0.0 labels Feb 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
bug libbeat Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kaiyan-sheng @ruflin