Detect error during requesting status info from Kibana (elastic#6991)

* detect error during requesting status info of Kibana * add missing whitespace
tsg · May 2, 2018 · 0515124 · 0515124
1 parent ec72bfc
commit 0515124
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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))
 	}