Skip to content

docs: version links (master) #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2018
Merged

docs: version links (master) #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9431f31
docs: version links
bmorelli25 Dec 7, 2018
6cf826a
Merge branch 'master' into docs-version-links-master
bmorelli25 Dec 11, 2018
68ee4a6
Merge branch 'master' into docs-version-links-master
bmorelli25 Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/api.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ except ValueError:
* `exc_info`: A `(type, value, traceback)` tuple as returned by https://docs.python.org/3/library/sys.html#sys.exc_info[`sys.exc_info()`]. If not provided, it will be captured automatically.
* `date`: A `datetime.datetime` object representing the occurrence time of the error. If left empty, it defaults to `datetime.datetime.utcnow()`.
* `context`: A dictionary with contextual information. This dictionary must follow the
{apm-server-ref}/events-api.html#events-api-errors[Context] schema definition.
{apm-server-ref-v}/events-api.html#events-api-errors[Context] schema definition.
* `custom`: A dictionary of custom data you want to attach to the event.
* `handled`: A boolean to indicate if this exception was handled or not.

Expand Down Expand Up @@ -91,7 +91,7 @@ client.capture_message(param_message={
* `date`: A `datetime.datetime` object representing the occurrence time of the error.
If left empty, it defaults to `datetime.datetime.utcnow()`.
* `context`: A dictionary with contextual information. This dictionary must follow the
{apm-server-ref}/events-api.html#events-api-errors[Context] schema definition.
{apm-server-ref-v}/events-api.html#events-api-errors[Context] schema definition.
* `custom`: A dictionary of custom data you want to attach to the event.

Returns the id of the message as a string.
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ It has built-in support for Django and Flask performance metrics and error loggi
[[additional-components]]
=== Additional Components

APM Agents work in conjunction with the {apm-server-ref}/index.html[APM Server], {ref}/index.html[Elasticsearch], and {kibana-ref}/index.html[Kibana].
Please view the {apm-get-started-ref}/index.html[APM Overview] for details on how these components work together.
APM Agents work in conjunction with the {apm-server-ref-v}/index.html[APM Server], {ref}/index.html[Elasticsearch], and {kibana-ref}/index.html[Kibana].
Please view the {apm-overview-ref-v}/index.html[APM Overview] for details on how these components work together.

[[framework-support]]
The Elastic APM Python Agent comes with support for the following frameworks:
Expand Down
1 change: 1 addition & 0 deletions docs/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
:branch: current
:server-branch: 6.5
include::{asciidoc-dir}/../../shared/attributes.asciidoc[]

ifdef::env-github[]
Expand Down