Skip to content

Commit fd824ee

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 88591-severity-levels
2 parents df242a3 + be41a9f commit fd824ee

File tree

1,279 files changed

+33903
-15206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,279 files changed

+33903
-15206
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
# APM
6767
/x-pack/plugins/apm/ @elastic/apm-ui
6868
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
69+
/x-pack/test/apm_api_integration/ @elastic/apm-ui
6970
/src/plugins/apm_oss/ @elastic/apm-ui
7071
/src/apm.js @elastic/kibana-core @vigneshshanmugam
7172
/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
@@ -80,6 +81,7 @@
8081
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
8182
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
8283
/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
84+
/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
8385

8486
# Beats
8587
/x-pack/plugins/beats_management/ @elastic/beats
@@ -99,7 +101,7 @@
99101

100102
# Observability UIs
101103
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
102-
/x-pack/plugins/fleet/ @elastic/ingest-management
104+
/x-pack/plugins/fleet/ @elastic/fleet
103105
/x-pack/plugins/observability/ @elastic/observability-ui
104106
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
105107
/x-pack/plugins/uptime @elastic/uptime

.github/paths-labeller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- "src/plugins/bfetch/**/*.*"
1111
- "Team:apm":
1212
- "x-pack/plugins/apm/**/*.*"
13-
- "Team:Ingest Management":
13+
- "Team:Fleet":
1414
- "x-pack/plugins/fleet/**/*.*"
1515
- "x-pack/test/fleet_api_integration/**/*.*"
1616
- "Team:uptime":
9.69 KB
Loading

docs/apm/images/apm-traces.png

-45.5 KB
Loading
-132 KB
Loading
-116 KB
Loading

docs/apm/service-overview.asciidoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Response times for the service. You can filter the *Latency* chart to display th
1717
image::apm/images/latency.png[Service latency]
1818

1919
[discrete]
20-
[[service-traffic-transactions]]
21-
=== Traffic and transactions
20+
[[service-throughput-transactions]]
21+
=== Throughput and transactions
2222

2323
The *Throughput* chart visualizes the average number of transactions per minute for the selected service.
2424

@@ -62,6 +62,9 @@ each dependency. By default, dependencies are sorted by _Impact_ to show the mos
6262
If there is a particular dependency you are interested in, click *View service map* to view the related
6363
<<service-maps, service map>>.
6464

65+
IMPORTANT: A known issue prevents Real User Monitoring (RUM) dependencies from being shown in the
66+
*Dependencies* table. We are working on a fix for this issue.
67+
6568
[role="screenshot"]
6669
image::apm/images/spans-dependencies.png[Span type duration and dependencies]
6770

docs/apm/transactions.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ If there's a weird spike that you'd like to investigate,
1717
you can simply zoom in on the graph - this will adjust the specific time range,
1818
and all of the data on the page will update accordingly.
1919

20-
*Transactions per minute*::
21-
Visualize response codes: `2xx`, `3xx`, `4xx`, etc.,
22-
and is useful for determining if you're serving more of one code than you typically do.
23-
Like in the Transaction duration graph, you can zoom in on anomalies to further investigate them.
20+
*Throughput*::
21+
Visualize response codes: `2xx`, `3xx`, `4xx`, etc.
22+
Useful for determining if more responses than usual are being served with a particular response code.
23+
Like in the latency graph, you can zoom in on anomalies to further investigate them.
2424

2525
*Error rate*::
2626
Visualize the total number of transactions with errors divided by the total number of transactions.
@@ -157,4 +157,4 @@ and solve problems.
157157
[role="screenshot"]
158158
image::apm/images/apm-logs-tab.png[APM logs tab]
159159

160-
// To do: link to log correlation
160+
// To do: link to log correlation

docs/apm/troubleshooting.asciidoc

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
[[troubleshooting]]
2-
== Troubleshoot common problems
2+
== Troubleshooting
33

44
++++
55
<titleabbrev>Troubleshooting</titleabbrev>
66
++++
77

8-
If you have something to add to this section, please consider creating a pull request with
9-
your proposed changes at https://github.com/elastic/kibana.
10-
11-
Also, check out the https://discuss.elastic.co/c/apm[APM discussion forum].
8+
This section describes common problems you might encounter with the APM app.
9+
To add to this page, please consider opening a
10+
https://github.com/elastic/kibana/pulls[pull request] with your proposed changes.
11+
12+
If your issue is potentially related to other components of the APM ecosystem,
13+
don't forget to check our other troubleshooting guides or discussion forum:
14+
15+
* {apm-server-ref}/troubleshooting.html[APM Server troubleshooting]
16+
* {apm-dotnet-ref}/troubleshooting.html[.NET agent troubleshooting]
17+
* {apm-go-ref}/troubleshooting.html[Go agent troubleshooting]
18+
* {apm-java-ref}/trouble-shooting.html[Java agent troubleshooting]
19+
* {apm-node-ref}/troubleshooting.html[Node.js agent troubleshooting]
20+
* {apm-py-ref}/troubleshooting.html[Python agent troubleshooting]
21+
* {apm-ruby-ref}/debugging.html[Ruby agent troubleshooting]
22+
* {apm-rum-ref/troubleshooting.html[RUM troubleshooting]
23+
* https://discuss.elastic.co/c/apm[APM discussion forum].
24+
25+
[discrete]
26+
[[troubleshooting-apm-app]]
27+
== Troubleshoot common APM app problems
1228

1329
* <<no-apm-data-found>>
1430
* <<troubleshooting-too-many-transactions>>

docs/developer/plugin-list.asciidoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ It also provides a stateful version of it on the start contract.
150150
Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
151151
152152
153-
|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.md[presentationUtil]
154-
|Utilities and components used by the presentation-related plugins
153+
|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.mdx[presentationUtil]
154+
|The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas).
155155
156156
157157
|{kib-repo}blob/{branch}/src/plugins/region_map/README.md[regionMap]
@@ -370,6 +370,10 @@ and actions.
370370
|The features plugin enhance Kibana with a per-feature privilege system.
371371
372372
373+
|{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
374+
|WARNING: Missing README.
375+
376+
373377
|{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[fleet]
374378
|Fleet needs to have Elasticsearch API keys enabled, and also to have TLS enabled on kibana, (if you want to run Kibana without TLS you can provide the following config flag --xpack.fleet.agents.tlsCheckDisabled=false)
375379

0 commit comments

Comments
 (0)