Make elasticsearch/index_summary metricset work for Stack Monitoring without xpack.enabled flag

metricbeat/docs/fields.asciidoc

@@ -18134,6 +18134,58 @@ alias to: elasticsearch.node.stats.thread_pool.write.rejected.count
 
 --
 
+
+
+
+
+*`indices_stats._all.primaries.indexing.index_total`*::
++
+--
+type: alias
+
+alias to: elasticsearch.index.summary.primaries.indexing.index.count
+
+--
+
+*`indices_stats._all.primaries.indexing.index_time_in_millis`*::
++
+--
+type: alias
+
+alias to: elasticsearch.index.summary.primaries.indexing.index.time.ms
+
+--
+
+
+
+*`indices_stats._all.total.search.query_total`*::
++
+--
+type: alias
+
+alias to: elasticsearch.index.summary.total.search.query.count
+
+--
+
+*`indices_stats._all.total.search.query_time_in_millis`*::
++
+--
+type: alias
+
+alias to: elasticsearch.index.summary.total.search.query.time.ms
+
+--
+
+
+*`indices_stats._all.total.indexing.index_total`*::
++
+--
+type: alias
+
+alias to: elasticsearch.index.summary.total.indexing.index.count
+
+--
+
 [float]
 === elasticsearch
 
@@ -18688,6 +18740,110 @@ format: bytes
 --
 
 
+*`elasticsearch.index.summary.primaries.indexing.index.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.indexing.index.time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.indexing.is_throttled`*::
++
+--
+TODO
+
+type: boolean
+
+--
+
+*`elasticsearch.index.summary.primaries.indexing.throttle_time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+
+*`elasticsearch.index.summary.primaries.search.query.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.search.query.time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+*`elasticsearch.index.summary.primaries.bulk.operations.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.bulk.size.bytes`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+*`elasticsearch.index.summary.primaries.bulk.time.count.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.bulk.time.avg.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.primaries.bulk.time.avg.bytes`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
 *`elasticsearch.index.summary.total.docs.count`*::
 +
 --
@@ -18742,6 +18898,110 @@ format: bytes
 
 --
 
+
+*`elasticsearch.index.summary.total.indexing.index.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.indexing.index.time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.indexing.is_throttled`*::
++
+--
+TODO
+
+type: boolean
+
+--
+
+*`elasticsearch.index.summary.total.indexing.throttle_time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+
+*`elasticsearch.index.summary.total.search.query.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.search.query.time.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+*`elasticsearch.index.summary.total.bulk.operations.count`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.bulk.size.bytes`*::
++
+--
+TODO
+
+type: long
+
+--
+
+
+*`elasticsearch.index.summary.total.bulk.time.count.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.bulk.time.avg.ms`*::
++
+--
+TODO
+
+type: long
+
+--
+
+*`elasticsearch.index.summary.total.bulk.time.avg.bytes`*::
++
+--
+TODO
+
+type: long
+
+--
+
 [float]
 === ml.job
 

metricbeat/module/elasticsearch/_meta/fields.yml

@@ -276,6 +276,42 @@
                 - name: rejected
                   path: elasticsearch.node.stats.thread_pool.write.rejected.count
                   type: alias
+    - name: indices_stats
+      type: group
+      fields:
+        - name: _all
+          type: group
+          fields:
+            - name: primaries
+              type: group
+              fields:
+                - name: indexing
+                  type: group
+                  fields:
+                    - name: index_total
+                      type: alias
+                      path: elasticsearch.index.summary.primaries.indexing.index.count
+                    - name: index_time_in_millis
+                      type: alias
+                      path: elasticsearch.index.summary.primaries.indexing.index.time.ms
+            - name: total
+              type: group
+              fields:
+                - name: search
+                  type: group
+                  fields:
+                    - name: query_total
+                      type: alias
+                      path: elasticsearch.index.summary.total.search.query.count
+                    - name: query_time_in_millis
+                      type: alias
+                      path: elasticsearch.index.summary.total.search.query.time.ms
+                - name: indexing
+                  type: group
+                  fields:
+                    - name: index_total
+                      type: alias
+                      path: elasticsearch.index.summary.total.indexing.index.count
     - name: elasticsearch
       type: group
       description: >

metricbeat/module/elasticsearch/elasticsearch.go

@@ -29,8 +29,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/elastic/beats/v7/libbeat/common"
-	s "github.com/elastic/beats/v7/libbeat/common/schema"
-	c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface"
 	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/elastic/beats/v7/metricbeat/helper"
 	"github.com/elastic/beats/v7/metricbeat/helper/elastic"
@@ -119,14 +117,6 @@ type licenseWrapper struct {
 	License License `json:"license"`
 }
 
-var BulkStatsDict = c.Dict("bulk", s.Schema{
-	"total_operations":     c.Int("total_operations"),
-	"total_time_in_millis": c.Int("total_time_in_millis"),
-	"total_size_in_bytes":  c.Int("total_size_in_bytes"),
-	"avg_time_in_millis":   c.Int("avg_time_in_millis"),
-	"avg_size_in_bytes":    c.Int("avg_size_in_bytes"),
-}, c.DictOptional)
-
 // GetClusterID fetches cluster id for given nodeID.
 func GetClusterID(http *helper.HTTP, uri string, nodeID string) (string, error) {
 	// Check if cluster id already cached. If yes, return it.

metricbeat/module/elasticsearch/elasticsearch_integration_test.go

@@ -131,7 +131,7 @@ func TestXPackEnabled(t *testing.T) {
 		"cluster_stats":  []string{"cluster_stats"},
 		"enrich":         []string{"enrich_coordinator_stats"},
 		"index_recovery": []string{"index_recovery"},
-		"index_summary":  []string{"indices_stats"},
+		"index_summary":  []string{}, // no longer indexed into .monitoring-es-*
 		"ml_job":         []string{"job_stats"},
 		"node_stats":     []string{}, // no longer indexed into .monitoring-es-*
 	}