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 config template to policy template and dataset to datastream #641

Merged
Merged
Show file tree
Hide file tree
Changes from 5 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

* Rename config template to policy template and dataset to data stream. [#641](https://github.com/elastic/package-registry/pull/641)

### Bugfixes

### Added
Expand Down
16 changes: 8 additions & 8 deletions openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ components:
$ref: '#/components/schemas/ProductRequirement'
required:
- Kibana
Dataset:
title: Dataset
DataStream:
title: DataStream
type: object
properties:
type:
Expand Down Expand Up @@ -325,23 +325,23 @@ components:
type: array
items:
type: string
config_templates:
policy_templates:
type: array
items:
$ref: '#/components/schemas/ConfigTemplate'
datasets:
$ref: '#/components/schemas/PolicyTemplate'
data_streams:
type: array
items:
$ref: '#/components/schemas/Dataset'
$ref: '#/components/schemas/DataStream'
owner:
$ref: '#/components/schemas/Owner'
required:
- format_version
- categories
- requirement
description: ''
ConfigTemplate:
title: ConfigTemplate
PolicyTemplate:
title: PolicyTemplate
type: object
properties:
name:
Expand Down
20 changes: 10 additions & 10 deletions testdata/generated/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@
"/package/example/1.0.0/docs/README.md",
"/package/example/1.0.0/img/icon.png",
"/package/example/1.0.0/img/kibana-envoyproxy.jpg",
"/package/example/1.0.0/dataset/foo/manifest.yml",
"/package/example/1.0.0/data_stream/foo/manifest.yml",
"/package/example/1.0.0/kibana/dashboard/0c610510-5cbd-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/0a994af0-5c9d-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/36f872a0-5c03-11e9-85b4-19d0072eb4f2.json",
"/package/example/1.0.0/kibana/visualization/38f96190-5c99-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/dataset/foo/fields/base-fields.yml",
"/package/example/1.0.0/dataset/foo/agent/stream/stream.yml.hbs",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
"/package/example/1.0.0/data_stream/foo/fields/base-fields.yml",
"/package/example/1.0.0/data_stream/foo/agent/stream/stream.yml.hbs",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
],
"config_templates": [
"policy_templates": [
{
"name": "logs",
"title": "Logs datasource",
Expand All @@ -60,7 +60,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "bar.noo",
Expand Down
24 changes: 12 additions & 12 deletions testdata/generated/package/datasources/1.0.0/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"assets": [
"/package/datasources/1.0.0/manifest.yml",
"/package/datasources/1.0.0/docs/README.md",
"/package/datasources/1.0.0/dataset/examplelog1/manifest.yml",
"/package/datasources/1.0.0/dataset/examplelog2/manifest.yml",
"/package/datasources/1.0.0/dataset/examplemetric/manifest.yml",
"/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml",
"/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml",
"/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml",
"/package/datasources/1.0.0/dataset/examplelog1/agent/stream/logs.yml",
"/package/datasources/1.0.0/dataset/examplelog1/agent/stream/syslog.yml",
"/package/datasources/1.0.0/dataset/examplelog2/agent/stream/stream.yml.hbs",
"/package/datasources/1.0.0/dataset/examplemetric/agent/stream/stream.yml.hbs"
"/package/datasources/1.0.0/data_stream/examplelog1/manifest.yml",
"/package/datasources/1.0.0/data_stream/examplelog2/manifest.yml",
"/package/datasources/1.0.0/data_stream/examplemetric/manifest.yml",
"/package/datasources/1.0.0/data_stream/examplelog1/fields/base-fields.yml",
"/package/datasources/1.0.0/data_stream/examplelog2/fields/base-fields.yml",
"/package/datasources/1.0.0/data_stream/examplemetric/fields/base-fields.yml",
"/package/datasources/1.0.0/data_stream/examplelog1/agent/stream/logs.yml",
"/package/datasources/1.0.0/data_stream/examplelog1/agent/stream/syslog.yml",
"/package/datasources/1.0.0/data_stream/examplelog2/agent/stream/stream.yml.hbs",
"/package/datasources/1.0.0/data_stream/examplemetric/agent/stream/stream.yml.hbs"
],
"config_templates": [
"policy_templates": [
{
"name": "nginx",
"title": "Datasource title",
Expand Down Expand Up @@ -84,7 +84,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "datasources.examplelog1",
Expand Down
12 changes: 6 additions & 6 deletions testdata/generated/package/default_pipeline/0.0.2/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"assets": [
"/package/default_pipeline/0.0.2/manifest.yml",
"/package/default_pipeline/0.0.2/docs/README.md",
"/package/default_pipeline/0.0.2/dataset/foo/manifest.yml",
"/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml",
"/package/default_pipeline/0.0.2/dataset/foo/agent/stream/stream.yml.hbs",
"/package/default_pipeline/0.0.2/dataset/foo/elasticsearch/ingest_pipeline/default.json"
"/package/default_pipeline/0.0.2/data_stream/foo/manifest.yml",
"/package/default_pipeline/0.0.2/data_stream/foo/fields/base-fields.yml",
"/package/default_pipeline/0.0.2/data_stream/foo/agent/stream/stream.yml.hbs",
"/package/default_pipeline/0.0.2/data_stream/foo/elasticsearch/ingest_pipeline/default.json"
],
"config_templates": [
"policy_templates": [
{
"name": "logs",
"title": "Logs datasource",
Expand All @@ -35,7 +35,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "default_pipeline.foo",
Expand Down
8 changes: 4 additions & 4 deletions testdata/generated/package/ecs_style_dataset/0.0.1/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"assets": [
"/package/ecs_style_dataset/0.0.1/manifest.yml",
"/package/ecs_style_dataset/0.0.1/docs/README.md",
"/package/ecs_style_dataset/0.0.1/dataset/foo/manifest.yml",
"/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml"
"/package/ecs_style_dataset/0.0.1/data_stream/foo/manifest.yml",
"/package/ecs_style_dataset/0.0.1/data_stream/foo/fields/fields.yml"
],
"config_templates": [
"policy_templates": [
{
"name": "logs",
"title": "Logs datasource",
Expand All @@ -32,7 +32,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "ecs_style_dataset.foo",
Expand Down
20 changes: 10 additions & 10 deletions testdata/generated/package/example/1.0.0/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@
"/package/example/1.0.0/docs/README.md",
"/package/example/1.0.0/img/icon.png",
"/package/example/1.0.0/img/kibana-envoyproxy.jpg",
"/package/example/1.0.0/dataset/foo/manifest.yml",
"/package/example/1.0.0/data_stream/foo/manifest.yml",
"/package/example/1.0.0/kibana/dashboard/0c610510-5cbd-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/0a994af0-5c9d-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/36f872a0-5c03-11e9-85b4-19d0072eb4f2.json",
"/package/example/1.0.0/kibana/visualization/38f96190-5c99-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json",
"/package/example/1.0.0/dataset/foo/fields/base-fields.yml",
"/package/example/1.0.0/dataset/foo/agent/stream/stream.yml.hbs",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
"/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
"/package/example/1.0.0/data_stream/foo/fields/base-fields.yml",
"/package/example/1.0.0/data_stream/foo/agent/stream/stream.yml.hbs",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
"/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
],
"config_templates": [
"policy_templates": [
{
"name": "logs",
"title": "Logs datasource",
Expand All @@ -60,7 +60,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "bar.noo",
Expand Down
12 changes: 6 additions & 6 deletions testdata/generated/package/multiple_false/0.0.1/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"assets": [
"/package/multiple_false/0.0.1/manifest.yml",
"/package/multiple_false/0.0.1/docs/README.md",
"/package/multiple_false/0.0.1/dataset/foo/manifest.yml",
"/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml",
"/package/multiple_false/0.0.1/dataset/foo/agent/stream/stream.yml.hbs",
"/package/multiple_false/0.0.1/dataset/foo/elasticsearch/ingest_pipeline/default.json"
"/package/multiple_false/0.0.1/data_stream/foo/manifest.yml",
"/package/multiple_false/0.0.1/data_stream/foo/fields/base-fields.yml",
"/package/multiple_false/0.0.1/data_stream/foo/agent/stream/stream.yml.hbs",
"/package/multiple_false/0.0.1/data_stream/foo/elasticsearch/ingest_pipeline/default.json"
],
"config_templates": [
"policy_templates": [
{
"name": "logs",
"title": "Logs datasource",
Expand All @@ -34,7 +34,7 @@
"multiple": false
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "multiple_false.foo",
Expand Down
8 changes: 4 additions & 4 deletions testdata/generated/package/no_stream_configs/1.0.0/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"assets": [
"/package/no_stream_configs/1.0.0/manifest.yml",
"/package/no_stream_configs/1.0.0/docs/README.md",
"/package/no_stream_configs/1.0.0/dataset/log/manifest.yml",
"/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml",
"/package/no_stream_configs/1.0.0/dataset/log/fields/ecs.yml"
"/package/no_stream_configs/1.0.0/data_stream/log/manifest.yml",
"/package/no_stream_configs/1.0.0/data_stream/log/fields/base-fields.yml",
"/package/no_stream_configs/1.0.0/data_stream/log/fields/ecs.yml"
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "no_stream_configs.log",
Expand Down
8 changes: 4 additions & 4 deletions testdata/generated/package/reference/1.0.0/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"/package/reference/1.0.0/manifest.yml",
"/package/reference/1.0.0/docs/README.md",
"/package/reference/1.0.0/img/icon.svg",
"/package/reference/1.0.0/dataset/reference/manifest.yml",
"/package/reference/1.0.0/dataset/reference/fields/base-fields.yml"
"/package/reference/1.0.0/data_stream/reference/manifest.yml",
"/package/reference/1.0.0/data_stream/reference/fields/base-fields.yml"
],
"config_templates": [
"policy_templates": [
{
"name": "nginx",
"title": "Nginx logs and metrics.",
Expand Down Expand Up @@ -62,7 +62,7 @@
"multiple": true
}
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "reference.reference",
Expand Down
14 changes: 7 additions & 7 deletions testdata/generated/package/yamlpipeline/1.0.0/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"assets": [
"/package/yamlpipeline/1.0.0/manifest.yml",
"/package/yamlpipeline/1.0.0/docs/README.md",
"/package/yamlpipeline/1.0.0/dataset/log/manifest.yml",
"/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml",
"/package/yamlpipeline/1.0.0/dataset/log/agent/stream/stream.yml.hbs",
"/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-entry.yml",
"/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-json.yml",
"/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-plaintext.yml"
"/package/yamlpipeline/1.0.0/data_stream/log/manifest.yml",
"/package/yamlpipeline/1.0.0/data_stream/log/fields/base-fields.yml",
"/package/yamlpipeline/1.0.0/data_stream/log/agent/stream/stream.yml.hbs",
"/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-entry.yml",
"/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-json.yml",
"/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-plaintext.yml"
],
"datasets": [
"data_streams": [
{
"type": "logs",
"name": "yamlpipeline.log",
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/datasources/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type: integration
license: basic
release: beta

config_templates:
policy_templates:
-
# Do we need a name for the data source?
name: nginx
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/default_pipeline/0.0.2/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type: integration
release: beta


config_templates:
policy_templates:
- name: logs
title: Logs datasource
description: Datasource for your log files.
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/ecs_style_dataset/0.0.1/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ categories: ["monitoring"]
type: integration
release: beta

config_templates:
policy_templates:
- name: logs
title: Logs datasource
description: Datasource for your log files.
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/example/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ screenshots:
size: 1492x1464
type: image/png

config_templates:
policy_templates:
- name: logs
title: Logs datasource
description: Datasource for your log files.
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/multiple_false/0.0.1/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type: integration
release: beta


config_templates:
policy_templates:
- name: logs
title: Logs datasource
description: Datasource for your log files.
Expand Down
2 changes: 1 addition & 1 deletion testdata/package/reference/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ icons:

# Defining a datasource allows the UI to generate a form for each input and generate the agent
# config out of it. For a visual guide on what fields is used how in the UI, check out https://github.com/elastic/package-registry/pull/242
config_templates:
policy_templates:
-
# Do we need a name for the data source?
name: nginx
Expand Down
Loading