Update dataset in packages

dev/import-beats/fields_base_fields.go

@@ -9,19 +9,19 @@ var baseFields = createBaseFields()
 func createBaseFields() []fieldDefinition {
 	return []fieldDefinition{
 		{
-			Name:        "stream.type",
+			Name:        "dataset.type",
 			Type:        "constant_keyword",
-			Description: "Stream type.",
+			Description: "Dataset type.",
 		},
 		{
-			Name:        "stream.dataset",
+			Name:        "dataset.name",
 			Type:        "constant_keyword",
-			Description: "Stream dataset.",
+			Description: "Dataset name.",
 		},
 		{
-			Name:        "stream.namespace",
+			Name:        "dataset.namespace",
 			Type:        "constant_keyword",
-			Description: "Stream namespace.",
+			Description: "Dataset namespace.",
 		},
 		{
 			Name:        "@timestamp",

dev/import-beats/kibana.go

@@ -355,7 +355,7 @@ func stripReferencesToEventModuleInFilter(object mapStr, filterKey, moduleName s
 				return nil, errors.Wrapf(err, "setting meta.type failed")
 			}
 
-			_, err = filterObject.put("meta.value", fmt.Sprintf("{\"prefix\":{\"stream.dataset\":\"%s.\"}}", moduleName))
+			_, err = filterObject.put("meta.value", fmt.Sprintf("{\"prefix\":{\"dataset.name\":\"%s.\"}}", moduleName))
 			if err != nil {
 				return nil, errors.Wrapf(err, "setting meta.value failed")
 			}
@@ -367,7 +367,7 @@ func stripReferencesToEventModuleInFilter(object mapStr, filterKey, moduleName s
 
 			q := map[string]interface{}{
 				"prefix": map[string]interface{}{
-					"stream.dataset": moduleName + ".",
+					"dataset.name": moduleName + ".",
 				},
 			}
 			_, err = filterObject.put("query", q)
@@ -414,8 +414,8 @@ func stripReferencesToEventModuleInQuery(object mapStr, objectKey, moduleName st
 	query = strings.ReplaceAll(query, `"`, "")
 	if strings.Contains(query, "event.module:"+moduleName) && (strings.Contains(query, "metricset.name:") || strings.Contains(query, "fileset.name:")) {
 		query = strings.ReplaceAll(query, "event.module:"+moduleName, "")
-		query = strings.ReplaceAll(query, "metricset.name:", fmt.Sprintf("stream.dataset:%s.", moduleName))
-		query = strings.ReplaceAll(query, "fileset.name:", fmt.Sprintf("stream.dataset:%s.", moduleName))
+		query = strings.ReplaceAll(query, "metricset.name:", fmt.Sprintf("dataset.name:%s.", moduleName))
+		query = strings.ReplaceAll(query, "fileset.name:", fmt.Sprintf("dataset.name:%s.", moduleName))
 		query = strings.TrimSpace(query)
 		if strings.HasPrefix(query, "AND ") {
 			query = query[4:]
@@ -428,7 +428,7 @@ func stripReferencesToEventModuleInQuery(object mapStr, objectKey, moduleName st
 	} else if strings.Contains(query, "event.module:"+moduleName) {
 		var eventDatasets []string
 		for _, datasetName := range datasetNames {
-			eventDatasets = append(eventDatasets, fmt.Sprintf("stream.dataset:%s.%s", moduleName, datasetName))
+			eventDatasets = append(eventDatasets, fmt.Sprintf("dataset.name:%s.%s", moduleName, datasetName))
 		}
 
 		value := " (" + strings.Join(eventDatasets, " OR ") + ") "
@@ -449,7 +449,7 @@ func stripReferencesToEventModuleInQuery(object mapStr, objectKey, moduleName st
 }
 
 func replaceFieldEventDatasetWithStreamDataset(data []byte) []byte {
-	return bytes.ReplaceAll(data, []byte("event.dataset"), []byte("stream.dataset"))
+	return bytes.ReplaceAll(data, []byte("event.dataset"), []byte("dataset.name"))
 }
 
 func replaceBlacklistedWords(data []byte) []byte {

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/elastic/package-registry v0.4.1-0.20200604092407-21cd9e458fcf
+	github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e
 	github.com/magefile/mage v1.9.0
 	github.com/pkg/errors v0.9.1
 	gopkg.in/yaml.v2 v2.3.0

go.sum

@@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6 h1:Ehbr7du4rSSEypR8zePr0XRbMhO4PJgcHC9f8fDbgAg=
 github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
-github.com/elastic/package-registry v0.4.1-0.20200604092407-21cd9e458fcf h1:ppkJJKf9guPKNRK4BEm97a0lwlhXaFQAWFfKAm94iw8=
-github.com/elastic/package-registry v0.4.1-0.20200604092407-21cd9e458fcf/go.mod h1:na9XU9OeCK7NOcsrpKxtKHgXdysHUJpq4Dam7EgvpyE=
+github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e h1:XKn6lil8hTPTf5IFAVpwDQGWeWhzNljr6sfOppiFZZ4=
+github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e/go.mod h1:na9XU9OeCK7NOcsrpKxtKHgXdysHUJpq4Dam7EgvpyE=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=

packages/aws/dataset/billing/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/cloudtrail/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/cloudwatch-logs/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/cloudwatch-metrics/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/dynamodb/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/ebs/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/ec2-logs/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/ec2-metrics/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/elb-logs/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/elb-metrics/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/lambda/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/natgateway/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >

packages/aws/dataset/rds/fields/base-fields.yml

@@ -1,15 +1,15 @@
-- name: stream.type
+- name: dataset.type
   type: constant_keyword
   description: >
-    Stream type
-- name: stream.dataset
+    Dataset type.
+- name: dataset.name
   type: constant_keyword
   description: >
-    Stream dataset.
-- name: stream.namespace
+    Dataset name.
+- name: dataset.namespace
   type: constant_keyword
   description: >
-    Stream namespace.
+    Dataset namespace.
 - name: "@timestamp"
   type: date
   description: >