add missing . when constructing aws.*.metrics.*.*

kaiyan-sheng · kaiyan-sheng · commit bd7784bf2e30 · 2021-04-08T17:38:52.000+08:00
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -1549,6 +1549,16 @@ type: keyword
 Metric dimensions.
 
 
+type: object
+
+--
+
+*`aws.*.metrics.*.*`*::
++
+--
+Metrics that returned from Cloudwatch API query.
+
+
 type: object
 
 --
diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go
@@ -180,7 +180,7 @@ func TestMetricsetFieldsDocumented(t *testing.T, metricSet mb.MetricSet, events
 	}
 
 	if err := checkDocumented(data, nil); err != nil {
-		t.Errorf("%v: check if fields are documented in `metricbeat/%s/%s/_meta/fields.yml` "+
+		t.Errorf("%v: check if fields are documented in `metricbeat/module/%s/%s/_meta/fields.yml` "+
 			"file or run 'make update' on Metricbeat folder to update fields in `metricbeat/fields.yml`",
 			err, metricSet.Module().Name(), metricSet.Name())
 	}
@@ -232,7 +232,7 @@ func runTest(t *testing.T, file string, module, metricSetName string, config Dat
 	})
 
 	if err := checkDocumented(data, config.OmitDocumentedFieldsCheck); err != nil {
-		t.Errorf("%v: check if fields are documented in `metricbeat/%s/%s/_meta/fields.yml` "+
+		t.Errorf("%v: check if fields are documented in `metricbeat/module/%s/%s/_meta/fields.yml` "+
 			"file or run 'make update' on Metricbeat folder to update fields in `metricbeat/fields.yml`",
 			err, module, metricSetName)
 	}
@@ -380,7 +380,7 @@ func documentedFieldCheck(foundKeys common.MapStr, knownKeys map[string]interfac
 
 			// case `aws.*.metrics.*.*`:
 			if len(splits) == 5 {
-				if _, ok := knownKeys[splits[0]+".*"+splits[2]+".*.*"]; ok {
+				if _, ok := knownKeys[splits[0]+".*."+splits[2]+".*.*"]; ok {
 					continue
 				}
 			}
diff --git a/x-pack/metricbeat/module/aws/_meta/fields.yml b/x-pack/metricbeat/module/aws/_meta/fields.yml
@@ -24,3 +24,9 @@
           object_type_mapping_type: "*"
           description: >
             Metric dimensions.
+        - name: '*.metrics.*.*'
+          type: object
+          object_type: double
+          object_type_mapping_type: "*"
+          description: >
+            Metrics that returned from Cloudwatch API query.
diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func TestMetricsetFieldsDocumented(t *testing.T, metricSet mb.MetricSet, events`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if err := checkDocumented(data, nil); err != nil {`
`183`		- t.Errorf("%v: check if fields are documented in `metricbeat/%s/%s/_meta/fields.yml` "+
	`183`	+ t.Errorf("%v: check if fields are documented in `metricbeat/module/%s/%s/_meta/fields.yml` "+
`184`	`184`	"file or run 'make update' on Metricbeat folder to update fields in `metricbeat/fields.yml`",
`185`	`185`	`err, metricSet.Module().Name(), metricSet.Name())`
`186`	`186`	`}`
`@@ -232,7 +232,7 @@ func runTest(t *testing.T, file string, module, metricSetName string, config Dat`
`232`	`232`	`})`
`233`	`233`
`234`	`234`	`if err := checkDocumented(data, config.OmitDocumentedFieldsCheck); err != nil {`
`235`		- t.Errorf("%v: check if fields are documented in `metricbeat/%s/%s/_meta/fields.yml` "+
	`235`	+ t.Errorf("%v: check if fields are documented in `metricbeat/module/%s/%s/_meta/fields.yml` "+
`236`	`236`	"file or run 'make update' on Metricbeat folder to update fields in `metricbeat/fields.yml`",
`237`	`237`	`err, module, metricSetName)`
`238`	`238`	`}`
`@@ -380,7 +380,7 @@ func documentedFieldCheck(foundKeys common.MapStr, knownKeys map[string]interfac`
`380`	`380`
`381`	`381`	// case `aws..metrics..*`:
`382`	`382`	`if len(splits) == 5 {`
`383`		`- if _, ok := knownKeys[splits[0]+"."+splits[2]+"..*"]; ok {`
	`383`	`+ if _, ok := knownKeys[splits[0]+".."+splits[2]+"..*"]; ok {`
`384`	`384`	`continue`
`385`	`385`	`}`
`386`	`386`	`}`