Skip to content

Commit 27dcca4

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into monitoring/new_alert
2 parents 0720c7a + c2e4310 commit 27dcca4

855 files changed

Lines changed: 16470 additions & 17718 deletions

File tree

Some content is hidden

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

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
4444
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4545
]),
4646
])
47-
workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
47+
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
4848
kibanaPipeline.downloadCoverageArtifacts()
4949
kibanaPipeline.bash(
5050
'''

‎.ci/Jenkinsfile_visual_baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
77
catchError {
88
parallel([
99
'oss-visualRegression': {
10-
workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
10+
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
1111
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1212
}
1313
},
1414
'xpack-visualRegression': {
15-
workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
15+
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
1616
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1717
}
1818
},

‎.ci/es-snapshots/Jenkinsfile_build_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node('linux && immutable') {
28+
node(workers.label('s')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) {
6161
}
6262

6363
def promoteSnapshot(snapshotVersion, snapshotId) {
64-
node('linux && immutable') {
64+
node(workers.label('s')) {
6565
esSnapshots.promote(snapshotVersion, snapshotId)
6666
}
6767
}

‎.github/paths-labeller.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
---
2-
- "Team:AppArch":
3-
- "src/plugins/bfetch/**/*.*"
4-
- "src/plugins/dashboard_embeddable_container/**/*.*"
5-
- "src/plugins/data/**/*.*"
6-
- "src/plugins/embeddable/**/*.*"
7-
- "src/plugins/expressions/**/*.*"
8-
- "src/plugins/inspector/**/*.*"
9-
- "src/plugins/ui_actions/**/*.*"
10-
- "src/plugins/visualizations/**/*.*"
112
- "Feature:Embedding":
123
- "src/plugins/embeddable/**/*.*"
134
- "src/plugins/dashboard_embeddable_container/**/*.*"

‎docs/apm/agent-configuration.asciidoc‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,18 @@ Kibana communicates any changed settings to APM Server so that your agents only
3131
[float]
3232
==== Supported configurations
3333

34-
[float]
35-
===== `CAPTURE_BODY`
36-
37-
added[7.5.0] Can be `"off"`, `"errors"`, `"transactions"`, or `"all"`. Defaults to `"off"`.
38-
39-
For transactions that are HTTP requests, the Agent can optionally capture the request body, e.g., POST variables.
40-
Remember, request bodies often contain sensitive values like passwords, credit card numbers, etc.
41-
If your service handles sensitive data, enable this feature with care.
42-
Turning on body capturing can also significantly increase the overhead the overhead of the Agent,
43-
and the Elasticsearch index size.
44-
45-
[float]
46-
===== `TRANSACTION_MAX_SPANS`
47-
48-
added[7.5.0] A number between `0` and `32000`. Defaults to `500`.
49-
50-
Limit the number of spans that are recorded per transaction.
51-
This is helpful in cases where a transaction creates a very high amount of spans, e.g., thousands of SQL queries.
52-
Setting an upper limit will help prevent the Agent and the APM Server from being overloaded.
53-
54-
[float]
55-
===== `TRANSACTION_SAMPLE_RATE`
56-
57-
added[7.3.0] A sample rate between `0.000` and `1.0`. Default configuration is `1.0` (100% of traces).
58-
59-
Adjusting the sampling rate controls what percent of requests are traced.
60-
`1.0` means _all_ requests are traced. If you set the `TRANSACTION_SAMPLE_RATE` to a value below `1.0`,
61-
the agent will randomly sample only a subset of transactions.
62-
Unsampled transactions only record the name of the transaction, the overall transaction time, and the result.
63-
64-
IMPORTANT: In a distributed trace, the sampling decision is propagated by the initializing Agent.
65-
This means if you're using multiple agents, only the originating service's sampling rate will be used.
66-
Be sure to set sensible defaults in _all_ of your agents, especially the
67-
{apm-rum-ref}/configuration.html#transaction-sample-rate[JavaScript RUM Agent].
34+
Each Agent has its own list of supported configurations.
35+
After selecting a Service name and environment in the APM app,
36+
a list of all available configuration options,
37+
including descriptions and default values, will be displayed.
38+
39+
Supported configurations are also marked in each Agent's configuration documentation:
40+
41+
[horizontal]
42+
Go Agent:: {apm-go-ref}/configuration.html[Configuration reference]
43+
Java Agent:: {apm-java-ref}/configuration.html[Configuration reference]
44+
.NET Agent:: {apm-dotnet-ref}/configuration.html[Configuration reference]
45+
Node.js Agent:: {apm-node-ref}/configuration.html[Configuration reference]
46+
Python Agent:: {apm-py-ref}/configuration.html[Configuration reference]
47+
Ruby Agent:: {apm-ruby-ref}/configuration.html[Configuration reference]
48+
Real User Monitoring (RUM) Agent:: {apm-rum-ref}/configuration.html[Configuration reference]

‎docs/apm/images/apm-agent-configuration.png‎

318 KB
Loading

‎docs/images/Dashboard_add_new_visualization.png‎

81.6 KB
Loading

‎docs/images/Dashboard_add_visualization.png‎

221 KB
Loading

‎docs/infrastructure/index.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
2121

2222
* Seamlessly switch to view the corresponding logs, application traces or uptime information for a component.
2323

24+
* Create alerts based on metric thresholds for one or more components.
25+
2426
To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
2527

2628
[role="screenshot"]

0 commit comments

Comments
 (0)