Skip to content

Commit 975eddf

Browse files
Merge branch 'master' into canvas-saved-objects-np
2 parents f5e22f2 + 12a5889 commit 975eddf

File tree

3,061 files changed

+90210
-44715
lines changed

Some content is hidden

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

3,061 files changed

+90210
-44715
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
3+
"branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
44
"labels": ["backport"]
55
}

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ module.exports = {
491491
'x-pack/dev-tools/mocha/setup_mocha.js',
492492
'x-pack/scripts/*.js',
493493
],
494+
excludedFiles: ['**/integration_tests/**/*'],
494495
rules: {
495496
'import/no-commonjs': 'off',
496497
'prefer-object-spread/prefer-object-spread': 'off',

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6-
/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
76
/x-pack/legacy/plugins/lens/ @elastic/kibana-app
87
/x-pack/legacy/plugins/graph/ @elastic/kibana-app
98
/src/legacy/server/url_shortening/ @elastic/kibana-app
@@ -132,6 +131,7 @@
132131
/src/legacy/server/saved_objects/ @elastic/kibana-platform
133132
/src/legacy/server/status/ @elastic/kibana-platform
134133
/src/plugins/status_page/ @elastic/kibana-platform
134+
/src/plugins/saved_objects_management/ @elastic/kibana-platform
135135
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
136136

137137
# Security

.github/paths-labeller.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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/**/*.*"
11+
- "Feature:Embedding":
12+
- "src/plugins/embeddable/**/*.*"
13+
- "src/plugins/dashboard_embeddable_container/**/*.*"
214
- "Feature:Drilldowns":
315
- "x-pack/plugins/drilldowns/**/*.*"
16+
- "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
17+
- "Feature:ExpressionLanguage":
18+
- "src/plugins/expressions/**/*.*"
19+
- "src/plugins/bfetch/**/*.*"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ package-lock.json
4444
*.sublime-*
4545
npm-debug.log*
4646
.tern-project
47+
x-pack/legacy/plugins/apm/tsconfig.json
48+
apm.tsconfig.json
49+
/x-pack/legacy/plugins/apm/e2e/snapshots.js

.i18nrc.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"newsfeed": "src/plugins/newsfeed",
3434
"regionMap": "src/legacy/core_plugins/region_map",
3535
"savedObjects": "src/plugins/saved_objects",
36+
"savedObjectsManagement": "src/plugins/saved_objects_management",
3637
"server": "src/legacy/server",
3738
"statusPage": "src/legacy/core_plugins/status_page",
3839
"telemetry": [
@@ -51,10 +52,7 @@
5152
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
5253
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5354
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
54-
"visualizations": [
55-
"src/plugins/visualizations",
56-
"src/legacy/core_plugins/visualizations"
57-
]
55+
"visualizations": "src/plugins/visualizations"
5856
},
5957
"exclude": [
6058
"src/legacy/ui/ui_render/ui_render_mixin.js"

docs/apm/custom-links.asciidoc

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
[[custom-links]]
2+
=== Custom links
3+
4+
Elastic's custom link feature allows you to easily create up to 500 dynamic links
5+
based on your specific APM data.
6+
Custom links can be filtered to only appear in the APM app for relevant services,
7+
environments, transaction types, or transaction names.
8+
9+
Ready to dive in? Jump straight to the <<custom-links-examples,examples>>.
10+
11+
[float]
12+
[[custom-links-create]]
13+
=== Create a link
14+
15+
Each custom link consists of a label, url, and optional filter.
16+
The easiest way to create a custom link is from within the actions dropdown in the transaction detail page.
17+
This method will automatically apply filters, scoping the link to that specific service,
18+
environment, transaction type, and transaction name.
19+
20+
Alternatively, you can create a custom link in the APM app by navigating to **Settings** > **Customize UI**,
21+
and selecting **Create custom link**.
22+
23+
[float]
24+
[[custom-links-label]]
25+
==== Label
26+
27+
The name of your custom link.
28+
This text will be shown in the actions context menu,
29+
so keep it as short as possible.
30+
31+
TIP: Custom links are displayed alphabetically in the actions menu.
32+
33+
[float]
34+
[[custom-links-url]]
35+
==== URL
36+
37+
The URL your link points to.
38+
URLs support dynamic field name variables, encapsulated in double curly brackets: `{{field.name}}`.
39+
These variables will be replaced with transaction metadata when the link is clicked.
40+
41+
Because everyone's data is different,
42+
you'll need to examine your own traces to see what metadata is available for use.
43+
The easiest way to do this is to select a trace in the APM app, and click **Metadata** in the **Trace Sample** table.
44+
45+
[role="screenshot"]
46+
image::apm/images/example-metadata.png[Example metadata]
47+
48+
[float]
49+
[[custom-links-filters]]
50+
==== Filters
51+
52+
Filter each link to only appear so it only appears for specific services or transactions.
53+
You can filter on the following fields:
54+
55+
* `service.name`
56+
* `service.env`
57+
* `transaction.type`
58+
* `transaction.name`
59+
60+
Multiple values are allowed when comma separated.
61+
62+
[float]
63+
[[custom-links-examples]]
64+
=== Custom link examples
65+
66+
// Relevant documentation links
67+
:jira-query-params: https://confluence.atlassian.com/jirakb/how-to-create-issues-using-direct-html-links-in-jira-server-159474.html
68+
:github-query-params: https://help.github.com/en/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters
69+
70+
Not sure where to start with custom links?
71+
Take a look at the examples below, and customize them to your liking!
72+
73+
[float]
74+
[[custom-links-examples-email]]
75+
==== Email
76+
77+
Email the owner of a service.
78+
79+
|====
80+
|Label |`Email <SERVICE_NAME> engineer`
81+
|Link |`mailto:<TEAM_OR_ENGINEER>@<COMPANY_NAME>.com`
82+
|Filters |`service.name:<SERVICE_NAME>`
83+
|====
84+
85+
**Example**
86+
87+
This link opens an email addressed to the team or owner of `python-backend`.
88+
It will only appear on services with the name `python-backend`.
89+
90+
|====
91+
|Label |`Email python-backend engineers`
92+
|Link |`mailto:python_team@elastic.co`
93+
|Filters |`service.name:python-backend`
94+
|====
95+
96+
[float]
97+
[[custom-links-examples-gh]]
98+
==== GitHub issue
99+
100+
Open a GitHub issue with pre-populated metadata from the selected trace sample.
101+
102+
|====
103+
|Label |`Open an issue in <REPO_NAME>`
104+
|Link |`https://github.com/<ORG>/<REPO>/issues/new?title=<TITLE>&body=<BODY>`
105+
|Filters |`service.name:client`
106+
|====
107+
108+
**Example**
109+
110+
This link opens a new GitHub issue in the apm-agent-rum repository.
111+
It populates the issue body with relevant metadata from the currently active trace.
112+
Clicking this link results in the following issue being created:
113+
114+
[role="screenshot"]
115+
image::apm/images/create-github-issue.png[Example github issue]
116+
117+
|====
118+
|Label |`Open an issue in apm-rum-js`
119+
|Link |`https://github.com/elastic/apm-agent-rum-js/issues/new?title=Investigate+APM+trace&body=Investigate+the+following+APM+trace%3A%0D%0A%0D%0Aservice.name%3A+{{service.name}}%0D%0Atransaction.id%3A+{{transaction.id}}%0D%0Acontainer.id%3A+{{container.id}}%0D%0Aurl.full%3A+{{url.full}}`
120+
|Filters |`service.name:client`
121+
|====
122+
123+
See the {github-query-params}[GitHub automation documentation] for a full list of supported query parameters.
124+
125+
[float]
126+
[[custom-links-examples-jira]]
127+
==== Jira task
128+
129+
Create a Jira task with pre-populated metadata from the selected trace sample.
130+
131+
|====
132+
|Label |`Open an issue in Jira`
133+
|Link |`https://<JIRA_BASE_URL>/secure/CreateIssueDetails!init.jspa?<ARGUMENTS>`
134+
|====
135+
136+
**Example**
137+
138+
This link creates a new task on the Engineering board in Jira.
139+
It populates the issue body with relevant metadata from the currently active trace.
140+
Clicking this link results in the following task being created in Jira:
141+
142+
[role="screenshot"]
143+
image::apm/images/create-jira-issue.png[Example jira issue]
144+
145+
|====
146+
|Label |`Open a task in Jira`
147+
|Link |`https://test-site-33.atlassian.net/secure/CreateIssueDetails!init.jspa?pid=10000&issuetype=10001&summary=Created+via+APM&description=Investigate+the+following+APM+trace%3A%0D%0A%0D%0Aservice.name%3A+{{service.name}}%0D%0Atransaction.id%3A+{{transaction.id}}%0D%0Acontainer.id%3A+{{container.id}}%0D%0Aurl.full%3A+{{url.full}}`
148+
|====
149+
150+
See the {jira-query-params}[Jira application administration knowledge base]
151+
for a full list of supported query parameters.
152+
153+
[float]
154+
[[custom-links-examples-kib]]
155+
==== Kibana dashboards
156+
157+
Link to a custom dashboard in Kibana.
158+
159+
|====
160+
|Label |`Open transaction in custom visualization`
161+
|Link |`https://kibana-instance/app/kibana#/dashboard?_g=query:(language:kuery,query:'transaction.id:{{transaction.id}}'...`
162+
|====
163+
164+
**Example**
165+
166+
This link opens the current `transaction.id` in a custom kibana dashboard.
167+
There are no filters set.
168+
169+
|====
170+
|Label |`Open transaction in Python drilldown viz`
171+
|URL |`https://kibana-instance/app/kibana#/dashboard?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-24h,to:now))&_a=(description:'',filters:!(),fullScreenMode:!f,options:(hidePanelTitles:!f,useMargins:!t),panels:!((embeddableConfig:(),gridData:(h:15,i:cb79c1c0-1af8-472c-aaf7-d158a76946fb,w:24,x:0,y:0),id:c8c74b20-6a30-11ea-92ab-b5d3feff11df,panelIndex:cb79c1c0-1af8-472c-aaf7-d158a76946fb,type:visualization,version:'7.7')),query:(language:kuery,query:'transaction.id:{{transaction.id}}'),timeRestore:!f,title:'',viewMode:edit)`
172+
|====
173+
174+
[float]
175+
[[custom-links-examples-slack]]
176+
==== Slack channel
177+
178+
Open a specified slack channel.
179+
180+
|====
181+
|Label |`Open SLACK_CHANNEL`
182+
|Link |`https://COMPANY_SLACK.slack.com/archives/SLACK_CHANNEL`
183+
|Filters |`service.name` : `SERVICE_NAME`
184+
|====
185+
186+
**Example**
187+
188+
This link opens a company slack channel, #apm-support.
189+
It only appears when `transaction.name` is `GET user/login`.
190+
191+
|====
192+
|Label |`Open #apm-user-support`
193+
|Link |`https://microsoft.slack.com/archives/efk52kt23k`
194+
|Filters |`transaction.name:GET user/login`
195+
|====
196+
197+
[float]
198+
[[custom-links-examples-web]]
199+
==== Website
200+
201+
Open an internal or external website.
202+
203+
|====
204+
|Label |`Open <WEBSITE>`
205+
|Link |`https://<COMPANY_SLACK>.slack.com/archives/<SLACK_CHANNEL>`
206+
|Filters |`service.name:<SERVICE_NAME>`
207+
|====
208+
209+
**Example**
210+
211+
This link opens more data on a specific `user.email`.
212+
It only appears on front-end transactions.
213+
214+
|====
215+
|Label |`View user internally`
216+
|Link |`https://internal-site.company.com/user/{{user.email}}`
217+
|Filters |`service.name:client`
218+
|====
144 KB
Loading
178 KB
Loading
249 KB
Loading

0 commit comments

Comments
 (0)