Hybrid approach

elastic · Jul 7, 2020 · eb621b5 · eb621b5
1 parent 87b73dd
commit eb621b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go
@@ -379,7 +379,7 @@ func (b *boolStr) UnmarshalJSON(raw []byte) error {
 }
 
 type IndexSettings struct {
-	Hidden boolStr
+	Hidden bool
 }
 
 // GetIndicesSettings returns a map of index names to their settings.
@@ -394,7 +394,9 @@ func GetIndicesSettings(http *helper.HTTP, resetURI string) (map[string]IndexSet
 
 	var resp map[string]struct {
 		Settings struct {
-			Index IndexSettings `json:"index"`
+			Index struct {
+				Hidden boolStr `json:"hidden"`
+			} `json:"index"`
 		} `json:"settings"`
 	}
 
@@ -405,7 +407,9 @@ func GetIndicesSettings(http *helper.HTTP, resetURI string) (map[string]IndexSet
 
 	ret := make(map[string]IndexSettings, len(resp))
 	for index, settings := range resp {
-		ret[index] = settings.Settings.Index
+		ret[index] = IndexSettings{
+			Hidden: bool(settings.Settings.Index.Hidden),
+		}
 	}
 
 	return ret, nil

diff --git a/metricbeat/module/elasticsearch/index/data_xpack.go b/metricbeat/module/elasticsearch/index/data_xpack.go
@@ -154,7 +154,7 @@ func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info,
 
 		settings, exists := indicesSettings[name]
 		if exists {
-			idx.Hidden = bool(settings.Hidden)
+			idx.Hidden = settings.Hidden
 		}
 
 		err = addClusterStateFields(&idx, clusterState)