Skip to content

Commit 5107ad7

Browse files
Merge branch 'master' into reporting/np-migration-server-config
2 parents 41881bc + 408baf2 commit 5107ad7

File tree

965 files changed

+23321
-9731
lines changed

Some content is hidden

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

965 files changed

+23321
-9731
lines changed

.ci/Jenkinsfile_flaky

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kibanaPipeline(timeoutMinutes: 180) {
3535
if (!IS_XPACK) {
3636
kibanaPipeline.buildOss()
3737
if (CI_GROUP == '1') {
38-
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
38+
runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
3939
}
4040
} else {
4141
kibanaPipeline.buildXpack()

.github/CODEOWNERS

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,23 @@
177177
# Elasticsearch UI
178178
/src/plugins/console/ @elastic/es-ui
179179
/src/plugins/es_ui_shared/ @elastic/es-ui
180-
/x-pack/plugins/console_extensions/ @elastic/es-ui
181180
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
182181
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
183182
/x-pack/legacy/plugins/index_management/ @elastic/es-ui
184183
/x-pack/legacy/plugins/license_management/ @elastic/es-ui
185-
/x-pack/plugins/remote_clusters/ @elastic/es-ui
186184
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
187-
/x-pack/plugins/searchprofiler/ @elastic/es-ui
188-
/x-pack/plugins/painless_lab/ @elastic/es-ui
189185
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
190186
/x-pack/legacy/plugins/upgrade_assistant/ @elastic/es-ui
187+
/x-pack/plugins/console_extensions/ @elastic/es-ui
188+
/x-pack/plugins/es_ui_shared/ @elastic/es-ui
189+
/x-pack/plugins/grokdebugger/ @elastic/es-ui
190+
/x-pack/plugins/index_management/ @elastic/es-ui
191+
/x-pack/plugins/license_management/ @elastic/es-ui
192+
/x-pack/plugins/painless_lab/ @elastic/es-ui
193+
/x-pack/plugins/remote_clusters/ @elastic/es-ui
194+
/x-pack/plugins/rollup/ @elastic/es-ui
195+
/x-pack/plugins/searchprofiler/ @elastic/es-ui
196+
/x-pack/plugins/snapshot_restore/ @elastic/es-ui
191197
/x-pack/plugins/upgrade_assistant/ @elastic/es-ui
192198
/x-pack/plugins/watcher/ @elastic/es-ui
193199

.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]
318 KB
Loading

docs/canvas/canvas-elements.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ By default, most of the elements you create use demo data until you change the d
2323

2424
* *{es} SQL* — Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].
2525

26-
* *{es} raw data* — Access your raw data in {es} without the use of aggregations. Use {es} raw data when you have low volume datasets, or to plot exact, non-aggregated values.
26+
* *{es} documents* &mdash; Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <<lucene-query,Lucene Query Syntax>>. Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart.
2727

2828
* *Timelion* &mdash; Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
2929

81.6 KB
Loading
221 KB
Loading

docs/epm/index.asciidoc renamed to docs/ingest_manager/index.asciidoc

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[role="xpack"]
22
[[epm]]
3-
== Elastic Package Manager
3+
== Ingest Manager
44

5-
These are the docs for the Elastic Package Manager (EPM).
5+
These are the docs for the Ingest Manager.
66

77

88
=== Configuration
@@ -39,16 +39,71 @@ curl -X DELETE localhost:5601/api/ingest_manager/epm/packages/iptables-1.0.4
3939

4040
This section is to define terms used across ingest management.
4141

42+
==== Data Source
43+
44+
A data source is a definition on how to collect data from a service, for example `nginx`. A data source contains
45+
definitions for one or multiple inputs and each input can contain one or multiple streams.
46+
47+
With the example of the nginx Data Source, it contains to inputs: `logs` and `nginx/metrics`. Logs and metrics are collected
48+
differently. The `logs` input contains two streams, `access` and `error`, the `nginx/metrics` input contains the stubstatus stream.
49+
50+
51+
==== Data Stream
52+
53+
Data Streams are a [new concept](https://github.com/elastic/elasticsearch/issues/53100) in Elasticsearch which simplify
54+
ingesting data and the setup of Elasticsearch.
55+
4256
==== Elastic Agent
57+
4358
A single, unified agent that users can deploy to hosts or containers. It controls which data is collected from the host or containers and where the data is sent. It will run Beats, Endpoint or other monitoring programs as needed. It can operate standalone or pull a configuration policy from Fleet.
4459

60+
61+
==== Elastic Package Registry
62+
63+
The Elastic Package Registry (EPR) is a service which runs under [https://epr.elastic.co]. It serves the packages through its API.
64+
More details about the registry can be found [here](https://github.com/elastic/package-registry).
65+
66+
==== Fleet
67+
68+
Fleet is the part of the Ingest Manager UI in Kibana that handles the part of enrolling Elastic Agents,
69+
managing agents and sending configurations to the Elastic Agent.
70+
71+
==== Indexing Strategy
72+
73+
Ingest Management + Elastic Agent follow a strict new indexing strategy: `{type}-{dataset}-{namespace}`. An example
74+
for this is `logs-nginx.access-default`. More details about it can be found in the Index Strategy below. All data of
75+
the index strategy is sent to Data Streams.
76+
77+
==== Input
78+
79+
An input is the configuration unit in an Agent Config that defines the options on how to collect data from
80+
an endpoint. This could be username / password which are need to authenticate with a service or a host url
81+
as an example.
82+
83+
An input is part of a Data Source and contains streams.
84+
85+
==== Integration
86+
87+
An integration is a package with the type integration. An integration package has at least 1 data source
88+
and usually collects data from / about a service.
89+
90+
4591
==== Namespace
92+
4693
A user-specified string that will be used to part of the index name in Elasticsearch. It helps users identify logs coming from a specific environment (like prod or test), an application, or other identifiers.
4794

95+
4896
==== Package
4997

50-
A package contains all the assets for the Elastic Stack. A more detailed definition of a package can be found under https://github.com/elastic/package-registry.
98+
A package contains all the assets for the Elastic Stack. A more detailed definition of a
99+
package can be found under https://github.com/elastic/package-registry.
100+
101+
Besides the assets, a package contains the data source definitions with its inputs and streams.
102+
103+
==== Stream
51104

105+
A stream is a configuration unit in the Elastic Agent config. A stream is part of an input and defines how the data
106+
fetched by this input should be processed and which Data Stream to send it to.
52107

53108
== Indexing Strategy
54109

docs/logs/images/logs-console.png

-466 KB
Loading

0 commit comments

Comments
 (0)