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

Add traces as valid type #656

Merged
merged 5 commits into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all 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 @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

Add "traces" as legal event type. [#656](https://github.com/elastic/package-registry/pull/656)

### Deprecated

### Known Issue
Expand Down
2 changes: 1 addition & 1 deletion testdata/generated/categories-experimental.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
"id": "monitoring",
"title": "Monitoring",
"count": 1
"count": 2
},
{
"id": "web",
Expand Down
38 changes: 38 additions & 0 deletions testdata/generated/package/traces/1.0.0/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "fakeapm",
"title": "Not actually APM",
"version": "1.0.0",
"release": "experimental",
"description": "Not actually APM",
"type": "integration",
"download": "/epr/fakeapm/fakeapm-1.0.0.zip",
"path": "/package/fakeapm/1.0.0",
"format_version": "1.0.0",
"readme": "/package/fakeapm/1.0.0/docs/README.md",
"license": "basic",
"categories": [
"monitoring"
],
"conditions": {
"kibana.version": "~7.x.x"
},
"assets": [
"/package/fakeapm/1.0.0/manifest.yml",
"/package/fakeapm/1.0.0/docs/README.md",
"/package/fakeapm/1.0.0/data_stream/traces/manifest.yml",
"/package/fakeapm/1.0.0/data_stream/traces/fields/base-fields.yml"
],
"data_streams": [
{
"type": "traces",
"dataset": "fakeapm.traces",
"title": "notapmtraces",
"release": "experimental",
"package": "fakeapm",
"path": "traces"
}
],
"owner": {
"github": "github.com/elastic/not-apm"
}
}
10 changes: 10 additions & 0 deletions testdata/generated/search-package-experimental.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@
"download": "/epr/experimental/experimental-0.0.1.zip",
"path": "/package/experimental/0.0.1"
},
{
"name": "fakeapm",
"title": "Not actually APM",
"version": "1.0.0",
"release": "experimental",
"description": "Not actually APM",
"type": "integration",
"download": "/epr/fakeapm/fakeapm-1.0.0.zip",
"path": "/package/fakeapm/1.0.0"
},
{
"name": "foo",
"title": "Foo",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- name: data_stream.type
type: constant_keyword
description: >
Data stream type.
- name: data_stream.dataset
type: constant_keyword
description: >
Data stream dataset.
- name: data_stream.namespace
type: constant_keyword
description: >
Data stream namespace.
- name: "@timestamp"
type: date
description: >
Event timestamp.
2 changes: 2 additions & 0 deletions testdata/package/traces/1.0.0/data_stream/traces/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
title: notapmtraces
type: traces
1 change: 1 addition & 0 deletions testdata/package/traces/1.0.0/docs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# TODO
11 changes: 11 additions & 0 deletions testdata/package/traces/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
format_version: 1.0.0
name: fakeapm
description: Not actually APM
version: 1.0.0
title: Not actually APM
categories: ["monitoring"]
type: integration
release: experimental
owner.github: "github.com/elastic/not-apm"
conditions:
kibana.version: "~7.x.x"
1 change: 1 addition & 0 deletions util/data_stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
var validTypes = map[string]string{
"logs": "Logs",
"metrics": "Metrics",
"traces": "Traces",
}

type DataStream struct {
Expand Down