-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '7.x' into backport/7.x/pr-65575
- Loading branch information
Showing
153 changed files
with
1,762 additions
and
982 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,53 @@ | ||
[role="xpack"] | ||
[[spans]] | ||
=== Span timeline | ||
=== Trace sample timeline | ||
|
||
TIP: A {apm-overview-ref-v}/transaction-spans.html[span] is the duration of a single event. | ||
Spans are automatically captured by APM agents, and you can also define custom spans. | ||
Each span has a type and is defined by a different color in the timeline/waterfall visualization. | ||
|
||
The span timeline visualization is a bird's-eye view of what your application was doing while it was trying to respond to the request that came in. | ||
The trace sample timeline visualization is a bird's-eye view of what your application was doing while it was trying to respond to a request. | ||
This makes it useful for visualizing where the selected transaction spent most of its time. | ||
|
||
[role="screenshot"] | ||
image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana] | ||
|
||
View a span in detail by clicking on it in the timeline waterfall. | ||
When you click on an SQL Select database query, | ||
For example, when you click on an SQL Select database query, | ||
the information displayed includes the actual SQL that was executed, how long it took, | ||
and the percentage of the trace's total time. | ||
You also get a stack trace, which shows the SQL query in your code. | ||
Finally, APM knows which files are your code and which are just modules or libraries that you've installed. | ||
These library frames will be minimized by default in order to show you the most relevant stack trace. | ||
|
||
TIP: A {apm-overview-ref-v}/transaction-spans.html[span] is the duration of a single event. | ||
Spans are automatically captured by APM agents, and you can also define custom spans. | ||
Each span has a type and is defined by a different color in the timeline/waterfall visualization. | ||
|
||
[role="screenshot"] | ||
image::apm/images/apm-span-detail.png[Example view of a span detail in the APM app in Kibana] | ||
|
||
If your span timeline is colorful, it's indicative of a <<distributed-tracing,distributed trace>>. | ||
[float] | ||
[[distributed-tracing]] | ||
==== Distributed tracing | ||
|
||
If your trace sample timeline is colorful, it's indicative of a distributed trace. | ||
Services in a distributed trace are separated by color and listed in the order they occur. | ||
|
||
[role="screenshot"] | ||
image::apm/images/apm-services-trace.png[Example of distributed trace colors in the APM app in Kibana] | ||
|
||
Don't forget; a distributed trace includes more than one transaction. | ||
As application architectures are shifting from monolithic to more distributed, service-based architectures, | ||
distributed tracing has become a crucial feature of modern application performance monitoring. | ||
It allows you to trace requests through your service architecture automatically, and visualize those traces in one single view in the APM app. | ||
From initial web requests to your front-end service, to queries made to your back-end services, | ||
this makes finding possible bottlenecks throughout your application much easier and faster. | ||
|
||
[role="screenshot"] | ||
image::apm/images/apm-distributed-tracing.png[Example view of the distributed tracing in APM app in Kibana] | ||
|
||
Don't forget; by definition, a distributed trace includes more than one transaction. | ||
When viewing these distributed traces in the timeline waterfall, you'll see this image:apm/images/transaction-icon.png[APM icon] icon, | ||
which indicates the next transaction in the trace. | ||
These transactions can be expanded and viewed in detail by clicking on them. | ||
|
||
After exploring these traces, | ||
you can return to the full trace by clicking *View full trace*. | ||
|
||
TIP: Distributed tracing is supported by all APM agents, and there's no additional configuration needed. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
...nt/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.routes.md
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import Path from 'path'; | ||
import { chmod, writeFile } from 'fs'; | ||
import { promisify } from 'util'; | ||
|
||
import { run } from '../run'; | ||
import { REPO_ROOT } from '../repo_root'; | ||
import { SCRIPT_SOURCE } from './script_source'; | ||
import { getGitDir } from './get_git_dir'; | ||
|
||
const chmodAsync = promisify(chmod); | ||
const writeFileAsync = promisify(writeFile); | ||
|
||
run( | ||
async ({ log }) => { | ||
try { | ||
const gitDir = await getGitDir(); | ||
const installPath = Path.resolve(REPO_ROOT, gitDir, 'hooks/pre-commit'); | ||
|
||
log.info(`Registering Kibana pre-commit git hook...`); | ||
await writeFileAsync(installPath, SCRIPT_SOURCE); | ||
await chmodAsync(installPath, 0o755); | ||
log.success(`Kibana pre-commit git hook was installed successfully.`); | ||
} catch (e) { | ||
log.error(`Kibana pre-commit git hook was not installed as an error occur.`); | ||
throw e; | ||
} | ||
}, | ||
{ | ||
description: 'Register git hooks in the local repo', | ||
} | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.