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.

Sign up for GitHub

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

docs/spec: fix JSON Schema for arrays of objects #4516

Merged
merged 2 commits into from
Dec 14, 2020
Merged

docs/spec: fix JSON Schema for arrays of objects #4516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06bccd
docs/spec: fix JSON Schema for arrays of objects
axw Dec 10, 2020
f390096
Merge branch 'master' into jsonschema-array-items
axw Dec 14, 2020
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
14 changes: 6 additions & 8 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ Contents of "LICENSE":
--------------------------------------------------------------------
Dependency: github.com/elastic/beats/v7
Version: v7.0.0
Revision: 633285e75a03
Revision: 0fda3061815d
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand Down Expand Up @@ -994,8 +994,7 @@ Contents of "NOTICE.txt":

--------------------------------------------------------------------
Dependency: github.com/elastic/gosigar
Version: v0.10.6
Revision: f115143bb233
Version: v0.12.0
License type (autodetected): Apache-2.0
Contents of "NOTICE":

Expand All @@ -1011,7 +1010,7 @@ Contents of "NOTICE":

--------------------------------------------------------------------
Dependency: github.com/fatih/color
Version: v1.9.0
Version: v1.10.0
License type (autodetected): MIT
Contents of "LICENSE.md":

Expand Down Expand Up @@ -3573,8 +3572,7 @@ License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: go.elastic.co/apm
Version: v1.8.1
Revision: 2aef45b9cf4b
Version: v1.9.0
License type (autodetected): Apache-2.0
Contents of "NOTICE":

Expand Down Expand Up @@ -3905,7 +3903,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/net
Revision: 942e2f445f3c
Revision: 69a78807bb2b
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -4007,7 +4005,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/sys
Revision: 201ba4db2418
Revision: 5cba982894dd
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down
315 changes: 159 additions & 156 deletions docs/spec/rumv3/error.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,7 @@
"array"
],
"items": {
"type": [
"null",
"object"
]
"type": "object"
},
"minItems": 0
},
Expand Down Expand Up @@ -407,86 +404,89 @@
"null",
"array"
],
"properties": {
"ap": {
"description": "AbsPath is the absolute path of the frame's file.",
"type": [
"null",
"string"
]
},
"cli": {
"description": "ContextLine is the line from the frame's file.",
"type": [
"null",
"string"
]
},
"cn": {
"description": "Classname of the frame.",
"type": [
"null",
"string"
]
},
"co": {
"description": "ColumnNumber of the frame.",
"type": [
"null",
"integer"
]
},
"f": {
"description": "Filename is the relative name of the frame's file.",
"type": "string"
},
"fn": {
"description": "Function represented by the frame.",
"type": [
"null",
"string"
]
},
"li": {
"description": "LineNumber of the frame.",
"type": [
"null",
"integer"
]
},
"mo": {
"description": "Module to which the frame belongs to.",
"type": [
"null",
"string"
]
},
"poc": {
"description": "PostContext is a slice of code lines immediately before the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
"items": {
"type": "object",
"properties": {
"ap": {
"description": "AbsPath is the absolute path of the frame's file.",
"type": [
"null",
"string"
]
},
"minItems": 0
},
"prc": {
"description": "PreContext is a slice of code lines immediately after the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"cli": {
"description": "ContextLine is the line from the frame's file.",
"type": [
"null",
"string"
]
},
"cn": {
"description": "Classname of the frame.",
"type": [
"null",
"string"
]
},
"co": {
"description": "ColumnNumber of the frame.",
"type": [
"null",
"integer"
]
},
"f": {
"description": "Filename is the relative name of the frame's file.",
"type": "string"
},
"minItems": 0
}
"fn": {
"description": "Function represented by the frame.",
"type": [
"null",
"string"
]
},
"li": {
"description": "LineNumber of the frame.",
"type": [
"null",
"integer"
]
},
"mo": {
"description": "Module to which the frame belongs to.",
"type": [
"null",
"string"
]
},
"poc": {
"description": "PostContext is a slice of code lines immediately before the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
},
"minItems": 0
},
"prc": {
"description": "PreContext is a slice of code lines immediately after the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
},
"minItems": 0
}
},
"required": [
"f"
]
},
"required": [
"f"
],
"minItems": 0
},
"t": {
Expand Down Expand Up @@ -567,86 +567,89 @@
"null",
"array"
],
"properties": {
"ap": {
"description": "AbsPath is the absolute path of the frame's file.",
"type": [
"null",
"string"
]
},
"cli": {
"description": "ContextLine is the line from the frame's file.",
"type": [
"null",
"string"
]
},
"cn": {
"description": "Classname of the frame.",
"type": [
"null",
"string"
]
},
"co": {
"description": "ColumnNumber of the frame.",
"type": [
"null",
"integer"
]
},
"f": {
"description": "Filename is the relative name of the frame's file.",
"type": "string"
},
"fn": {
"description": "Function represented by the frame.",
"type": [
"null",
"string"
]
},
"li": {
"description": "LineNumber of the frame.",
"type": [
"null",
"integer"
]
},
"mo": {
"description": "Module to which the frame belongs to.",
"type": [
"null",
"string"
]
},
"poc": {
"description": "PostContext is a slice of code lines immediately before the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
"items": {
"type": "object",
"properties": {
"ap": {
"description": "AbsPath is the absolute path of the frame's file.",
"type": [
"null",
"string"
]
},
"minItems": 0
},
"prc": {
"description": "PreContext is a slice of code lines immediately after the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"cli": {
"description": "ContextLine is the line from the frame's file.",
"type": [
"null",
"string"
]
},
"cn": {
"description": "Classname of the frame.",
"type": [
"null",
"string"
]
},
"co": {
"description": "ColumnNumber of the frame.",
"type": [
"null",
"integer"
]
},
"f": {
"description": "Filename is the relative name of the frame's file.",
"type": "string"
},
"minItems": 0
}
"fn": {
"description": "Function represented by the frame.",
"type": [
"null",
"string"
]
},
"li": {
"description": "LineNumber of the frame.",
"type": [
"null",
"integer"
]
},
"mo": {
"description": "Module to which the frame belongs to.",
"type": [
"null",
"string"
]
},
"poc": {
"description": "PostContext is a slice of code lines immediately before the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
},
"minItems": 0
},
"prc": {
"description": "PreContext is a slice of code lines immediately after the line from the frame's file.",
"type": [
"null",
"array"
],
"items": {
"type": "string"
},
"minItems": 0
}
},
"required": [
"f"
]
},
"required": [
"f"
],
"minItems": 0
}
},
Expand Down
Loading