From 9547c6372743a91d8d8215876c38a552ec6de941 Mon Sep 17 00:00:00 2001 From: Kevin Lacabane Date: Mon, 28 Feb 2022 11:12:08 +0100 Subject: [PATCH] metricbeat - fix elasticsearch and kibana integration tests failures in 8.0 (#30566) * add missing elasticsearch.index fields * add missing elasticsearch.node.stats fields * remove deprecated elasticsearch.settings integration tests * mage update * remove useless field (cherry picked from commit a84f4d5fb1ebec0ed764e39373577615f474482d) --- metricbeat/docs/fields.asciidoc | 83 +++++++++++++ metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/index/_meta/fields.yml | 14 ++- .../elasticsearch/node_stats/_meta/fields.yml | 28 ++++- .../settings/settings_integration_test.go | 109 ------------------ 5 files changed, 124 insertions(+), 112 deletions(-) delete mode 100644 metricbeat/module/kibana/settings/settings_integration_test.go diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index cec3a8b54b5..a67442c94f9 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -30829,6 +30829,42 @@ type: long -- + +*`elasticsearch.index.total.bulk.total_size_in_bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.total.bulk.avg_size_in_bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.total.bulk.avg_time_in_millis`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.total.bulk.total_operations`*:: ++ +-- +type: long + +-- + +*`elasticsearch.index.total.bulk.total_time_in_millis`*:: ++ +-- +type: long + +-- + [float] === index.recovery @@ -31496,6 +31532,53 @@ Statistics about each node in a Elasticsearch cluster + + +*`elasticsearch.node.stats.indices.bulk.avg_time.bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.indices.bulk.avg_time.ms`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.node.stats.indices.bulk.total_time.ms`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.node.stats.indices.bulk.total_size.bytes`*:: ++ +-- +type: long + +-- + + +*`elasticsearch.node.stats.indices.bulk.avg_size.bytes`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.indices.bulk.operations.total.count`*:: ++ +-- +type: long + +-- + *`elasticsearch.node.stats.indices.docs.count`*:: + -- diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 309415e6c5d..975f1230afd 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded zlib format compressed contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } diff --git a/metricbeat/module/elasticsearch/index/_meta/fields.yml b/metricbeat/module/elasticsearch/index/_meta/fields.yml index 07886fa81ad..b1a4ed1898a 100644 --- a/metricbeat/module/elasticsearch/index/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/index/_meta/fields.yml @@ -193,4 +193,16 @@ type: long - name: throttle_time_in_millis type: long - + - name: bulk + type: group + fields: + - name: total_size_in_bytes + type: long + - name: avg_size_in_bytes + type: long + - name: avg_time_in_millis + type: long + - name: total_operations + type: long + - name: total_time_in_millis + type: long diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index f275f4f2734..364c9493d1a 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -7,6 +7,33 @@ - name: indices type: group fields: + - name: bulk + type: group + fields: + - name: avg_time + type: group + fields: + - name: bytes + type: long + - name: ms + type: long + - name: total_time + type: group + fields: + - name: ms + type: long + - name: total_size + type: group + fields: + - name: bytes + type: long + - name: avg_size + type: group + fields: + - name: bytes + type: long + - name: operations.total.count + type: long - name: docs.count type: long description: > @@ -312,4 +339,3 @@ type: long - name: rejected.count type: long - diff --git a/metricbeat/module/kibana/settings/settings_integration_test.go b/metricbeat/module/kibana/settings/settings_integration_test.go deleted file mode 100644 index 40ee8aa1144..00000000000 --- a/metricbeat/module/kibana/settings/settings_integration_test.go +++ /dev/null @@ -1,109 +0,0 @@ -// 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. - -//go:build integration -// +build integration - -package settings - -import ( - "encoding/json" - "io/ioutil" - "net/http" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/tests/compose" - - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kibana" - "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" -) - -func TestFetch(t *testing.T) { - service := compose.EnsureUpWithTimeout(t, 570, "kibana") - - config := mtest.GetConfig("settings", service.Host(), false) - host := config["hosts"].([]string)[0] - version, err := getKibanaVersion(t, host) - require.NoError(t, err) - - isStatsAPIAvailable := kibana.IsStatsAPIAvailable(version) - require.NoError(t, err) - - if !isStatsAPIAvailable { - t.Skip("Kibana stats API is not available until 6.4.0") - } - - f := mbtest.NewReportingMetricSetV2Error(t, config) - events, errs := mbtest.ReportingFetchV2Error(f) - - require.Empty(t, errs) - require.NotEmpty(t, events) - - t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), - events[0].BeatEvent("kibana", "settings").Fields.StringToPrint()) -} - -func TestData(t *testing.T) { - service := compose.EnsureUp(t, "kibana") - - config := mtest.GetConfig("settings", service.Host(), false) - host := config["hosts"].([]string)[0] - version, err := getKibanaVersion(t, host) - require.NoError(t, err) - - isStatsAPIAvailable := kibana.IsStatsAPIAvailable(version) - require.NoError(t, err) - - if !isStatsAPIAvailable { - t.Skip("Kibana settings API is not available until 6.4.0") - } - - f := mbtest.NewReportingMetricSetV2Error(t, config) - err = mbtest.WriteEventsReporterV2Error(f, t, "") - require.NoError(t, err) -} - -func getKibanaVersion(t *testing.T, kibanaHostPort string) (*common.Version, error) { - resp, err := http.Get("http://" + kibanaHostPort + "/api/status") - if err != nil { - return nil, err - } - defer resp.Body.Close() - - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - - var data common.MapStr - err = json.Unmarshal(body, &data) - if err != nil { - return nil, err - } - - version, err := data.GetValue("version.number") - if err != nil { - t.Log("Kibana GET /api/status response:", string(body)) - return nil, err - } - - return common.NewVersion(version.(string)) -}