Update registry for stream.* to dataset.* change

Now the dataset intsead of the stream fields are added and validated. Updating also the base package. This will have to be pushed to the package-storage. Part of elastic#491
ruflin · Jun 3, 2020 · 4f5b7ff · 4f5b7ff
1 parent 1b2782f
commit 4f5b7ff
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/dev/generator/main.go b/dev/generator/main.go
@@ -29,18 +29,18 @@ var (
 const (
  packageDirName = "package"
  streamFields = `
-- name: stream.type
+- name: dataset.type
  type: constant_keyword
  description: >
- Stream type
-- name: stream.dataset
+ Dataset type. This can be logs or metrics.
+- 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: >
@@ -301,9 +301,9 @@ func validateRequiredFields(datasetPath string) error {
  }
 
  // Verify required keys
- err = requireField(allFields, "stream.type", "constant_keyword", err)
- err = requireField(allFields, "stream.dataset", "constant_keyword", err)
- err = requireField(allFields, "stream.namespace", "constant_keyword", err)
+ err = requireField(allFields, "dataset.type", "constant_keyword", err)
+ err = requireField(allFields, "dataset.name", "constant_keyword", err)
+ err = requireField(allFields, "dataset.namespace", "constant_keyword", err)
  err = requireField(allFields, "@timestamp", "date", err)
  return err
 }

diff --git a/dev/packages/example/base/0.2.0/elasticsearch/component-template/events-mappings.json b/dev/packages/example/base/0.2.0/elasticsearch/component-template/events-mappings.json
@@ -19,13 +19,13 @@
  "@timestamp": {
  "type": "date"
  },
- "stream": {
+ "dataset": {
  "properties": {
  "type": {
  "type": "constant_keyword",
  "value": "events"
  },
- "dataset": {
+ "name": {
  "type": "constant_keyword"
  },
  "namespace": {

diff --git a/dev/packages/example/base/0.2.0/elasticsearch/component-template/logs-mappings.json b/dev/packages/example/base/0.2.0/elasticsearch/component-template/logs-mappings.json
@@ -19,13 +19,13 @@
  "@timestamp": {
  "type": "date"
  },
- "stream": {
+ "dataset": {
  "properties": {
  "type": {
  "type": "constant_keyword",
  "value": "logs"
  },
- "dataset": {
+ "name": {
  "type": "constant_keyword"
  },
  "namespace": {

diff --git a/dev/packages/example/base/0.2.0/elasticsearch/component-template/metrics-mappings.json b/dev/packages/example/base/0.2.0/elasticsearch/component-template/metrics-mappings.json
@@ -19,13 +19,13 @@
  "@timestamp": {
  "type": "date"
  },
- "stream": {
+ "dataset": {
  "properties": {
  "type": {
  "type": "constant_keyword",
  "value": "metrics"
  },
- "dataset": {
+ "name": {
  "type": "constant_keyword"
  },
  "namespace": {