Remove field

metricbeat/module/elasticsearch/elasticsearch.go

@@ -386,43 +386,6 @@ func (b *boolStr) UnmarshalJSON(raw []byte) error {
 	return nil
 }
 
-type IndexSettings struct {
-	Hidden bool
-}
-
-// GetIndicesSettings returns a map of index names to their settings.
-// Note that as of now it is optimized to fetch only the "hidden" index setting to keep the memory
-// footprint of this function call as low as possible.
-func GetIndicesSettings(http *helper.HTTP, resetURI string) (map[string]IndexSettings, error) {
-	content, err := fetchPath(http, resetURI, "*/_settings", "filter_path=*.settings.index.hidden&expand_wildcards=all")
-
-	if err != nil {
-		return nil, fmt.Errorf("could not fetch indices settings: %w", err)
-	}
-
-	var resp map[string]struct {
-		Settings struct {
-			Index struct {
-				Hidden boolStr `json:"hidden"`
-			} `json:"index"`
-		} `json:"settings"`
-	}
-
-	err = json.Unmarshal(content, &resp)
-	if err != nil {
-		return nil, fmt.Errorf("could not parse indices settings response: %w", err)
-	}
-
-	ret := make(map[string]IndexSettings, len(resp))
-	for index, settings := range resp {
-		ret[index] = IndexSettings{
-			Hidden: bool(settings.Settings.Index.Hidden),
-		}
-	}
-
-	return ret, nil
-}
-
 // IsMLockAllEnabled returns if the given Elasticsearch node has mlockall enabled
 func IsMLockAllEnabled(http *helper.HTTP, resetURI, nodeID string) (bool, error) {
 	content, err := fetchPath(http, resetURI, "_nodes/"+nodeID, "filter_path=nodes.*.process.mlockall")

metricbeat/module/elasticsearch/elasticsearch_integration_test.go

@@ -137,19 +137,11 @@ func TestGetAllIndices(t *testing.T) {
 			name, ok := event.MetricSetFields["name"]
 			require.True(t, ok)
 
-			hidden, ok := event.MetricSetFields["hidden"]
-			require.True(t, ok)
-
-			isHidden, ok := hidden.(bool)
-			require.True(t, ok)
-
 			switch name {
 			case indexVisible:
 				idxVisibleExists = true
-				require.False(t, isHidden)
 			case indexHidden:
 				idxHiddenExists = true
-				require.True(t, isHidden)
 			}
 		}
 
@@ -204,14 +196,14 @@ func createIndex(host string, isHidden bool) (string, error) {
 
 	req, err := http.NewRequest("PUT", fmt.Sprintf("http://%v/%v", host, indexName), strings.NewReader(reqBody))
 	if err != nil {
-		return "", fmt.Errorf("could not build create index request: %w", err)
+		return "", errors.Wrap(err, "could not build create index request")
 	}
 	req.Header.Add("Content-Type", "application/json")
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		return "", fmt.Errorf("could not send create index request: %w", err)
+		return "", errors.Wrap(err, "could not send create index request")
 	}
 	defer resp.Body.Close()
 	respBody, err := ioutil.ReadAll(resp.Body)

metricbeat/module/elasticsearch/index/data.go

@@ -191,23 +191,13 @@ func eventsMapping(r mb.ReporterV2, httpClient *helper.HTTP, info elasticsearch.
 		return fmt.Errorf("failure parsing Indices Stats Elasticsearch API response: %w", err)
 	}
 
-	indicesSettings, err := elasticsearch.GetIndicesSettings(httpClient, httpClient.GetURI())
-	if err != nil {
-		return fmt.Errorf("failure retrieving indices settings from Elasticsearch: %w", err)
-	}
-
 	var errs multierror.Errors
 	for name, idx := range indicesStats.Indices {
 		event := mb.Event{
 			ModuleFields: mapstr.M{},
 		}
 		idx.Index = name
 
-		settings, exists := indicesSettings[name]
-		if exists {
-			idx.Hidden = settings.Hidden
-		}
-
 		err = addClusterStateFields(&idx, clusterState)
 		if err != nil {
 			errs = append(errs, fmt.Errorf("failure adding cluster state fields: %w", err))