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

[6.x] Configuration to allow users to retry loading dashboards (#6560) #6602

Closed
wants to merge 1 commit into from

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Mar 20, 2018

Backports the following commits to 6.x:

Configuration to allow users to retry loading dashboards if Kibana is not reachable, instead of exiting right away.
@jalvz jalvz added the backport label Mar 20, 2018
@@ -21,13 +23,13 @@ type KibanaLoader struct {
msgOutputter MessageOutputter
}

func NewKibanaLoader(cfg *common.Config, dashboardsConfig *Config, hostname string, msgOutputter MessageOutputter) (*KibanaLoader, error) {
func NewKibanaLoader(ctx context.Context, cfg *common.Config, dashboardsConfig *Config, hostname string, msgOutputter MessageOutputter) (*KibanaLoader, error) {

Choose a reason for hiding this comment

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

exported function NewKibanaLoader should have comment or be unexported

Retry *Retry `config:"retry"`
}

type Retry struct {

Choose a reason for hiding this comment

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

exported type Retry should have comment or be unexported

@jalvz
Copy link
Contributor Author

jalvz commented Mar 20, 2018

@ruflin i would be great if you could merge this after ci run, so we can backport it also in apm-server and do some tests with 6.x even before FF

@ruflin
Copy link
Member

ruflin commented Mar 21, 2018

@jalvz Thanks for the backport. We do bulk backports so no need to manually backport. I will check that we can make one other bulk backport soonish so you can test this. Going to close this one.

@ruflin ruflin closed this Mar 21, 2018
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