Skip to content

Commit b0e08ae

Browse files
DianaDerevyankinaDianaDerevyankina
committed
Merge branch 'DianaDerevyankina' into Diana/65629
# Conflicts: # x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
2 parents ff2345e + 42d21bc commit b0e08ae

1,010 files changed

Lines changed: 12838 additions & 36403 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.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878

7979
# Canvas
8080
/x-pack/plugins/canvas/ @elastic/kibana-canvas
81+
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
8182

8283
# Observability UIs
8384
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui

‎.github/paths-labeller.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
- "src/plugins/bfetch/**/*.*"
1111
- "Team:apm":
1212
- "x-pack/plugins/apm/**/*.*"
13-
- "x-pack/plugins/apm/**/*.*"
13+
- "Team:Ingest Management":
14+
- "x-pack/plugins/ingest_manager/**/*.*"
15+
- "x-pack/test/api_integration/apis/fleet/**/*.*"
16+
- "x-pack/test/epm_api_integration/**/*.*"
1417
- "Team:uptime":
1518
- "x-pack/plugins/uptime/**/*.*"

‎docs/settings/apm-settings.asciidoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@ Changing these settings may disable features of the APM App.
4343
| `xpack.apm.enabled`
4444
| Set to `false` to disable the APM app. Defaults to `true`.
4545

46-
| `xpack.apm.ui.enabled`
46+
| `xpack.apm.ui.enabled` {ess-icon}
4747
| Set to `false` to hide the APM app from the menu. Defaults to `true`.
4848

4949
| `xpack.apm.ui.transactionGroupBucketSize`
5050
| Number of top transaction groups displayed in the APM app. Defaults to `100`.
5151

52-
| `xpack.apm.ui.maxTraceItems`
52+
| `xpack.apm.ui.maxTraceItems` {ess-icon}
5353
| Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
5454

55-
| `apm_oss.indexPattern`
55+
| `apm_oss.indexPattern` {ess-icon}
5656
| The index pattern used for integrations with Machine Learning and Query Bar.
5757
It must match all apm indices. Defaults to `apm-*`.
5858

59-
| `apm_oss.errorIndices`
59+
| `apm_oss.errorIndices` {ess-icon}
6060
| Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `apm-*`.
6161

6262
| `apm_oss.onboardingIndices`
6363
| Matcher for all onboarding indices. Defaults to `apm-*`.
6464

65-
| `apm_oss.spanIndices`
65+
| `apm_oss.spanIndices` {ess-icon}
6666
| Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `apm-*`.
6767

68-
| `apm_oss.transactionIndices`
68+
| `apm_oss.transactionIndices` {ess-icon}
6969
| Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `apm-*`.
7070

7171
| `apm_oss.metricsIndices`

‎examples/alerting_example/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "alertingExample",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["alerting_example"],
65
"server": true,
76
"ui": true,
87
"requiredPlugins": ["triggers_actions_ui", "charts", "data", "alerting", "actions"],

‎examples/bfetch_explorer/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "bfetchExplorer",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["bfetch_explorer"],
65
"server": true,
76
"ui": true,
87
"requiredPlugins": ["bfetch"],

‎examples/demo_search/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "demoSearch",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["demoSearch"],
65
"server": true,
76
"ui": true,
87
"requiredPlugins": ["data"],

‎examples/embeddable_examples/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "embeddableExamples",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["embeddable_examples"],
65
"server": true,
76
"ui": true,
87
"requiredPlugins": ["embeddable"],

‎examples/embeddable_explorer/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "embeddableExplorer",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["embeddable_explorer"],
65
"server": false,
76
"ui": true,
87
"requiredPlugins": ["uiActions", "inspector", "embeddable", "embeddableExamples"],

‎examples/search_explorer/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "searchExplorer",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["search_explorer"],
65
"server": false,
76
"ui": true,
87
"requiredPlugins": ["data", "demoSearch"],

‎examples/state_containers_examples/kibana.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"id": "stateContainersExamples",
33
"version": "0.0.1",
44
"kibanaVersion": "kibana",
5-
"configPath": ["state_containers_examples"],
65
"server": true,
76
"ui": true,
87
"requiredPlugins": ["navigation", "data"],

0 commit comments

Comments
 (0)