Merge pull request #24 from ycombinator/dataset-to-data_stream

Dataset to data stream
elastic · Sep 30, 2020 · 734e3cc · 734e3cc
2 parents a193a34 + 948d511
commit 734e3cc
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 17 deletions.
diff --git a/code/go/internal/spec/statik.go b/code/go/internal/spec/statik.go
diff --git a/...oy_variants/dataset/foo/fields/fields.yml → ...ariants/data_stream/foo/fields/fields.yml b/...oy_variants/dataset/foo/fields/fields.yml → ...ariants/data_stream/foo/fields/fields.yml
diff --git a/..._deploy_variants/dataset/foo/manifest.yml → ...loy_variants/data_stream/foo/manifest.yml b/..._deploy_variants/dataset/foo/manifest.yml → ...loy_variants/data_stream/foo/manifest.yml
diff --git a/...ploy_docker/dataset/foo/fields/fields.yml → ..._docker/data_stream/foo/fields/fields.yml b/...ploy_docker/dataset/foo/fields/fields.yml → ..._docker/data_stream/foo/fields/fields.yml
diff --git a/...es/deploy_docker/dataset/foo/manifest.yml → ...eploy_docker/data_stream/foo/manifest.yml b/...es/deploy_docker/dataset/foo/manifest.yml → ...eploy_docker/data_stream/foo/manifest.yml
diff --git a/..._dev/test/pipeline/test-access-event.json → ..._dev/test/pipeline/test-access-event.json b/..._dev/test/pipeline/test-access-event.json → ..._dev/test/pipeline/test-access-event.json
diff --git a/...line/test-access-event.json-expected.json → ...line/test-access-event.json-expected.json b/...line/test-access-event.json-expected.json → ...line/test-access-event.json-expected.json
diff --git a/...oo/_dev/test/pipeline/test-access-raw.log → ...oo/_dev/test/pipeline/test-access-raw.log b/...oo/_dev/test/pipeline/test-access-raw.log → ...oo/_dev/test/pipeline/test-access-raw.log
diff --git a/.../pipeline/test-access-raw.log-config.json → .../pipeline/test-access-raw.log-config.json b/.../pipeline/test-access-raw.log-config.json → .../pipeline/test-access-raw.log-config.json
diff --git a/...ipeline/test-access-raw.log-expected.json → ...ipeline/test-access-raw.log-expected.json b/...ipeline/test-access-raw.log-expected.json → ...ipeline/test-access-raw.log-expected.json
diff --git a/...s/good/dataset/foo/fields/some_fields.yml → ...od/data_stream/foo/fields/some_fields.yml b/...s/good/dataset/foo/fields/some_fields.yml → ...od/data_stream/foo/fields/some_fields.yml
diff --git a/...st/packages/good/dataset/foo/manifest.yml → ...ackages/good/data_stream/foo/manifest.yml b/...st/packages/good/dataset/foo/manifest.yml → ...ackages/good/data_stream/foo/manifest.yml
diff --git a/...es/good/dataset/pe/fields/some_fields.yml → ...ood/data_stream/pe/fields/some_fields.yml b/...es/good/dataset/pe/fields/some_fields.yml → ...ood/data_stream/pe/fields/some_fields.yml
diff --git a/...est/packages/good/dataset/pe/manifest.yml → ...packages/good/data_stream/pe/manifest.yml b/...est/packages/good/dataset/pe/manifest.yml → ...packages/good/data_stream/pe/manifest.yml
diff --git a/versions/1/dataset/_dev/spec.yml → versions/1/data_stream/_dev/spec.yml b/versions/1/dataset/_dev/spec.yml → versions/1/data_stream/_dev/spec.yml
diff --git a/...dataset/_dev/test/pipeline/event.spec.yml → ..._stream/_dev/test/pipeline/event.spec.yml b/...dataset/_dev/test/pipeline/event.spec.yml → ..._stream/_dev/test/pipeline/event.spec.yml
@@ -1,5 +1,5 @@
 ##
-## Describes the specification for a dataset's various field definition files
+## Describes the specification for a data stream's various field definition files
 ##
 spec:
   # Everything under here follows JSON schema (https://json-schema.org/), written as YAML for readability

diff --git a/...aset/_dev/test/pipeline/expected.spec.yml → ...ream/_dev/test/pipeline/expected.spec.yml b/...aset/_dev/test/pipeline/expected.spec.yml → ...ream/_dev/test/pipeline/expected.spec.yml
@@ -1,5 +1,5 @@
 ##
