From 0515124c11e8747a20632072171749a636ac593d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Wed, 2 May 2018 17:51:36 +0200 Subject: [PATCH] Detect error during requesting status info from Kibana (#6991) * detect error during requesting status info of Kibana * add missing whitespace --- filebeat/beater/filebeat.go | 2 +- libbeat/setup/kibana/client.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go index 39596849c4b..77fc9b65776 100644 --- a/filebeat/beater/filebeat.go +++ b/filebeat/beater/filebeat.go @@ -204,7 +204,7 @@ func (fb *Filebeat) loadModulesML(b *beat.Beat, kibanaConfig *common.Config) err kibanaVersion, err := common.NewVersion(kibanaClient.GetVersion()) if err != nil { - return err + return errors.Errorf("Error checking Kibana version: %v", err) } if err := setupMLBasedOnVersion(fb.moduleRegistry, esClient, kibanaClient, kibanaVersion); err != nil { diff --git a/libbeat/setup/kibana/client.go b/libbeat/setup/kibana/client.go index b9c5b6e4f91..493eb6d89a1 100644 --- a/libbeat/setup/kibana/client.go +++ b/libbeat/setup/kibana/client.go @@ -118,7 +118,7 @@ func NewKibanaClient(cfg *common.Config) (*Client, error) { } if err = client.SetVersion(); err != nil { - return nil, fmt.Errorf("fail to get the Kibana version:%v", err) + return nil, fmt.Errorf("fail to get the Kibana version: %v", err) } return client, nil @@ -179,8 +179,8 @@ func (client *Client) SetVersion() error { Version string `json:"version"` } - _, result, err := client.Connection.Request("GET", "/api/status", nil, nil) - if err != nil { + code, result, err := client.Connection.Request("GET", "/api/status", nil, nil) + if err != nil || code >= 400 { return fmt.Errorf("HTTP GET request to /api/status fails: %v. Response: %s.", err, truncateString(result)) }