Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename dataset.* to datastream.* #618

Merged
merged 4 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Breaking changes

* Change dataset.* fields to datastream.* fields. [#618](https://github.com/elastic/package-registry/pull/618)

### Bugfixes

### Added
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is datastream.dataset now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
description: >
Event timestamp.

- name: dataset
- name: datastream
title: dataset
group: 2
description: Fields describing the new indexing strategy <type>-<name>-<namespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: dataset.type
- name: datastream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
- name: datastream.name
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
- name: datastream.namespace
type: constant_keyword
description: >
Dataset namespace.
Expand Down
6 changes: 3 additions & 3 deletions util/dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ func (d *Dataset) validateRequiredFields() error {
}

// Verify required keys
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, "datastream.type", "constant_keyword", err)
err = requireField(allFields, "datastream.name", "constant_keyword", err)
err = requireField(allFields, "datastream.namespace", "constant_keyword", err)
err = requireField(allFields, "@timestamp", "date", err)
return err
}
Expand Down