[Eleasticsearch] Remove hidden field from indice metricset docs (#3…

…9165) (#39220) * Remove field * fix lint and tests * remove hidden from Index struct * more lint * Update CHANGELOG * More lint stuff and test (cherry picked from commit de23b1a) Co-authored-by: Carlos Crespo <[email protected]>
elastic · Apr 29, 2024 · 54cc3cb · 54cc3cb
1 parent 2f3a4d2
commit 54cc3cb
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 144 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -154,6 +154,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fix Azure Monitor 429 error by causing metricbeat to retry the request again. {pull}38294[38294]
 - Fix fields not being parsed correctly in postgresql/database {issue}25301[25301] {pull}37720[37720]
 - rabbitmq/queue - Change the mapping type of `rabbitmq.queue.consumers.utilisation.pct` to `scaled_float` from `long` because the values fall within the range of `[0.0, 1.0]`. Previously, conversion to integer resulted in reporting either `0` or `1`.
+- Fix timeout caused by the retrival of which indices are hidden {pull}39165[39165]
 
 *Osquerybeat*
 

diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go
@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -368,61 +367,6 @@ func GetXPack(http *helper.HTTP, resetURI string) (XPack, error) {
 	return xpack, err
 }
 
-type boolStr bool
-
-func (b *boolStr) UnmarshalJSON(raw []byte) error {
-	var bs string
-	err := json.Unmarshal(raw, &bs)
-	if err != nil {
-		return err
-	}
-
-	bv, err := strconv.ParseBool(bs)
-	if err != nil {
-		return err
-	}
-
-	*b = boolStr(bv)
-	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")