Skip to content

Commit

Permalink
update generated files
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruflin
ruflin committed Jun 29, 2020
1 parent 97d02fc commit 9bf9866
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 172 deletions.
139 changes: 0 additions & 139 deletions testdata/generated/package/datasources/1.0.0/index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,144 +188,5 @@
"package": "datasources",
"path": "examplemetric"
}
<<<<<<< HEAD:testdata/generated/package/datasources/1.0.0/index.json
],
"datasources": [
{
"name": "nginx",
"title": "Datasource title",
"description": "Details about the data source.",
"inputs": [
{
"type": "nginx/metrics",
"vars": [
{
"name": "hosts",
"type": "text",
"description": "Nginx hosts",
"multi": true,
"required": true,
"show_user": false,
"default": [
"http://127.0.0.1"
]
},
{
"name": "period",
"type": "duration",
"description": "Collection period. Valid values: 10s, 5m, 2h",
"multi": false,
"required": false,
"show_user": false,
"default": "10s"
},
{
"name": "username",
"type": "text",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "password",
"type": "password",
"multi": false,
"required": false,
"show_user": false
}
],
"description": "Collecting metrics for nginx.",
"streams": [
{
"input": "nginx/metrics",
"vars": [
{
"name": "url",
"type": "text",
"description": "Paths to the nginx access log file.",
"multi": false,
"required": true,
"show_user": false,
"default": "localhost"
}
],
"dataset": "datasources.examplemetric",
"template_path": "stream.yml.hbs",
"template": "metric: foo\n",
"title": "Title of the stream",
"description": "Not enabled data source.",
"enabled": false
}
]
},
{
"type": "logs",
"description": "Collect nginx logs.",
"streams": [
{
"input": "logs",
"vars": [
{
"name": "paths",
"type": "text",
"description": "Paths to the nginx error log file.",
"multi": true,
"required": true,
"show_user": false,
"default": [
"/var/log/nginx/error.log*"
]
}
],
"dataset": "datasources.examplelog1",
"template_path": "logs.yml",
"template": "foo: bar\n",
"title": "Title of the stream",
"description": "Description of the stream with more details.",
"enabled": true
},
{
"input": "logs",
"vars": [
{
"name": "paths",
"type": "text",
"description": "Paths to the nginx access log file.",
"multi": true,
"required": true,
"show_user": false,
"default": [
"/var/log/nginx/access.log*"
]
}
],
"dataset": "datasources.examplelog2",
"template_path": "stream.yml.hbs",
"template": "foo: bar\n",
"title": "Title of the stream",
"description": "Description of the stream with more details.",
"enabled": true
}
]
},
{
"type": "syslog",
"streams": [
{
"input": "syslog",
"dataset": "datasources.examplelog1",
"template_path": "syslog.yml",
"template": "syslog: bar\n",
"title": "Title of the stream",
"description": "Description of the stream with more details.",
"enabled": true
}
]
}
],
"multiple": true
}
=======
>>>>>>> cada7b07... rebase on master:docs/api/package/datasources/1.0.0/index.json
]
}
63 changes: 32 additions & 31 deletions testdata/generated/package/reference/1.0.0/index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,37 +40,7 @@
"/package/reference/1.0.0/dataset/reference/manifest.yml",
"/package/reference/1.0.0/dataset/reference/fields/base-fields.yml"
],
"datasets": [
{
"id": "reference.reference",
"title": "Reference Logs Title",
"release": "beta",
"type": "logs",
"streams": [
{
"input": "logs",
"vars": [
{
"name": "paths",
"type": "text",
"title": "Example variable title",
"description": "Description around how a variable should be used, what values it can contain and it can even contain **Markdown** or links.\n",
"multi": true,
"required": true,
"show_user": false,
"default": "foo"
}
],
"title": "Title reference stream",
"description": "Collecting the nginx access logs from file.",
"enabled": true
}
],
"package": "reference",
"path": "reference"
}
],
"datasources": [
"config_templates": [
{
"name": "nginx",
"title": "Nginx logs and metrics.",
Expand Down Expand Up @@ -99,6 +69,37 @@
"multiple": true
}
],
"datasets": [
{
"type": "logs",
"name": "reference.reference",
"title": "Reference Logs Title",
"release": "beta",
"streams": [
{
"input": "logs",
"vars": [
{
"name": "paths",
"type": "text",
"title": "Example variable title",
"description": "Description around how a variable should be used, what values it can contain and it can even contain **Markdown** or links.\n",
"multi": true,
"required": true,
"show_user": false,
"default": "foo"
}
],
"template_path": "stream.yml.hbs",
"title": "Title reference stream",
"description": "Collecting the nginx access logs from file.",
"enabled": true
}
],
"package": "reference",
"path": "reference"
}
],
"owner": {
"github": "ruflin"
}
Expand Down
5 changes: 3 additions & 2 deletions testdata/generated/package/yamlpipeline/1.0.0/index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
],
"datasets": [
{
"id": "yamlpipeline.log",
"type": "logs",
"name": "yamlpipeline.log",
"title": "Log Yaml pipeline",
"release": "experimental",
"type": "logs",
"ingest_pipeline": "pipeline-entry",
"streams": [
{
Expand All @@ -51,6 +51,7 @@
"show_user": false
}
],
"template_path": "stream.yml.hbs",
"title": "Yamlpipline example logs",
"description": "Yamlpipeline example",
"enabled": true
Expand Down

0 comments on commit 9bf9866

Please sign in to comment.