Cherry-pick #7749 to 6.x: [Kibana metricset] Make integration test conditional on Kibana version

metricbeat/module/kibana/kibana_test.go

@@ -0,0 +1,42 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package kibana
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsStatsAPIAvailable(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected bool
+	}{
+		{"6.3.1", false},
+		{"6.4.0", true},
+		{"6.5.0", true},
+		{"7.0.0-alpha1", true},
+	}
+
+	for _, test := range tests {
+		actual, err := IsStatsAPIAvailable(test.input)
+		assert.NoError(t, err)
+		assert.Equal(t, test.expected, actual)
+	}
+}

metricbeat/module/kibana/stats/stats.go

@@ -22,7 +22,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -59,20 +58,6 @@ type MetricSet struct {
 	xPackEnabled bool
 }
 
-func isKibanaStatsAPIAvailable(kibanaVersion string) (bool, error) {
-	currentVersion, err := common.NewVersion(kibanaVersion)
-	if err != nil {
-		return false, err
-	}
-
-	wantVersion, err := common.NewVersion(kibana.StatsAPIAvailableVersion)
-	if err != nil {
-		return false, err
-	}
-
-	return !currentVersion.LessThan(wantVersion), nil
-}
-
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	cfgwarn.Experimental("The kibana stats metricset is experimental")

metricbeat/module/kibana/stats/stats_integration_test.go

@@ -20,34 +20,66 @@
 package stats
 
 import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
 	"testing"
 
+	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/tests/compose"
+
 	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
+	"github.com/elastic/beats/metricbeat/module/kibana"
 	"github.com/elastic/beats/metricbeat/module/kibana/mtest"
 )
 
 func TestData(t *testing.T) {
-	t.Skip("Skipping until we find a way to conditionally skip this for Kibana < 6.4.0") // FIXME
 	compose.EnsureUp(t, "kibana")
 
-	f := mbtest.NewReportingMetricSetV2(t, mtest.GetConfig("stats"))
-
-	// FIXME! See skip above
-	// version, err := kibana.GetVersion(f.http, "api/stats")
-	// if err != nil {
-	// 	t.Fatal("getting kibana version", err)
-	// }
+	config := mtest.GetConfig("stats")
+	host := config["hosts"].([]string)[0]
+	version, err := getKibanaVersion(host)
+	if err != nil {
+		t.Fatal("getting kibana version", err)
+	}
 
-	// isStatsAPIAvailable, err := kibana.IsStatsAPIAvailable(version)
-	// if err != nil {
-	// 	t.Fatal("checking if kibana stats API is available", err)
-	// }
+	isStatsAPIAvailable, err := kibana.IsStatsAPIAvailable(version)
+	if err != nil {
+		t.Fatal("checking if kibana stats API is available", err)
+	}
 
-	// t.Skip("Kibana stats API is not available until 6.4.0")
+	if !isStatsAPIAvailable {
+		t.Skip("Kibana stats API is not available until 6.4.0")
+	}
 
-	err := mbtest.WriteEventsReporterV2(f, t, "")
+	f := mbtest.NewReportingMetricSetV2(t, config)
+	err = mbtest.WriteEventsReporterV2(f, t, "")
 	if err != nil {
 		t.Fatal("write", err)
 	}
 }
+
+func getKibanaVersion(kibanaHostPort string) (string, error) {
+	resp, err := http.Get("http://" + kibanaHostPort + "/api/status")
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	var data common.MapStr
+	err = json.Unmarshal(body, &data)
+	if err != nil {
+		return "", err
+	}
+
+	version, err := data.GetValue("version.number")
+	if err != nil {
+		return "", err
+	}
+	return version.(string), nil
+}