-## Describes the specification for a dataset's various field definition files
+## Describes the specification for a data stream's various field definition files
 ##
 spec:
   # Everything under here follows JSON schema (https://json-schema.org/), written as YAML for readability

diff --git a/...ons/1/dataset/_dev/test/pipeline/spec.yml → ...1/data_stream/_dev/test/pipeline/spec.yml b/...ons/1/dataset/_dev/test/pipeline/spec.yml → ...1/data_stream/_dev/test/pipeline/spec.yml
diff --git a/versions/1/dataset/_dev/test/spec.yml → versions/1/data_stream/_dev/test/spec.yml b/versions/1/dataset/_dev/test/spec.yml → versions/1/data_stream/_dev/test/spec.yml
diff --git a/versions/1/dataset/_dev/test/system/spec.yml → ...s/1/data_stream/_dev/test/system/spec.yml b/versions/1/dataset/_dev/test/system/spec.yml → ...s/1/data_stream/_dev/test/system/spec.yml
diff --git a/versions/1/dataset/fields/fields.spec.yml → ...ions/1/data_stream/fields/fields.spec.yml b/versions/1/dataset/fields/fields.spec.yml → ...ions/1/data_stream/fields/fields.spec.yml
@@ -1,5 +1,5 @@
 ##
-## Describes the specification for a dataset's various field definition files
+## Describes the specification for a data stream's various field definition files
 ##
 spec:
   # Everything under here follows JSON schema (https://json-schema.org/), written as YAML for readability

diff --git a/versions/1/dataset/fields/spec.yml → versions/1/data_stream/fields/spec.yml b/versions/1/dataset/fields/spec.yml → versions/1/data_stream/fields/spec.yml
diff --git a/versions/1/dataset/manifest.spec.yml → versions/1/data_stream/manifest.spec.yml b/versions/1/dataset/manifest.spec.yml → versions/1/data_stream/manifest.spec.yml
@@ -1,5 +1,5 @@
 ##
-## Describes the specification for a dataset's manifest.yml file
+## Describes the specification for a data stream's manifest.yml file
 ##
 spec:
   # Everything under here follows JSON schema (https://json-schema.org/), written as YAML for readability
@@ -68,32 +68,32 @@ spec:
           - name
           - type
   properties:
-    name:
-      description: Name of dataset
+    dataset:
+      description: Name of data set.
       type: string
     title:
-      description: Title of dataset.
+      description: Title of data stream.
       type: string
       examples:
       - AWS billing metrics
     release:
-      description: Stability of dataset.
+      description: Stability of data stream.
       type: string
       enum:
       - experimental
       - beta
       examples:
       - beta
     type:
-      description: Type of dataset
+      description: Type of data stream
       type: string
       enum:
       - metrics
       - logs
       examples:
       - metrics
     streams:
-      description: Streams offered by dataset.
+      description: Streams offered by data stream.
       type: array
       items:
         type: object

diff --git a/versions/1/dataset/spec.yml → versions/1/data_stream/spec.yml b/versions/1/dataset/spec.yml → versions/1/data_stream/spec.yml
@@ -1,13 +1,13 @@
 spec:
   additionalContents: false
   contents:
-  - description: Folder containing a single dataset definition
+  - description: Folder containing a single data stream definition
     type: folder
     pattern: '[a-z0-9]([a-z0-9_]+[a-z0-9])?'
     required: true
     additionalContents: false
     contents:
-    - description: A dataset's manifest file
+    - description: A data stream's manifest file
       type: file
       contentMediaType: "application/x-yaml"
       name: "manifest.yml"

diff --git a/versions/1/manifest.spec.yml b/versions/1/manifest.spec.yml
@@ -201,7 +201,7 @@ spec:
                   examples:
                   - Collecting Apache access and error logs
                 vars:
-                  $ref: "./dataset/manifest.spec.yml#/definitions/vars"
+                  $ref: "./data_stream/manifest.spec.yml#/definitions/vars"
               required:
               - type
               - title

diff --git a/versions/1/spec.yml b/versions/1/spec.yml
@@ -19,11 +19,11 @@ spec:
     name: "changelog.yml"
     required: false
     $ref: "./changelog.spec.yml"
-  - description: Folder containing dataset definitions
+  - description: Folder containing data stream definitions
     type: folder
-    name: dataset
+    name: data_stream
     required: true
-    $ref: "./dataset/spec.yml"
+    $ref: "./data_stream/spec.yml"
   - description: Folder containing documentation for the package
     type: folder
     name: docs