diff --git a/docs/en/apm-server/api-error.asciidoc b/docs/en/apm-server/api-error.asciidoc index 22e3c9da4c..1f62c885eb 100644 --- a/docs/en/apm-server/api-error.asciidoc +++ b/docs/en/apm-server/api-error.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for errors i [source,json] ---- -include::./spec/v2/error.json[] +include::{apm-server-root}/docs/spec/v2/error.json[] ---- diff --git a/docs/en/apm-server/api-event-example.asciidoc b/docs/en/apm-server/api-event-example.asciidoc index 9297e327c7..acdf09c148 100644 --- a/docs/en/apm-server/api-event-example.asciidoc +++ b/docs/en/apm-server/api-event-example.asciidoc @@ -5,5 +5,5 @@ A request body example containing one event for all currently supported event ty [source,json] ---- -include::./data/intake-api/generated/events.ndjson[] +include::{apm-server-root}/docs/data/intake-api/generated/events.ndjson[] ---- diff --git a/docs/en/apm-server/api-metadata.asciidoc b/docs/en/apm-server/api-metadata.asciidoc index 04addb0c51..a11ff73133 100644 --- a/docs/en/apm-server/api-metadata.asciidoc +++ b/docs/en/apm-server/api-metadata.asciidoc @@ -62,5 +62,5 @@ APM Server uses JSON Schema to validate requests. The specification for metadata [source,json] ---- -include::./spec/v2/metadata.json[] +include::{apm-server-root}/docs/spec/v2/metadata.json[] ---- \ No newline at end of file diff --git a/docs/en/apm-server/api-metricset.asciidoc b/docs/en/apm-server/api-metricset.asciidoc index d59ea85d46..67bf2dbf02 100644 --- a/docs/en/apm-server/api-metricset.asciidoc +++ b/docs/en/apm-server/api-metricset.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for metrics [source,json] ---- -include::./spec/v2/metricset.json[] +include::{apm-server-root}/docs/spec/v2/metricset.json[] ---- diff --git a/docs/en/apm-server/api-span.asciidoc b/docs/en/apm-server/api-span.asciidoc index 96d75d31d7..a6609276af 100644 --- a/docs/en/apm-server/api-span.asciidoc +++ b/docs/en/apm-server/api-span.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for spans is [source,json] ---- -include::./spec/v2/span.json[] +include::{apm-server-root}/docs/spec/v2/span.json[] ---- diff --git a/docs/en/apm-server/api-transaction.asciidoc b/docs/en/apm-server/api-transaction.asciidoc index 758496ebcb..2bfa11c247 100644 --- a/docs/en/apm-server/api-transaction.asciidoc +++ b/docs/en/apm-server/api-transaction.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for transact [source,json] ---- -include::./spec/v2/transaction.json[] +include::{apm-server-root}/docs/spec/v2/transaction.json[] ---- diff --git a/docs/en/apm-server/data-model.asciidoc b/docs/en/apm-server/data-model.asciidoc index c5796446a3..18a3dac1b0 100644 --- a/docs/en/apm-server/data-model.asciidoc +++ b/docs/en/apm-server/data-model.asciidoc @@ -88,7 +88,7 @@ This example shows what span documents can look like when indexed in {es}. ==== [source,json] ---- -include::./data/elasticsearch/generated/spans.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/spans.json[] ---- ==== @@ -159,7 +159,7 @@ This example shows what transaction documents can look like when indexed in {es} ==== [source,json] ---- -include::./data/elasticsearch/generated/transactions.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/transactions.json[] ---- ==== @@ -212,7 +212,7 @@ This example shows what error documents can look like when indexed in {es}. ==== [source,json] ---- -include::./data/elasticsearch/generated/errors.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/errors.json[] ---- ==== @@ -390,7 +390,7 @@ These fields make it possible to search and aggregate across various dimensions, [source,json] ---- -include::./data/elasticsearch/metricset.json[] +include::{apm-server-root}/docs/data/elasticsearch/metricset.json[] ---- ==== diff --git a/docs/en/apm-server/data/elasticsearch/generated/errors.json b/docs/en/apm-server/data/elasticsearch/generated/errors.json deleted file mode 100644 index b12468d37e..0000000000 --- a/docs/en/apm-server/data/elasticsearch/generated/errors.json +++ /dev/null @@ -1,589 +0,0 @@ -[ - { - "@timestamp": "2017-05-09T15:04:05.999Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "error": { - "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb", - "grouping_name": "Cannot read property 'baz' of undefined", - "id": "0f0e9d67c1854d21a6f44673ed561ec8", - "log": { - "level": "custom log level", - "message": "Cannot read property 'baz' of undefined" - } - }, - "event": { - "ingested": "2020-04-22T14:52:08.436124Z" - }, - "host": { - "architecture": "x64", - "ip": ["127.0.0.1"], - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "message": "Cannot read property 'baz' of undefined", - "observer": { - "hostname": "ix.lan", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 7788 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "myservice-node" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1494342245999000 - } - }, - { - "@timestamp": "2017-05-09T15:04:05.999Z", - "agent": { - "name": "python", - "version": "4.3" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": 37.751, - "lon": -97.822 - } - }, - "ip": "8.8.8.8" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "error": { - "culprit": "my.module.function_name", - "custom": { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - }, - "exception": [ - { - "attributes": { - "foo": "bar" - }, - "code": "42", - "handled": false, - "message": "The username root is unknown", - "module": "__builtins__", - "stacktrace": [ - { - "abs_path": "/real/file/name.py", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "file/name.py", - "function": "foo", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], - "type": "DbError" - } - ], - "grouping_key": "50f62f37edffc4630c6655ba3ecfcf46", - "grouping_name": "My service could not talk to the database named foobar", - "id": "5f0e9d64c1854d21a6f44673ed561ec8", - "log": { - "level": "warning", - "logger_name": "my.logger.name", - "message": "My service could not talk to the database named foobar", - "param_message": "My service could not talk to the database named %s", - "stacktrace": [ - { - "abs_path": "/real/file/name.py", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "/webpack/file/name.py", - "function": "foo", - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } - ] - } - }, - "event": { - "ingested": "2020-04-22T14:52:08.384032Z" - }, - "host": { - "architecture": "x64", - "ip": "127.0.0.1", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": "Hello World" - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "headers": { - "Array": [ - "foo", - "bar", - "baz" - ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] - }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8", - "tag1": "one", - "tag2": 2 - }, - "message": "My service could not talk to the database named foobar", - "observer": { - "ephemeral_id": "f1838cde-80dd-4af5-b7ac-ffc2d3fccc9d", - "hostname": "ix.lan", - "id": "5d4dc8fe-cb14-47ee-b720-d6bf49f87ef0", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 7788 - }, - "title": "node" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "abc", - "node": { - "name": "myservice-xz" - }, - "runtime": { - "name": "node", - "version": "1.2" - }, - "version": "5.1.3" - }, - "source": { - "ip": "8.8.8.8" - }, - "timestamp": { - "us": 1494342245999999 - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "foo@example.com", - "id": "99", - "name": "foo" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Other", - "original": "Mozilla Chrome Edge" - } - }, - { - "@timestamp": "2017-05-09T15:04:05.000Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "error": { - "exception": [ - { - "type": "connection error" - } - ], - "grouping_key": "18f82051862e494727fa20e0adc15711", - "grouping_name": null, - "id": "7f0e9d68c1854d21a6f44673ed561ec8" - }, - "event": { - "ingested": "2020-04-22T14:52:08.435669Z" - }, - "host": { - "architecture": "x64", - "ip": "127.0.0.1", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "observer": { - "ephemeral_id": "f1838cde-80dd-4af5-b7ac-ffc2d3fccc9d", - "hostname": "ix.lan", - "id": "5d4dc8fe-cb14-47ee-b720-d6bf49f87ef0", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 7788 - }, - "title": "node" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "myservice-node" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1494342245000000 - } - }, - { - "@timestamp": "2017-05-09T15:04:05.000Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "error": { - "exception": [ - { - "code": "35", - "message": "foo is not defined" - } - ], - "grouping_key": "f6b5a2877d9b00d5b32b44c9db039f11", - "grouping_name": "foo is not defined", - "id": "8f0e9d68c1854d21a6f44673ed561ec8" - }, - "event": { - "ingested": "2020-04-22T14:52:08.435117Z" - }, - "host": { - "architecture": "x64", - "ip": "127.0.0.1", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "message": "foo is not defined", - "observer": { - "ephemeral_id": "f1838cde-80dd-4af5-b7ac-ffc2d3fccc9d", - "hostname": "ix.lan", - "id": "5d4dc8fe-cb14-47ee-b720-d6bf49f87ef0", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 7788 - }, - "title": "node" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "myservice-node" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1494342245000000 - } - } -] diff --git a/docs/en/apm-server/data/elasticsearch/generated/rum_v3_errors.json b/docs/en/apm-server/data/elasticsearch/generated/rum_v3_errors.json deleted file mode 100644 index 25f4f7ff46..0000000000 --- a/docs/en/apm-server/data/elasticsearch/generated/rum_v3_errors.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "events": [ - { - "@timestamp": "2017-12-08T12:18:50.291Z", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "192.0.0.1" - }, - "error": { - "culprit": "test/e2e/general-usecase/bundle.js.map", - "exception": [ - { - "message": "Uncaught Error: timeout test error", - "stacktrace": [ - { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "line": { - "column": 18, - "number": 1 - } - }, - { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "library_frame": false, - "line": { - "column": 181, - "number": 1 - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "line": { - "column": 15, - "number": 1 - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "line": { - "column": 199, - "number": 1 - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "line": { - "column": 33, - "number": 1 - } - } - ], - "type": "Error" - } - ], - "grouping_key": "52fbc9c2d1a61bf905b4a11c708006fd", - "id": "aba2688e033848ce9c4e4005f1caa534", - "log": { - "message": "Uncaught Error: log timeout test error", - "stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - } - } - ] - }, - "page": { - "referer": "http://localhost:8000/test/e2e/", - "url": "http://localhost:8000/test/e2e/general-usecase/" - } - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "name": "apm-agent-js", - "version": "1.0.1" - }, - "timestamp": { - "us": 1512735530291000 - }, - "user_agent": { - "original": "rum-2.0" - } - } - ] -} diff --git a/docs/en/apm-server/data/elasticsearch/generated/rum_v3_transactions.json b/docs/en/apm-server/data/elasticsearch/generated/rum_v3_transactions.json deleted file mode 100644 index 228fe417c1..0000000000 --- a/docs/en/apm-server/data/elasticsearch/generated/rum_v3_transactions.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "events": [ - { - "@timestamp": "2018-08-01T10:00:00Z", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "192.0.0.1" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "name": "apm-agent-js", - "version": "1.0.0" - }, - "timestamp": { - "us": 1533117600000000 - }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "duration": { - "us": 643000 - }, - "id": "611f4fa950f04631", - "page": { - "referer": "http://localhost:8000/test/e2e/", - "url": "http://localhost:8000/test/e2e/general-usecase/" - }, - "sampled": true, - "span_count": { - "started": 1 - }, - "type": "page-load" - }, - "user_agent": { - "original": "rum-2.0" - } - }, - { - "@timestamp": "2018-08-01T10:00:00Z", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "parent": { - "id": "611f4fa950f04631" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "name": "apm-agent-js" - }, - "span": { - "duration": { - "us": 643000 - }, - "http": { - "url": { - "original": "http://localhost:8000/test/e2e/general-usecase/span" - } - }, - "id": "aaaaaaaaaaaaaaaa", - "name": "transaction", - "stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - } - } - ], - "start": { - "us": 0 - }, - "type": "transaction" - }, - "timestamp": { - "us": 1533117600000000 - }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "611f4fa950f04631" - } - } - ] -} diff --git a/docs/en/apm-server/data/elasticsearch/generated/spans.json b/docs/en/apm-server/data/elasticsearch/generated/spans.json deleted file mode 100644 index 2c6553e38e..0000000000 --- a/docs/en/apm-server/data/elasticsearch/generated/spans.json +++ /dev/null @@ -1,353 +0,0 @@ -[ - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "outcome": "unknown" - }, - "http": { - "request": { - "method": "GET" - }, - "response": { - "status_code": 200 - } - }, - "labels": { - "span_tag": "something" - }, - "observer": { - "hostname": "ix.lan", - "type": "apm-server", - "version": "8.0.0" - }, - "parent": { - "id": "945254c567a5417e" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "environment": "staging", - "name": "1234_service-12a3" - }, - "span": { - "action": "query", - "db": { - "instance": "customers", - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "duration": { - "us": 3781 - }, - "http": { - "method": "GET", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8000", - "id": "0aaaaaaaaaaaaaaa", - "name": "SELECT FROM product_types", - "stacktrace": [ - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "my2file.js", - "line": { - "number": 10 - } - } - ], - "start": { - "us": 2830 - }, - "subtype": "postgresql", - "sync": false, - "type": "db" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "945254c567a5417e" - }, - "url": { - "original": "http://localhost:8000" - } - }, - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "name": "js-base", - "version": "1.3" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1", - "port": 5432 - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "ephemeral_id": "2f13d8fa-83cd-4356-8123-aabfb47a1808", - "hostname": "goat", - "id": "17ad47dd-5671-4c89-979f-ef4533565ba2", - "type": "apm-server", - "version": "8.0.0" - }, - "parent": { - "id": "85925e55b43f4342" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "environment": "staging", - "name": "serviceabc" - }, - "span": { - "action": "query.custom", - "db": { - "instance": "customers", - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "destination": { - "service": { - "name": "postgresql", - "resource": "postgresql", - "type": "db" - } - }, - "duration": { - "us": 3781 - }, - "id": "15aaaaaaaaaaaaaa", - "name": "SELECT FROM product_types", - "start": { - "us": 2830 - }, - "subtype": "postgresql", - "type": "db.postgresql.query" - }, - "timestamp": { - "us": 1496170422281000 - }, - "trace": { - "id": "85925e55b43f4342aaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "85925e55b43f4342" - } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "ephemeral_id": "2f13d8fa-83cd-4356-8123-aabfb47a1808", - "hostname": "goat", - "id": "17ad47dd-5671-4c89-979f-ef4533565ba2", - "type": "apm-server", - "version": "8.0.0" - }, - "parent": { - "id": "945254c567a5417e" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "environment": "staging", - "name": "1234_service-12a3" - }, - "span": { - "duration": { - "us": 32592 - }, - "id": "1aaaaaaaaaaaaaaa", - "name": "GET /api/types", - "start": { - "us": 0 - }, - "subtype": "external", - "type": "request" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "945254c567a5417e" - } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "ephemeral_id": "2f13d8fa-83cd-4356-8123-aabfb47a1808", - "hostname": "goat", - "id": "17ad47dd-5671-4c89-979f-ef4533565ba2", - "type": "apm-server", - "version": "8.0.0" - }, - "parent": { - "id": "945254c567a5417e" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "environment": "staging", - "name": "1234_service-12a3" - }, - "span": { - "action": "post", - "duration": { - "us": 3564 - }, - "id": "2aaaaaaaaaaaaaaa", - "name": "GET /api/types", - "start": { - "us": 1845 - }, - "subtype": "http", - "type": "request" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "945254c567a5417e" - } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "child": { - "id": [ - "4aaaaaaaaaaaaaaa" - ] - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "ephemeral_id": "2f13d8fa-83cd-4356-8123-aabfb47a1808", - "hostname": "goat", - "id": "17ad47dd-5671-4c89-979f-ef4533565ba2", - "type": "apm-server", - "version": "8.0.0" - }, - "parent": { - "id": "945254c567a5417e" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "environment": "staging", - "name": "1234_service-12a3" - }, - "span": { - "duration": { - "us": 13980 - }, - "id": "3aaaaaaaaaaaaaaa", - "name": "GET /api/types", - "start": { - "us": 0 - }, - "type": "request" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "945254c567a5417e" - } - } -] diff --git a/docs/en/apm-server/data/elasticsearch/generated/transactions.json b/docs/en/apm-server/data/elasticsearch/generated/transactions.json deleted file mode 100644 index 84930961f2..0000000000 --- a/docs/en/apm-server/data/elasticsearch/generated/transactions.json +++ /dev/null @@ -1,403 +0,0 @@ -[ - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "ingested": "2020-08-11T09:55:04.391451Z", - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "ip": ["127.0.0.1"], - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "observer": { - "hostname": "ix.lan", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 6789 - }, - "title": "node" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1496170422281000 - }, - "trace": { - "id": "85925e55b43f4340aaaaaaaaaaaaaaaa" - }, - "transaction": { - "duration": { - "us": 13980 - }, - "id": "85925e55b43f4340", - "name": "GET /api/types", - "result": "failure", - "sampled": true, - "span_count": { - "started": 0 - }, - "type": "request" - }, - "user": { - "email": "foo@bar.com", - "id": "123user", - "name": "foo" - } - }, - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "ingested": "2020-08-11T09:55:04.391639Z", - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "ip": "127.0.0.1", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "observer": { - "ephemeral_id": "fb037b97-0027-401a-9dc4-17d162f2687f", - "hostname": "goat", - "id": "a4daf4ca-b280-4ede-90df-bf62482cec37", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 6789 - }, - "title": "node" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1496170422281999 - }, - "trace": { - "id": "85925e55b43f4342aaaaaaaaaaaaaaaa" - }, - "transaction": { - "duration": { - "us": 13980 - }, - "id": "85925e55b43f4342", - "name": "GET /api/types", - "result": "200", - "sampled": true, - "span_count": { - "dropped": 258, - "started": 1 - }, - "type": "request" - }, - "user": { - "email": "foo@bar.com", - "id": "123user", - "name": "foo" - } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "js-base", - "version": "1.3" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": 37.751, - "lon": -97.822 - } - }, - "ip": "8.8.8.8" - }, - "container": { - "id": "container-id" - }, - "ecs": { - "version": "1.12.0" - }, - "event": { - "ingested": "2020-08-11T09:55:04.338986Z", - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "ip": "127.0.0.1", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "headers": { - "Array": [ - "foo", - "bar", - "baz" - ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] - }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "bool_error": false, - "number_code": 2, - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "observer": { - "ephemeral_id": "fb037b97-0027-401a-9dc4-17d162f2687f", - "hostname": "goat", - "id": "a4daf4ca-b280-4ede-90df-bf62482cec37", - "type": "apm-server", - "version": "8.0.0" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "pid": 1234, - "parent": { - "pid": 6789 - }, - "title": "node" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "serviceabc", - "node": { - "name": "special-name" - }, - "runtime": { - "name": "javascript", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "source": { - "ip": "8.8.8.8" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "custom": { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - }, - "duration": { - "us": 32592 - }, - "id": "945254c567a5417e", - "marks": { - "another_mark": { - "some_float": 10, - "some_long": 10 - }, - "navigationTiming": { - "appBeforeBootstrap": 608.9300000000001, - "navigationStart": -21 - } - }, - "name": "GET /api/types", - "result": "success", - "sampled": true, - "span_count": { - "dropped": 2, - "started": 4 - }, - "type": "request" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "foo@example.com", - "id": "99" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Other", - "original": "Mozilla Chrome Edge" - } - } -] diff --git a/docs/en/apm-server/data/intake-api/generated/events.ndjson b/docs/en/apm-server/data/intake-api/generated/events.ndjson deleted file mode 100644 index ed4af5a7e5..0000000000 --- a/docs/en/apm-server/data/intake-api/generated/events.ndjson +++ /dev/null @@ -1,5 +0,0 @@ -{"metadata":{"process":{"pid":1234,"title":"/usr/lib/jvm/java-10-openjdk-amd64/bin/java","ppid":1,"argv":["-v"]},"system":{"architecture":"amd64","detected_hostname":"8ec7ceb99074","configured_hostname":"host1","platform":"Linux","container":{"id":"8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"},"kubernetes":{"namespace":"default","pod":{"uid":"b17f231da0ad128dc6c6c0b2e82f6f303d3893e3","name":"instrumented-java-service"},"node":{"name":"node-name"}}},"service":{"name":"1234_service-12a3","version":"4.3.0","node":{"configured_name":"8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"},"environment":"production","language":{"name":"Java","version":"10.0.2"},"agent":{"version":"1.10.0","name":"java","ephemeral_id":"e71be9ac-93b0-44b9-a997-5638f6ccfc36"},"framework":{"name":"spring","version":"5.0.0"},"runtime":{"name":"Java","version":"10.0.2"}},"labels":{"group":"experimental","ab_testing":true,"segment":5}}} -{"error":{"id":"9876543210abcdeffedcba0123456789","timestamp":1571657444929001,"trace_id":"0123456789abcdeffedcba0123456789","parent_id":"9632587410abcdef","transaction_id":"1234567890987654","transaction":{"sampled":true,"type":"request"},"culprit":"opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)","log":{"message":"Request method 'POST' not supported","param_message":"Request method 'POST' /events/:event not supported","logger_name":"http404","level":"error","stacktrace":[{"abs_path":"/tmp/Socket.java","filename":"Socket.java","classname":"Request::Socket","function":"connect","vars":{"key":"value"},"pre_context":["line1","line2"],"context_line":"line3","library_frame":true,"lineno":3,"module":"java.net","colno":4,"post_context":["line4","line5"]},{"filename":"SimpleBufferingClientHttpRequest.java","lineno":102,"function":"executeInternal","abs_path":"/tmp/SimpleBufferingClientHttpRequest.java","vars":{"key":"value"}}]},"exception":{"message":"Theusernamerootisunknown","type":"java.net.UnknownHostException","handled":true,"module":"org.springframework.http.client","code":42,"handled":false,"attributes":{"foo":"bar"},"cause":[{"type":"InternalDbError","message":"something wrong writing a file","cause":[{"type":"VeryInternalDbError","message":"disk spinning way too fast"},{"type":"ConnectionError","message":"on top of it,internet doesn't work"}]}],"stacktrace":[{"abs_path":"/tmp/AbstractPlainSocketImpl.java","filename":"AbstractPlainSocketImpl.java","function":"connect","vars":{"key":"value"},"pre_context":["line1","line2"],"context_line":"3","library_frame":true,"lineno":3,"module":"java.net","colno":4,"post_context":["line4","line5"]},{"filename":"AbstractClientHttpRequest.java","lineno":102,"function":"execute","vars":{"key":"value"}}]},"context":{"request":{"socket":{"remote_address":"12.53.12.1","encrypted":true},"http_version":"1.1","method":"POST","url":{"protocol":"https:","full":"https://www.example.com/p/a/t/h?query=string#hash","hostname":"www.example.com","port":8080,"pathname":"/p/a/t/h","search":"?query=string","hash":"#hash","raw":"/p/a/t/h?query=string#hash"},"headers":{"Forwarded": "for=192.168.0.1", "host":"opbeans-java:3000","content-length":"0","cookie":["c1=v1","c2=v2"],"Elastic-Apm-Traceparent":"00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01"},"cookies":{"c1":"v1","c2":"v2"},"env":{"SERVER_SOFTWARE":"nginx","GATEWAY_INTERFACE":"CGI/1.1"},"body":"HelloWorld"},"response":{"status_code":200,"headers":{"content-type":"application/json"},"headers_sent":true,"finished":true},"user":{"id":99,"username":"foo","email":"user@foo.mail"},"tags":{"organization_uuid":"9f0e9d64-c185-4d21-a6f4-4673ed561ec8"},"custom":{"my_key":1,"some_other_value":"foobar","and_objects":{"foo":["bar","baz"]}},"service":{"name":"service1","node":{"configured_name":"node-xyz"},"language":{"version":"1.2"},"framework":{"version":"1","name":"Node"}}}}} -{"span":{"timestamp":1571657444929001,"type":"external","subtype":"http","id":"1234567890aaaade","transaction_id":"1234567890987654","trace_id":"abcdef0123456789abcdef9876543210","parent_id":"abcdef0123456789","action":"connect","sync":true,"name":"GET users-authenticated", "duration":3.781912,"stacktrace":[{"filename":"DispatcherServlet.java","lineno":547},{"function":"render","abs_path":"/tmp/AbstractView.java","filename":"AbstractView.java","lineno":547,"library_frame":true,"vars":{"key":"value"},"module":"org.springframework.web.servlet.view","colno":4,"context_line":"line3"}],"context":{"db":{"instance":"customers","statement":"SELECT * FROM product_types WHERE user_id = ?","type":"sql","user":"postgres","link":"other.db.com"},"http":{"url":"http://localhost:8000","status_code":302,"method":"GET","response":{"status_code":200,"transfer_size":300.12,"encoded_body_size":356,"decoded_body_size":401,"headers":{"content-type":"application/json"}}},"service":{"name":"opbeans-java-1","agent":{"version":"1.10.0-SNAPSHOT","name":"java","ephemeral_id":"e71be9ac-93b0-44b9-a997-5638f6ccfc36"}}}}} -{"transaction":{"timestamp":1571657444929001,"name":"ResourceHttpRequestHandler","type":"http","id":"4340a8e0df1906ecbfa9","trace_id":"0acd456789abcdef0123456789abcdef","parent_id":"abcdefabcdef01234567","span_count":{"started":17,"dropped":0},"duration":32.592981,"result":"HTTP2xx","sampled":true,"context":{"service":{"name":"experimental-java","agent":{"version":"1.10.0-SNAPSHOT","ephemeral_id":"e71be9ac-93b0-44b9-a997-5638f6ccfc36"}},"request":{"socket":{"remote_address":"12.53.12.1:8080","encrypted":true},"http_version":"1.1","method":"POST","url":{"protocol":"https:","full":"https://www.example.com/p/a/t/h?query=string#hash","hostname":"www.example.com","port":"8080","pathname":"/p/a/t/h","search":"?query=string","hash":"#hash","raw":"/p/a/t/h?query=string#hash"},"headers":{"user-agent":["Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36","MozillaChromeEdge"],"content-type":"text/html","cookie":"c1=v1,c2=v2","Elastic-Apm-Traceparent":["00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01"]},"cookies":{"c1":"v1","c2":"v2"},"env":{"SERVER_SOFTWARE":"nginx","GATEWAY_INTERFACE":"CGI/1.1"},"body":{"string":"helloworld","additional":{"foo":{},"bar":123,"req":"additionalinformation"}}},"response":{"status_code":200,"transfer_size":300,"encoded_body_size":356.90,"decoded_body_size":401.90,"headers":{"content-type":"application/json"},"headers_sent":true,"finished":true}, "user":{"id":"99","username":"foo","email":"foo@mail.com"},"tags":{"organization_uuid":"9f0e9d64-c185-4d21-a6f4-4673ed561ec8","tag5":null},"custom":{"my_key":1,"some_other_value":"foobar","and_objects":{"foo":["bar","baz"]},"(":"notavalidregexandthatisfine"}}}} -{"metricset":{"samples":{"transaction.breakdown.count":{"value":12},"transaction.duration.sum.us":{"value":12},"transaction.duration.count":{"value":2},"transaction.self_time.sum.us":{"value":10},"transaction.self_time.count":{"value":2},"span.self_time.count":{"value":1},"span.self_time.sum.us":{"value":633.288},"byte_counter":{"value":1},"short_counter":{"value":227},"integer_gauge":{"value":42767},"long_gauge":{"value":3147483648},"float_gauge":{"value":9.16},"double_gauge":{"value":3.141592653589793},"dotted.float.gauge":{"value":6.12},"negative.d.o.t.t.e.d":{"value":-1022}},"tags":{"code":200,"success":true},"transaction":{"type":"request","name":"GET/"},"span":{"type":"db","subtype":"mysql"},"timestamp":1571657444929001}} diff --git a/docs/en/apm-server/data/intake-api/generated/rum_v3_events.ndjson b/docs/en/apm-server/data/intake-api/generated/rum_v3_events.ndjson deleted file mode 100644 index 9bca2a7d11..0000000000 --- a/docs/en/apm-server/data/intake-api/generated/rum_v3_events.ndjson +++ /dev/null @@ -1,2 +0,0 @@ -{"m": {"se": {"n": "apm-a-rum-test-e2e-general-usecase","ve": "0.0.1","en": "prod","a": {"n": "js-base","ve": "4.8.1"},"ru": {"n": "v8","ve": "8.0"},"la": {"n": "javascript","ve": "6"},"fw": {"n": "angular","ve": "2"}},"u": {"id": 123,"em": "user@email.com","un": "John Doe"},"l": {"testTagKey": "testTagValue"},"n":{"c":{"t":"5G"}}}} -{"x": {"id": "ec2e280be8345240","tid": "286ac3ad697892c406528f13c82e0ce1","pid": "1ef08ac234fca23b455d9e27c660f1ab","n": "general-usecase-initial-p-load","t": "p-load","d": 295,"me": [{"sa": {"xdc": {"v": 1},"xds": {"v": 295},"xbc": {"v": 1}}},{"y": {"t": "Request"},"sa": {"ysc": {"v": 1},"yss": {"v": 1}}},{"y": {"t": "Response"},"sa": {"ysc": {"v": 1},"yss": {"v": 1}}}],"y": [{"id": "bbd8bcc3be14d814","n": "Requesting and receiving the document","t": "hard-navigation","su": "browser-timing","s": 4,"d": 2},{"id": "fc546e87a90a774f","n": "Parsing the document, executing sy. scripts","t": "hard-navigation","su": "browser-timing","s": 14,"d": 106},{"id": "fb8f717930697299","n": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js","t": "rc","su": "script","s": 22.53499999642372,"d": 35.060000023804605,"c": {"h": {"url": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED","r": {"ts": 677175,"ebs": 676864,"dbs": 676864}},"dt": {"se": {"n": "http://localhost:8000","rc": "localhost:8000","t": "rc"},"ad": "localhost","po": 8000}}},{"id": "9b80535c4403c9fb","n": "OpenTracing y","t": "cu","s": 96.92999999970198,"d": 198.07000000029802},{"id": "5ecb8ee030749715","n": "GET /test/e2e/common/data.json","t": "external","su": "h","sy": true,"s": 98.94000005442649,"d": 6.72499998472631,"c": {"h": {"mt": "GET","url": "http://localhost:8000/test/e2e/common/data.json?test=hamid","sc": 200},"dt": {"se": {"n": "http://localhost:8000","rc": "localhost:8000","t": "external"},"ad": "localhost","po": 8000}}},{"id": "27f45fd274f976d4","n": "POST http://localhost:8003/data","t": "external","su": "h","sy": true,"s": 106.52000003028661,"d": 11.584999971091747,"c": {"h": {"mt": "POST","url": "http://localhost:8003/data","sc": 200},"dt": {"se": {"n": "http://localhost:8003","rc": "localhost:8003","t": "external"},"ad": "localhost","po": 8003}}},{"id": "a3c043330bc2015e","pi": 0,"n": "POST http://localhost:8003/fetch","t": "external","su": "h","ac": "action","sy": false,"s": 119.93500008247793,"d": 15.949999913573265,"c": {"h": {"mt": "POST","url": "http://localhost:8003/fetch","sc": 200},"dt": {"se": {"n": "http://localhost:8003","rc": "localhost:8003","t": "external"},"ad": "localhost","po": 8003}}},{"id": "bc7665dc25629379","st": [{"ap": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret","f": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret","fn": "generateError","li": 7662,"co": 9},{"ap": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret","f": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret","fn": "","li": 7666,"co": 3}],"n": "Fire \"DOMContentLoaded\" event","t": "hard-navigation","su": "browser-timing","s": 120,"d": 2,"o":"success"}],"c": {"p": {"rf": "http://localhost:8000/test/e2e/","url": "http://localhost:8000/test/e2e/general-usecase/"},"r": {"sc": 200,"ts": 983,"ebs": 690,"dbs": 690,"he": {"Content-Type": "application/json"}},"q": {"he": {"Accept": "application/json"},"hve": "1.1","mt": "GET"},"u": {"id": "uId","un": "un","em": "em"},"cu": {"testContext": "testContext"},"g": {"testTagKey": "testTagValue"}},"k": {"a": {"lp": 131.03000004775822,"fb": 5,"di": 120,"dc": 138,"ds": 100,"de": 110,"fp": 70.82500003930181},"nt": {"fs": 0,"ls": 0,"le": 0,"cs": 0,"ce": 0,"qs": 4,"rs": 5,"re": 6,"dl": 14,"di": 120,"ds": 120,"de": 122,"dc": 138,"es": 138,"ee": 138}},"yc": {"sd": 8,"dd": 1},"sm": true,"exp":{"cls":1,"fid":2.0,"tbt":3.4,"ignored":5,"also":"ignored","lt":{"count":3,"sum":2.5,"max":1}}}} diff --git a/docs/en/apm-server/data/intake-api/generated/sourcemap/bundle.js.map b/docs/en/apm-server/data/intake-api/generated/sourcemap/bundle.js.map deleted file mode 100644 index 812c802932..0000000000 --- a/docs/en/apm-server/data/intake-api/generated/sourcemap/bundle.js.map +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 3, - "sources": [ - "webpack:///bundle.js", - "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "webpack:///./scripts/index.js", - "webpack:///./index.html", - "webpack:///./scripts/app.js" - ], - "names": [ - "modules", - "__webpack_require__", - "moduleId", - "installedModules", - "exports", - "module", - "id", - "loaded", - "call", - "m", - "c", - "p", - "foo", - "console", - "log", - "foobar" - ], - "mappings": "CAAS,SAAUA,GCInB,QAAAC,GAAAC,GAGA,GAAAC,EAAAD,GACA,MAAAC,GAAAD,GAAAE,OAGA,IAAAC,GAAAF,EAAAD,IACAE,WACAE,GAAAJ,EACAK,QAAA,EAUA,OANAP,GAAAE,GAAAM,KAAAH,EAAAD,QAAAC,IAAAD,QAAAH,GAGAI,EAAAE,QAAA,EAGAF,EAAAD,QAvBA,GAAAD,KAqCA,OATAF,GAAAQ,EAAAT,EAGAC,EAAAS,EAAAP,EAGAF,EAAAU,EAAA,GAGAV,EAAA,KDMM,SAASI,EAAQD,EAASH,GE3ChCA,EAAA,GAEAA,EAAA,GAEAW,OFmDM,SAASP,EAAQD,EAASH,GGxDhCI,EAAAD,QAAAH,EAAAU,EAAA,cH8DM,SAASN,EAAQD,GI9DvB,QAAAQ,KACAC,QAAAC,IAAAC,QAGAH", - "file": "bundle.js", - "sourcesContent": [ - "/******/ (function(modules) { // webpackBootstrap\n/******/ \t// The module cache\n/******/ \tvar installedModules = {};\n/******/\n/******/ \t// The require function\n/******/ \tfunction __webpack_require__(moduleId) {\n/******/\n/******/ \t\t// Check if module is in cache\n/******/ \t\tif(installedModules[moduleId])\n/******/ \t\t\treturn installedModules[moduleId].exports;\n/******/\n/******/ \t\t// Create a new module (and put it into the cache)\n/******/ \t\tvar module = installedModules[moduleId] = {\n/******/ \t\t\texports: {},\n/******/ \t\t\tid: moduleId,\n/******/ \t\t\tloaded: false\n/******/ \t\t};\n/******/\n/******/ \t\t// Execute the module function\n/******/ \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n/******/\n/******/ \t\t// Flag the module as loaded\n/******/ \t\tmodule.loaded = true;\n/******/\n/******/ \t\t// Return the exports of the module\n/******/ \t\treturn module.exports;\n/******/ \t}\n/******/\n/******/\n/******/ \t// expose the modules object (__webpack_modules__)\n/******/ \t__webpack_require__.m = modules;\n/******/\n/******/ \t// expose the module cache\n/******/ \t__webpack_require__.c = installedModules;\n/******/\n/******/ \t// __webpack_public_path__\n/******/ \t__webpack_require__.p = \"\";\n/******/\n/******/ \t// Load entry module and return exports\n/******/ \treturn __webpack_require__(0);\n/******/ })\n/************************************************************************/\n/******/ ([\n/* 0 */\n/***/ function(module, exports, __webpack_require__) {\n\n\t// Webpack\n\t__webpack_require__(1)\n\t\n\t__webpack_require__(2)\n\t\n\tfoo()\n\n\n/***/ },\n/* 1 */\n/***/ function(module, exports, __webpack_require__) {\n\n\tmodule.exports = __webpack_require__.p + \"index.html\"\n\n/***/ },\n/* 2 */\n/***/ function(module, exports) {\n\n\tfunction foo() {\n\t console.log(foobar)\n\t}\n\t\n\tfoo()\n\n\n/***/ }\n/******/ ]);\n\n\n/** WEBPACK FOOTER **\n ** bundle.js\n **/", - " \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\texports: {},\n \t\t\tid: moduleId,\n \t\t\tloaded: false\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.loaded = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(0);\n\n\n\n/** WEBPACK FOOTER **\n ** webpack/bootstrap 6002740481c9666b0d38\n **/", - "// Webpack\nrequire('../index.html')\n\nrequire('./app')\n\nfoo()\n\n\n\n/*****************\n ** WEBPACK FOOTER\n ** ./scripts/index.js\n ** module id = 0\n ** module chunks = 0\n **/", - "module.exports = __webpack_public_path__ + \"index.html\"\n\n\n/*****************\n ** WEBPACK FOOTER\n ** ./index.html\n ** module id = 1\n ** module chunks = 0\n **/", - "function foo() {\n console.log(foobar)\n}\n\nfoo()\n\n\n\n/*****************\n ** WEBPACK FOOTER\n ** ./scripts/app.js\n ** module id = 2\n ** module chunks = 0\n **/" - ], - "sourceRoot": "" -} diff --git a/docs/en/apm-server/legacy/error-api.asciidoc b/docs/en/apm-server/legacy/error-api.asciidoc index 776f2de1bc..63a3ed883a 100644 --- a/docs/en/apm-server/legacy/error-api.asciidoc +++ b/docs/en/apm-server/legacy/error-api.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for errors i [source,json] ---- -include::../spec/v2/error.json[] +include::{apm-server-root}/docs/spec/v2/error.json[] ---- diff --git a/docs/en/apm-server/legacy/error-indices.asciidoc b/docs/en/apm-server/legacy/error-indices.asciidoc index 4b7a74ea5d..e34b43530b 100644 --- a/docs/en/apm-server/legacy/error-indices.asciidoc +++ b/docs/en/apm-server/legacy/error-indices.asciidoc @@ -9,5 +9,5 @@ This example shows what error documents can look like when indexed in {es}: [source,json] ---- -include::../data/elasticsearch/generated/errors.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/errors.json[] ---- diff --git a/docs/en/apm-server/legacy/example-intake-events.asciidoc b/docs/en/apm-server/legacy/example-intake-events.asciidoc index f7731ae9b3..ff9e2c236c 100644 --- a/docs/en/apm-server/legacy/example-intake-events.asciidoc +++ b/docs/en/apm-server/legacy/example-intake-events.asciidoc @@ -5,5 +5,5 @@ A request body example containing one event for all currently supported event ty [source,json] ---- -include::../data/intake-api/generated/events.ndjson[] +include::{apm-server-root}/docs/data/intake-api/generated/events.ndjson[] ---- diff --git a/docs/en/apm-server/legacy/metadata-api.asciidoc b/docs/en/apm-server/legacy/metadata-api.asciidoc index 45c69529ed..f7e99eaf5b 100644 --- a/docs/en/apm-server/legacy/metadata-api.asciidoc +++ b/docs/en/apm-server/legacy/metadata-api.asciidoc @@ -62,5 +62,5 @@ APM Server uses JSON Schema to validate requests. The specification for metadata [source,json] ---- -include::../spec/v2/metadata.json[] +include::{apm-server-root}/docs/spec/v2/metadata.json[] ---- \ No newline at end of file diff --git a/docs/en/apm-server/legacy/metricset-api.asciidoc b/docs/en/apm-server/legacy/metricset-api.asciidoc index 4a42e2e4b3..2dfe58d6ee 100644 --- a/docs/en/apm-server/legacy/metricset-api.asciidoc +++ b/docs/en/apm-server/legacy/metricset-api.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for metrics [source,json] ---- -include::../spec/v2/metricset.json[] +include::{apm-server-root}/docs/spec/v2/metricset.json[] ---- diff --git a/docs/en/apm-server/legacy/metricset-indices.asciidoc b/docs/en/apm-server/legacy/metricset-indices.asciidoc index c6e1502391..f55a97950b 100644 --- a/docs/en/apm-server/legacy/metricset-indices.asciidoc +++ b/docs/en/apm-server/legacy/metricset-indices.asciidoc @@ -136,5 +136,5 @@ These fields make it possible to search and aggregate across various dimensions, [source,json] ---- -include::../data/elasticsearch/metricset.json[] +include::{apm-server-root}/docs/data/elasticsearch/metricset.json[] ---- diff --git a/docs/en/apm-server/legacy/sourcemap-indices.asciidoc b/docs/en/apm-server/legacy/sourcemap-indices.asciidoc index ed1dfc0a68..1009056397 100644 --- a/docs/en/apm-server/legacy/sourcemap-indices.asciidoc +++ b/docs/en/apm-server/legacy/sourcemap-indices.asciidoc @@ -9,5 +9,5 @@ This example shows what a source map document can look like when indexed in {es} [source,json] ---- -include::../data/intake-api/generated/sourcemap/bundle.js.map[] +include::{apm-server-root}/docs/data/intake-api/generated/sourcemap/bundle.js.map[] ---- diff --git a/docs/en/apm-server/legacy/span-api.asciidoc b/docs/en/apm-server/legacy/span-api.asciidoc index 3b42cf25fe..2c44c4eb22 100644 --- a/docs/en/apm-server/legacy/span-api.asciidoc +++ b/docs/en/apm-server/legacy/span-api.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for spans is [source,json] ---- -include::../spec/v2/span.json[] +include::{apm-server-root}/docs/spec/v2/span.json[] ---- diff --git a/docs/en/apm-server/legacy/span-indices.asciidoc b/docs/en/apm-server/legacy/span-indices.asciidoc index 4a82cebf1f..8e02f88447 100644 --- a/docs/en/apm-server/legacy/span-indices.asciidoc +++ b/docs/en/apm-server/legacy/span-indices.asciidoc @@ -9,5 +9,5 @@ This example shows what span documents can look like when indexed in {es}: [source,json] ---- -include::../data/elasticsearch/generated/spans.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/spans.json[] ---- diff --git a/docs/en/apm-server/legacy/transaction-api.asciidoc b/docs/en/apm-server/legacy/transaction-api.asciidoc index 9569174167..30b8ae0363 100644 --- a/docs/en/apm-server/legacy/transaction-api.asciidoc +++ b/docs/en/apm-server/legacy/transaction-api.asciidoc @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for transact [source,json] ---- -include::../spec/v2/transaction.json[] +include::{apm-server-root}/docs/spec/v2/transaction.json[] ---- diff --git a/docs/en/apm-server/legacy/transaction-indices.asciidoc b/docs/en/apm-server/legacy/transaction-indices.asciidoc index e5db23db4e..58c6eb770c 100644 --- a/docs/en/apm-server/legacy/transaction-indices.asciidoc +++ b/docs/en/apm-server/legacy/transaction-indices.asciidoc @@ -9,5 +9,5 @@ This example shows what transaction documents can look like when indexed in {es} [source,json] ---- -include::../data/elasticsearch/generated/transactions.json[] +include::{apm-server-root}/docs/data/elasticsearch/generated/transactions.json[] ---- diff --git a/docs/en/apm-server/release-notes.asciidoc b/docs/en/apm-server/release-notes.asciidoc index 1f6338c414..21d1923ae8 100644 --- a/docs/en/apm-server/release-notes.asciidoc +++ b/docs/en/apm-server/release-notes.asciidoc @@ -9,13 +9,7 @@ This section summarizes the changes in each release. **APM integration and APM Server** -* <> -* <> -* <> -* <> -* <> -* <> -* <> +include::{apm-server-root}/CHANGELOG.asciidoc[tag=list] Looking for a previous version? See the {apm-guide-7x}/release-notes.html[7.x release notes]. @@ -39,4 +33,4 @@ See the {kibana-ref}/release-notes.html[Kibana release notes]. * https://github.com/elastic/apm-aws-lambda/blob/main/CHANGELOG.asciidoc[Elastic APM AWS Lambda extension] -include::{apm-server-root}/CHANGELOG.asciidoc[] +include::{apm-server-root}/CHANGELOG.asciidoc[tag=includes] diff --git a/docs/en/apm-server/spec/rumv3/error.json b/docs/en/apm-server/spec/rumv3/error.json deleted file mode 100644 index b1d5995517..0000000000 --- a/docs/en/apm-server/spec/rumv3/error.json +++ /dev/null @@ -1,847 +0,0 @@ -{ - "$id": "docs/spec/rumv3/error", - "type": "object", - "properties": { - "c": { - "description": "Context holds arbitrary contextual information for the event.", - "type": [ - "null", - "object" - ], - "properties": { - "cu": { - "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", - "type": [ - "null", - "object" - ] - }, - "g": { - "description": "Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", - "type": [ - "null", - "object" - ], - "additionalProperties": { - "type": [ - "null", - "string", - "boolean", - "number" - ], - "maxLength": 1024 - } - }, - "p": { - "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", - "type": [ - "null", - "object" - ], - "properties": { - "rf": { - "description": "Referer holds the URL of the page that 'linked' to the current page.", - "type": [ - "null", - "string" - ] - }, - "url": { - "description": "URL of the current page", - "type": [ - "null", - "string" - ] - } - } - }, - "q": { - "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", - "type": [ - "null", - "object" - ], - "properties": { - "en": { - "description": "Env holds environment variable information passed to the monitored service.", - "type": [ - "null", - "object" - ] - }, - "he": { - "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", - "type": [ - "null", - "object" - ], - "additionalProperties": false, - "patternProperties": { - "[.*]*$": { - "type": [ - "null", - "array", - "string" - ], - "items": { - "type": "string" - } - } - } - }, - "hve": { - "description": "HTTPVersion holds information about the used HTTP version.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "mt": { - "description": "Method holds information about the method of the HTTP request.", - "type": "string", - "maxLength": 1024 - } - }, - "required": [ - "mt" - ] - }, - "r": { - "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", - "type": [ - "null", - "object" - ], - "properties": { - "dbs": { - "description": "DecodedBodySize holds the size of the decoded payload.", - "type": [ - "null", - "integer" - ] - }, - "ebs": { - "description": "EncodedBodySize holds the size of the encoded payload.", - "type": [ - "null", - "integer" - ] - }, - "he": { - "description": "Headers holds the http headers sent in the http response.", - "type": [ - "null", - "object" - ], - "additionalProperties": false, - "patternProperties": { - "[.*]*$": { - "type": [ - "null", - "array", - "string" - ], - "items": { - "type": "string" - } - } - } - }, - "sc": { - "description": "StatusCode sent in the http response.", - "type": [ - "null", - "integer" - ] - }, - "ts": { - "description": "TransferSize holds the total size of the payload.", - "type": [ - "null", - "integer" - ] - } - } - }, - "se": { - "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", - "type": [ - "null", - "object" - ], - "properties": { - "a": { - "description": "Agent holds information about the APM agent capturing the event.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the APM agent capturing information.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ve": { - "description": "Version of the APM agent capturing information.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "en": { - "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "fw": { - "description": "Framework holds information about the framework used in the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ve": { - "description": "Version of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "la": { - "description": "Language holds information about the programming language of the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the used programming language", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ve": { - "description": "Version of the used programming language", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "n": { - "description": "Name of the monitored service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024, - "pattern": "^[a-zA-Z0-9 _-]+$" - }, - "ru": { - "description": "Runtime holds information about the language runtime running the monitored service", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the language runtime", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ve": { - "description": "Version of the language runtime", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "ve": { - "description": "Version of the monitored service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "u": { - "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", - "type": [ - "null", - "object" - ], - "properties": { - "em": { - "description": "Email of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "id": { - "description": "ID identifies the logged in user, e.g. can be the primary key of the user", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "ud": { - "description": "Domain of the user", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "un": { - "description": "Name of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - } - }, - "cl": { - "description": "Culprit identifies the function call which was the primary perpetrator of this event.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ex": { - "description": "Exception holds information about the original error. The information is language specific.", - "type": [ - "null", - "object" - ], - "properties": { - "at": { - "description": "Attributes of the exception.", - "type": [ - "null", - "object" - ] - }, - "ca": { - "description": "Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object" - }, - "minItems": 0 - }, - "cd": { - "description": "Code that is set when the error happened, e.g. database error code.", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "hd": { - "description": "Handled indicates whether the error was caught in the code or not.", - "type": [ - "null", - "boolean" - ] - }, - "mg": { - "description": "Message contains the originally captured error message.", - "type": [ - "null", - "string" - ] - }, - "mo": { - "description": "Module describes the exception type's module namespace.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "st": { - "description": "Stacktrace information of the captured exception.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object", - "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" - }, - "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" - ] - }, - "minItems": 0 - }, - "t": { - "description": "Type of the exception.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "anyOf": [ - { - "properties": { - "mg": { - "type": "string" - } - }, - "required": [ - "mg" - ] - }, - { - "properties": { - "t": { - "type": "string" - } - }, - "required": [ - "t" - ] - } - ] - }, - "id": { - "description": "ID holds the hex encoded 128 random bits ID of the event.", - "type": "string", - "maxLength": 1024 - }, - "log": { - "description": "Log holds additional information added when the error is logged.", - "type": [ - "null", - "object" - ], - "properties": { - "ln": { - "description": "LoggerName holds the name of the used logger instance.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "lv": { - "description": "Level represents the severity of the recorded log.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "mg": { - "description": "Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced.", - "type": "string" - }, - "pmg": { - "description": "ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "st": { - "description": "Stacktrace information of the captured error.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object", - "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" - }, - "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" - ] - }, - "minItems": 0 - } - }, - "required": [ - "mg" - ] - }, - "pid": { - "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "tid": { - "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "timestamp": { - "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch.", - "type": [ - "null", - "integer" - ] - }, - "x": { - "description": "Transaction holds information about the correlated transaction.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "sm": { - "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", - "type": [ - "null", - "boolean" - ] - }, - "t": { - "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "xid": { - "description": "TransactionID holds the hex encoded 64 random bits ID of the correlated transaction.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "required": [ - "id" - ], - "allOf": [ - { - "if": { - "properties": { - "xid": { - "type": "string" - } - }, - "required": [ - "xid" - ] - }, - "then": { - "properties": { - "pid": { - "type": "string" - } - }, - "required": [ - "pid" - ] - } - }, - { - "if": { - "properties": { - "tid": { - "type": "string" - } - }, - "required": [ - "tid" - ] - }, - "then": { - "properties": { - "pid": { - "type": "string" - } - }, - "required": [ - "pid" - ] - } - }, - { - "if": { - "properties": { - "xid": { - "type": "string" - } - }, - "required": [ - "xid" - ] - }, - "then": { - "properties": { - "tid": { - "type": "string" - } - }, - "required": [ - "tid" - ] - } - }, - { - "if": { - "properties": { - "pid": { - "type": "string" - } - }, - "required": [ - "pid" - ] - }, - "then": { - "properties": { - "tid": { - "type": "string" - } - }, - "required": [ - "tid" - ] - } - } - ], - "anyOf": [ - { - "properties": { - "ex": { - "type": "object" - } - }, - "required": [ - "ex" - ] - }, - { - "properties": { - "log": { - "type": "object" - } - }, - "required": [ - "log" - ] - } - ] -} \ No newline at end of file diff --git a/docs/en/apm-server/spec/rumv3/metadata.json b/docs/en/apm-server/spec/rumv3/metadata.json deleted file mode 100644 index 876ac03a6d..0000000000 --- a/docs/en/apm-server/spec/rumv3/metadata.json +++ /dev/null @@ -1,218 +0,0 @@ -{ - "$id": "docs/spec/rumv3/metadata", - "type": "object", - "properties": { - "l": { - "description": "Labels are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Labels are indexed and searchable.", - "type": [ - "null", - "object" - ], - "additionalProperties": { - "type": [ - "null", - "string", - "boolean", - "number" - ], - "maxLength": 1024 - } - }, - "n": { - "description": "Network holds information about the network over which the monitored service is communicating.", - "type": [ - "null", - "object" - ], - "properties": { - "c": { - "type": [ - "null", - "object" - ], - "properties": { - "t": { - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - } - }, - "se": { - "description": "Service metadata about the monitored service.", - "type": "object", - "properties": { - "a": { - "description": "Agent holds information about the APM agent capturing the event.", - "type": "object", - "properties": { - "n": { - "description": "Name of the APM agent capturing information.", - "type": "string", - "maxLength": 1024, - "minLength": 1 - }, - "ve": { - "description": "Version of the APM agent capturing information.", - "type": "string", - "maxLength": 1024 - } - }, - "required": [ - "n", - "ve" - ] - }, - "en": { - "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "fw": { - "description": "Framework holds information about the framework used in the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "ve": { - "description": "Version of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "la": { - "description": "Language holds information about the programming language of the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the used programming language", - "type": "string", - "maxLength": 1024 - }, - "ve": { - "description": "Version of the used programming language", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "required": [ - "n" - ] - }, - "n": { - "description": "Name of the monitored service.", - "type": "string", - "maxLength": 1024, - "minLength": 1, - "pattern": "^[a-zA-Z0-9 _-]+$" - }, - "ru": { - "description": "Runtime holds information about the language runtime running the monitored service", - "type": [ - "null", - "object" - ], - "properties": { - "n": { - "description": "Name of the language runtime", - "type": "string", - "maxLength": 1024 - }, - "ve": { - "description": "Name of the language runtime", - "type": "string", - "maxLength": 1024 - } - }, - "required": [ - "n", - "ve" - ] - }, - "ve": { - "description": "Version of the monitored service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "required": [ - "a", - "n" - ] - }, - "u": { - "description": "User metadata, which can be overwritten on a per event basis.", - "type": [ - "null", - "object" - ], - "properties": { - "em": { - "description": "Email of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "id": { - "description": "ID identifies the logged in user, e.g. can be the primary key of the user", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "ud": { - "description": "Domain of the user", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "un": { - "description": "Name of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - }, - "required": [ - "se" - ] -} \ No newline at end of file diff --git a/docs/en/apm-server/spec/v2/error.json b/docs/en/apm-server/spec/v2/error.json deleted file mode 100644 index 1a421afc1d..0000000000 --- a/docs/en/apm-server/spec/v2/error.json +++ /dev/null @@ -1,1293 +0,0 @@ -{ - "$id": "docs/spec/v2/error", - "description": "errorEvent represents an error or a logged error message, captured by an APM agent in a monitored service.", - "type": "object", - "properties": { - "context": { - "description": "Context holds arbitrary contextual information for the event.", - "type": [ - "null", - "object" - ], - "properties": { - "cloud": { - "description": "Cloud holds fields related to the cloud or infrastructure the events are coming from.", - "type": [ - "null", - "object" - ], - "properties": { - "origin": { - "description": "Origin contains the self-nested field groups for cloud.", - "type": [ - "null", - "object" - ], - "properties": { - "account": { - "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", - "type": [ - "null", - "object" - ], - "properties": { - "id": { - "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", - "type": [ - "null", - "string" - ] - } - } - }, - "provider": { - "description": "Name of the cloud provider.", - "type": [ - "null", - "string" - ] - }, - "region": { - "description": "Region in which this host, resource, or service is located.", - "type": [ - "null", - "string" - ] - }, - "service": { - "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", - "type": [ - "null", - "string" - ] - } - } - } - } - } - } - }, - "custom": { - "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", - "type": [ - "null", - "object" - ] - }, - "message": { - "description": "Message holds details related to message receiving and publishing if the captured event integrates with a messaging system", - "type": [ - "null", - "object" - ], - "properties": { - "age": { - "description": "Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field.", - "type": [ - "null", - "object" - ], - "properties": { - "ms": { - "description": "Age of the message in milliseconds.", - "type": [ - "null", - "integer" - ] - } - } - }, - "body": { - "description": "Body of the received message, similar to an HTTP request body", - "type": [ - "null", - "string" - ] - }, - "headers": { - "description": "Headers received with the message, similar to HTTP request headers.", - "type": [ - "null", - "object" - ], - "additionalProperties": false, - "patternProperties": { - "[.*]*$": { - "type": [ - "null", - "array", - "string" - ], - "items": { - "type": "string" - } - } - } - }, - "queue": { - "description": "Queue holds information about the message queue where the message is received.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name holds the name of the message queue where the message is received.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "routing_key": { - "description": "RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ.", - "type": [ - "null", - "string" - ] - } - } - }, - "page": { - "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", - "type": [ - "null", - "object" - ], - "properties": { - "referer": { - "description": "Referer holds the URL of the page that 'linked' to the current page.", - "type": [ - "null", - "string" - ] - }, - "url": { - "description": "URL of the current page", - "type": [ - "null", - "string" - ] - } - } - }, - "request": { - "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", - "type": [ - "null", - "object" - ], - "properties": { - "body": { - "description": "Body only contais the request bod, not the query string information. It can either be a dictionary (for standard HTTP requests) or a raw request body.", - "type": [ - "null", - "string", - "object" - ] - }, - "cookies": { - "description": "Cookies used by the request, parsed as key-value objects.", - "type": [ - "null", - "object" - ] - }, - "env": { - "description": "Env holds environment variable information passed to the monitored service.", - "type": [ - "null", - "object" - ] - }, - "headers": { - "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", - "type": [ - "null", - "object" - ], - "additionalProperties": false, - "patternProperties": { - "[.*]*$": { - "type": [ - "null", - "array", - "string" - ], - "items": { - "type": "string" - } - } - } - }, - "http_version": { - "description": "HTTPVersion holds information about the used HTTP version.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "method": { - "description": "Method holds information about the method of the HTTP request.", - "type": "string", - "maxLength": 1024 - }, - "socket": { - "description": "Socket holds information related to the recorded request, such as whether or not data were encrypted and the remote address.", - "type": [ - "null", - "object" - ], - "properties": { - "encrypted": { - "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.", - "type": [ - "null", - "boolean" - ] - }, - "remote_address": { - "description": "RemoteAddress holds the network address sending the request. It should be obtained through standard APIs and not be parsed from any headers like 'Forwarded'.", - "type": [ - "null", - "string" - ] - } - } - }, - "url": { - "description": "URL holds information sucha as the raw URL, scheme, host and path.", - "type": [ - "null", - "object" - ], - "properties": { - "full": { - "description": "Full, possibly agent-assembled URL of the request, e.g. https://example.com:443/search?q=elasticsearch#top.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "hash": { - "description": "Hash of the request URL, e.g. 'top'", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "hostname": { - "description": "Hostname information of the request, e.g. 'example.com'.\"", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "pathname": { - "description": "Path of the request, e.g. '/search'", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "port": { - "description": "Port of the request, e.g. '443'. Can be sent as string or int.", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "protocol": { - "description": "Protocol information for the recorded request, e.g. 'https:'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "raw": { - "description": "Raw unparsed URL of the HTTP request line, e.g https://example.com:443/search?q=elasticsearch. This URL may be absolute or relative. For more details, see https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "search": { - "description": "Search contains the query string information of the request. It is expected to have values delimited by ampersands.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - }, - "required": [ - "method" - ] - }, - "response": { - "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", - "type": [ - "null", - "object" - ], - "properties": { - "decoded_body_size": { - "description": "DecodedBodySize holds the size of the decoded payload.", - "type": [ - "null", - "integer" - ] - }, - "encoded_body_size": { - "description": "EncodedBodySize holds the size of the encoded payload.", - "type": [ - "null", - "integer" - ] - }, - "finished": { - "description": "Finished indicates whether the response was finished or not.", - "type": [ - "null", - "boolean" - ] - }, - "headers": { - "description": "Headers holds the http headers sent in the http response.", - "type": [ - "null", - "object" - ], - "additionalProperties": false, - "patternProperties": { - "[.*]*$": { - "type": [ - "null", - "array", - "string" - ], - "items": { - "type": "string" - } - } - } - }, - "headers_sent": { - "description": "HeadersSent indicates whether http headers were sent.", - "type": [ - "null", - "boolean" - ] - }, - "status_code": { - "description": "StatusCode sent in the http response.", - "type": [ - "null", - "integer" - ] - }, - "transfer_size": { - "description": "TransferSize holds the total size of the payload.", - "type": [ - "null", - "integer" - ] - } - } - }, - "service": { - "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", - "type": [ - "null", - "object" - ], - "properties": { - "agent": { - "description": "Agent holds information about the APM agent capturing the event.", - "type": [ - "null", - "object" - ], - "properties": { - "ephemeral_id": { - "description": "EphemeralID is a free format ID used for metrics correlation by agents", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "name": { - "description": "Name of the APM agent capturing information.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "version": { - "description": "Version of the APM agent capturing information.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "environment": { - "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "framework": { - "description": "Framework holds information about the framework used in the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "version": { - "description": "Version of the used framework", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "id": { - "description": "ID holds a unique identifier for the service.", - "type": [ - "null", - "string" - ] - }, - "language": { - "description": "Language holds information about the programming language of the monitored service.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name of the used programming language", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "version": { - "description": "Version of the used programming language", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "name": { - "description": "Name of the monitored service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024, - "pattern": "^[a-zA-Z0-9 _-]+$" - }, - "node": { - "description": "Node must be a unique meaningful name of the service node.", - "type": [ - "null", - "object" - ], - "properties": { - "configured_name": { - "description": "Name of the service node", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "origin": { - "description": "Origin contains the self-nested field groups for service.", - "type": [ - "null", - "object" - ], - "properties": { - "id": { - "description": "Immutable id of the service emitting this event.", - "type": [ - "null", - "string" - ] - }, - "name": { - "description": "Immutable name of the service emitting this event.", - "type": [ - "null", - "string" - ] - }, - "version": { - "description": "The version of the service the data was collected from.", - "type": [ - "null", - "string" - ] - } - } - }, - "runtime": { - "description": "Runtime holds information about the language runtime running the monitored service", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name of the language runtime", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "version": { - "description": "Version of the language runtime", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "target": { - "description": "Target holds information about the outgoing service in case of an outgoing event", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Immutable name of the target service for the event", - "type": [ - "null", - "string" - ] - }, - "type": { - "description": "Immutable type of the target service for the event", - "type": [ - "null", - "string" - ] - } - }, - "anyOf": [ - { - "properties": { - "type": { - "type": "string" - } - }, - "required": [ - "type" - ] - }, - { - "properties": { - "name": { - "type": "string" - } - }, - "required": [ - "name" - ] - } - ] - }, - "version": { - "description": "Version of the monitored service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "tags": { - "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", - "type": [ - "null", - "object" - ], - "additionalProperties": { - "type": [ - "null", - "string", - "boolean", - "number" - ], - "maxLength": 1024 - } - }, - "user": { - "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", - "type": [ - "null", - "object" - ], - "properties": { - "domain": { - "description": "Domain of the logged in user", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "email": { - "description": "Email of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "id": { - "description": "ID identifies the logged in user, e.g. can be the primary key of the user", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "username": { - "description": "Name of the user.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - } - }, - "culprit": { - "description": "Culprit identifies the function call which was the primary perpetrator of this event.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "exception": { - "description": "Exception holds information about the original error. The information is language specific.", - "type": [ - "null", - "object" - ], - "properties": { - "attributes": { - "description": "Attributes of the exception.", - "type": [ - "null", - "object" - ] - }, - "cause": { - "description": "Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object" - }, - "minItems": 0 - }, - "code": { - "description": "Code that is set when the error happened, e.g. database error code.", - "type": [ - "null", - "string", - "integer" - ], - "maxLength": 1024 - }, - "handled": { - "description": "Handled indicates whether the error was caught in the code or not.", - "type": [ - "null", - "boolean" - ] - }, - "message": { - "description": "Message contains the originally captured error message.", - "type": [ - "null", - "string" - ] - }, - "module": { - "description": "Module describes the exception type's module namespace.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "stacktrace": { - "description": "Stacktrace information of the captured exception.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object", - "properties": { - "abs_path": { - "description": "AbsPath is the absolute path of the frame's file.", - "type": [ - "null", - "string" - ] - }, - "classname": { - "description": "Classname of the frame.", - "type": [ - "null", - "string" - ] - }, - "colno": { - "description": "ColumnNumber of the frame.", - "type": [ - "null", - "integer" - ] - }, - "context_line": { - "description": "ContextLine is the line from the frame's file.", - "type": [ - "null", - "string" - ] - }, - "filename": { - "description": "Filename is the relative name of the frame's file.", - "type": [ - "null", - "string" - ] - }, - "function": { - "description": "Function represented by the frame.", - "type": [ - "null", - "string" - ] - }, - "library_frame": { - "description": "LibraryFrame indicates whether the frame is from a third party library.", - "type": [ - "null", - "boolean" - ] - }, - "lineno": { - "description": "LineNumber of the frame.", - "type": [ - "null", - "integer" - ] - }, - "module": { - "description": "Module to which the frame belongs to.", - "type": [ - "null", - "string" - ] - }, - "post_context": { - "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 - }, - "pre_context": { - "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 - }, - "vars": { - "description": "Vars is a flat mapping of local variables of the frame.", - "type": [ - "null", - "object" - ] - } - }, - "anyOf": [ - { - "properties": { - "classname": { - "type": "string" - } - }, - "required": [ - "classname" - ] - }, - { - "properties": { - "filename": { - "type": "string" - } - }, - "required": [ - "filename" - ] - } - ] - }, - "minItems": 0 - }, - "type": { - "description": "Type of the exception.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "anyOf": [ - { - "properties": { - "message": { - "type": "string" - } - }, - "required": [ - "message" - ] - }, - { - "properties": { - "type": { - "type": "string" - } - }, - "required": [ - "type" - ] - } - ] - }, - "id": { - "description": "ID holds the hex encoded 128 random bits ID of the event.", - "type": "string", - "maxLength": 1024 - }, - "log": { - "description": "Log holds additional information added when the error is logged.", - "type": [ - "null", - "object" - ], - "properties": { - "level": { - "description": "Level represents the severity of the recorded log.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "logger_name": { - "description": "LoggerName holds the name of the used logger instance.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "message": { - "description": "Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced.", - "type": "string" - }, - "param_message": { - "description": "ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "stacktrace": { - "description": "Stacktrace information of the captured error.", - "type": [ - "null", - "array" - ], - "items": { - "type": "object", - "properties": { - "abs_path": { - "description": "AbsPath is the absolute path of the frame's file.", - "type": [ - "null", - "string" - ] - }, - "classname": { - "description": "Classname of the frame.", - "type": [ - "null", - "string" - ] - }, - "colno": { - "description": "ColumnNumber of the frame.", - "type": [ - "null", - "integer" - ] - }, - "context_line": { - "description": "ContextLine is the line from the frame's file.", - "type": [ - "null", - "string" - ] - }, - "filename": { - "description": "Filename is the relative name of the frame's file.", - "type": [ - "null", - "string" - ] - }, - "function": { - "description": "Function represented by the frame.", - "type": [ - "null", - "string" - ] - }, - "library_frame": { - "description": "LibraryFrame indicates whether the frame is from a third party library.", - "type": [ - "null", - "boolean" - ] - }, - "lineno": { - "description": "LineNumber of the frame.", - "type": [ - "null", - "integer" - ] - }, - "module": { - "description": "Module to which the frame belongs to.", - "type": [ - "null", - "string" - ] - }, - "post_context": { - "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 - }, - "pre_context": { - "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 - }, - "vars": { - "description": "Vars is a flat mapping of local variables of the frame.", - "type": [ - "null", - "object" - ] - } - }, - "anyOf": [ - { - "properties": { - "classname": { - "type": "string" - } - }, - "required": [ - "classname" - ] - }, - { - "properties": { - "filename": { - "type": "string" - } - }, - "required": [ - "filename" - ] - } - ] - }, - "minItems": 0 - } - }, - "required": [ - "message" - ] - }, - "parent_id": { - "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "timestamp": { - "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch.", - "type": [ - "null", - "integer" - ] - }, - "trace_id": { - "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "transaction": { - "description": "Transaction holds information about the correlated transaction.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "sampled": { - "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", - "type": [ - "null", - "boolean" - ] - }, - "type": { - "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "transaction_id": { - "description": "TransactionID holds the hex encoded 64 random bits ID of the correlated transaction.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - }, - "required": [ - "id" - ], - "allOf": [ - { - "if": { - "properties": { - "transaction_id": { - "type": "string" - } - }, - "required": [ - "transaction_id" - ] - }, - "then": { - "properties": { - "parent_id": { - "type": "string" - } - }, - "required": [ - "parent_id" - ] - } - }, - { - "if": { - "properties": { - "trace_id": { - "type": "string" - } - }, - "required": [ - "trace_id" - ] - }, - "then": { - "properties": { - "parent_id": { - "type": "string" - } - }, - "required": [ - "parent_id" - ] - } - }, - { - "if": { - "properties": { - "transaction_id": { - "type": "string" - } - }, - "required": [ - "transaction_id" - ] - }, - "then": { - "properties": { - "trace_id": { - "type": "string" - } - }, - "required": [ - "trace_id" - ] - } - }, - { - "if": { - "properties": { - "parent_id": { - "type": "string" - } - }, - "required": [ - "parent_id" - ] - }, - "then": { - "properties": { - "trace_id": { - "type": "string" - } - }, - "required": [ - "trace_id" - ] - } - } - ], - "anyOf": [ - { - "properties": { - "exception": { - "type": "object" - } - }, - "required": [ - "exception" - ] - }, - { - "properties": { - "log": { - "type": "object" - } - }, - "required": [ - "log" - ] - } - ] -} \ No newline at end of file diff --git a/docs/en/apm-server/spec/v2/metricset.json b/docs/en/apm-server/spec/v2/metricset.json deleted file mode 100644 index 01760a1f6d..0000000000 --- a/docs/en/apm-server/spec/v2/metricset.json +++ /dev/null @@ -1,301 +0,0 @@ -{ - "$id": "docs/spec/v2/metricset", - "type": "object", - "properties": { - "faas": { - "description": "FAAS holds fields related to Function as a Service events.", - "type": [ - "null", - "object" - ], - "properties": { - "coldstart": { - "description": "Indicates whether a function invocation was a cold start or not.", - "type": [ - "null", - "boolean" - ] - }, - "execution": { - "description": "The request id of the function invocation.", - "type": [ - "null", - "string" - ] - }, - "id": { - "description": "A unique identifier of the invoked serverless function.", - "type": [ - "null", - "string" - ] - }, - "name": { - "description": "The lambda function name.", - "type": [ - "null", - "string" - ] - }, - "trigger": { - "description": "Trigger attributes.", - "type": [ - "null", - "object" - ], - "properties": { - "request_id": { - "description": "The id of the origin trigger request.", - "type": [ - "null", - "string" - ] - }, - "type": { - "description": "The trigger type.", - "type": [ - "null", - "string" - ] - } - } - }, - "version": { - "description": "The lambda function version.", - "type": [ - "null", - "string" - ] - } - } - }, - "samples": { - "description": "Samples hold application metrics collected from the agent.", - "type": "object", - "additionalProperties": false, - "patternProperties": { - "^[^*\"]*$": { - "type": [ - "null", - "object" - ], - "properties": { - "counts": { - "description": "Counts holds the bucket counts for histogram metrics. These numbers must be positive or zero. If Counts is specified, then Values is expected to be specified with the same number of elements, and with the same order.", - "type": [ - "null", - "array" - ], - "items": { - "type": "integer", - "minimum": 0 - }, - "minItems": 0 - }, - "type": { - "description": "Type holds an optional metric type: gauge, counter, or histogram. If Type is unknown, it will be ignored.", - "type": [ - "null", - "string" - ] - }, - "unit": { - "description": "Unit holds an optional unit for the metric. - \"percent\" (value is in the range [0,1]) - \"byte\" - a time unit: \"nanos\", \"micros\", \"ms\", \"s\", \"m\", \"h\", \"d\" If Unit is unknown, it will be ignored.", - "type": [ - "null", - "string" - ] - }, - "value": { - "description": "Value holds the value of a single metric sample.", - "type": [ - "null", - "number" - ] - }, - "values": { - "description": "Values holds the bucket values for histogram metrics. Values must be provided in ascending order; failure to do so will result in the metric being discarded.", - "type": [ - "null", - "array" - ], - "items": { - "type": "number" - }, - "minItems": 0 - } - }, - "allOf": [ - { - "if": { - "properties": { - "counts": { - "type": "array" - } - }, - "required": [ - "counts" - ] - }, - "then": { - "properties": { - "values": { - "type": "array" - } - }, - "required": [ - "values" - ] - } - }, - { - "if": { - "properties": { - "values": { - "type": "array" - } - }, - "required": [ - "values" - ] - }, - "then": { - "properties": { - "counts": { - "type": "array" - } - }, - "required": [ - "counts" - ] - } - } - ], - "anyOf": [ - { - "properties": { - "value": { - "type": "number" - } - }, - "required": [ - "value" - ] - }, - { - "properties": { - "values": { - "type": "array" - } - }, - "required": [ - "values" - ] - } - ] - } - } - }, - "service": { - "description": "Service holds selected information about the correlated service.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name of the correlated service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "version": { - "description": "Version of the correlated service.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "span": { - "description": "Span holds selected information about the correlated transaction.", - "type": [ - "null", - "object" - ], - "properties": { - "subtype": { - "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "type": { - "description": "Type expresses the correlated span's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - }, - "tags": { - "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", - "type": [ - "null", - "object" - ], - "additionalProperties": { - "type": [ - "null", - "string", - "boolean", - "number" - ], - "maxLength": 1024 - } - }, - "timestamp": { - "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch", - "type": [ - "null", - "integer" - ] - }, - "transaction": { - "description": "Transaction holds selected information about the correlated transaction.", - "type": [ - "null", - "object" - ], - "properties": { - "name": { - "description": "Name of the correlated transaction.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - }, - "type": { - "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", - "type": [ - "null", - "string" - ], - "maxLength": 1024 - } - } - } - }, - "required": [ - "samples" - ] -} \ No newline at end of file diff --git a/docs/en/apm-server/upgrading.asciidoc b/docs/en/apm-server/upgrading.asciidoc index 613be6c1ae..7fff4d29bf 100644 --- a/docs/en/apm-server/upgrading.asciidoc +++ b/docs/en/apm-server/upgrading.asciidoc @@ -10,7 +10,7 @@ This guide gives general recommendations for upgrading Elastic APM. include::./agent-server-compatibility.asciidoc[] -include::./apm-breaking.asciidoc[] +include::{apm-server-root}/changelogs/all-breaking-changes.asciidoc[] include::./upgrading-to-8.x.asciidoc[]