Skip to content

Commit 9a3e867

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.8' into backport/7.8/pr-65651
2 parents 7c514c3 + e9c0a16 commit 9a3e867

File tree

13 files changed

+190
-38
lines changed

13 files changed

+190
-38
lines changed

‎packages/kbn-optimizer/src/worker/webpack.config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
135135
// or which have require() statements that should be ignored because the file is
136136
// already bundled with all its necessary depedencies
137137
noParse: [
138-
/[\///]node_modules[\///]elasticsearch-browser[\///]/,
139-
/[\///]node_modules[\///]lodash[\///]index\.js$/,
140-
/[\///]node_modules[\///]vega-lib[\///]build[\///]vega\.js$/,
138+
/[\/\\]node_modules[\/\\]elasticsearch-browser[\/\\]/,
139+
/[\/\\]node_modules[\/\\]lodash[\/\\]index\.js$/,
140+
/[\/\\]node_modules[\/\\]vega-lib[\/\\]build[\/\\]vega\.js$/,
141141
],
142142

143143
rules: [

‎x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap‎

Lines changed: 134 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import numeral from '@elastic/numeral';
99
import { i18n } from '@kbn/i18n';
1010
import React, { useMemo } from 'react';
1111
import styled from 'styled-components';
12+
import { EuiIconTip } from '@elastic/eui';
1213
import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
1314
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
1415
import { ErrorGroupListAPIResponse } from '../../../../../server/lib/errors/get_error_groups';
@@ -60,13 +61,31 @@ const ErrorGroupList: React.FC<Props> = props => {
6061
if (!serviceName) {
6162
throw new Error('Service name is required');
6263
}
63-
6464
const columns = useMemo(
6565
() => [
6666
{
67-
name: i18n.translate('xpack.apm.errorsTable.groupIdColumnLabel', {
68-
defaultMessage: 'Group ID'
69-
}),
67+
name: (
68+
<>
69+
{i18n.translate('xpack.apm.errorsTable.groupIdColumnLabel', {
70+
defaultMessage: 'Group ID'
71+
})}{' '}
72+
<EuiIconTip
73+
size="s"
74+
type="questionInCircle"
75+
color="subdued"
76+
iconProps={{
77+
className: 'eui-alignTop'
78+
}}
79+
content={i18n.translate(
80+
'xpack.apm.errorsTable.groupIdColumnDescription',
81+
{
82+
defaultMessage:
83+
'Hash of the stack trace. Groups similar errors together, even when the error message is different due to dynamic parameters.'
84+
}
85+
)}
86+
/>
87+
</>
88+
),
7089
field: 'groupId',
7190
sortable: false,
7291
width: px(unit * 6),

‎x-pack/plugins/apm/public/components/app/TransactionOverview/List/index.tsx‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { EuiIcon, EuiToolTip } from '@elastic/eui';
7+
import { EuiToolTip, EuiIconTip } from '@elastic/eui';
88
import { i18n } from '@kbn/i18n';
99
import React, { useMemo } from 'react';
1010
import styled from 'styled-components';
@@ -109,27 +109,26 @@ export function TransactionList({ items, isLoading }: Props) {
109109
{
110110
field: 'impact',
111111
name: (
112-
<EuiToolTip
113-
content={i18n.translate(
114-
'xpack.apm.transactionsTable.impactColumnDescription',
115-
{
116-
defaultMessage:
117-
"The most used and slowest endpoints in your service. It's calculated by taking the relative average duration times the number of transactions per minute."
118-
}
119-
)}
120-
>
121-
<>
122-
{i18n.translate('xpack.apm.transactionsTable.impactColumnLabel', {
123-
defaultMessage: 'Impact'
124-
})}{' '}
125-
<EuiIcon
126-
size="s"
127-
color="subdued"
128-
type="questionInCircle"
129-
className="eui-alignTop"
130-
/>
131-
</>
132-
</EuiToolTip>
112+
<>
113+
{i18n.translate('xpack.apm.transactionsTable.impactColumnLabel', {
114+
defaultMessage: 'Impact'
115+
})}{' '}
116+
<EuiIconTip
117+
size="s"
118+
type="questionInCircle"
119+
color="subdued"
120+
iconProps={{
121+
className: 'eui-alignTop'
122+
}}
123+
content={i18n.translate(
124+
'xpack.apm.transactionsTable.impactColumnDescription',
125+
{
126+
defaultMessage:
127+
"The most used and slowest endpoints in your service. It's calculated by taking the relative average duration times the number of transactions per minute."
128+
}
129+
)}
130+
/>
131+
</>
133132
),
134133
sortable: true,
135134
dataType: 'number',

‎x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/calendar_form.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ export const CalendarForm = ({
146146
}
147147
checked={isGlobalCalendar}
148148
onChange={onGlobalCalendarChange}
149+
disabled={saving === true || canCreateCalendar === false}
149150
/>
150151

151152
{isGlobalCalendar === false && (

‎x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_docker_ecs/ml/docker_high_count_process_events_ecs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"url_name": "Process rate",
3232
"time_range": "1h",
33-
"url_value": "kibana#/dashboard/ml_auditbeat_docker_process_event_rate_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:container.runtime,negate:!f,params:(query:docker),type:phrase,value:docker),query:(match:(container.runtime:(query:docker,type:phrase)))),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027container.name:\u0022$container.name$\u0022\u0027))"
33+
"url_value": "kibana#/dashboard/ml_auditbeat_docker_process_event_rate_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:container.runtime,negate:!f,params:(query:docker),type:phrase,value:docker),query:(match:(container.runtime:(query:docker,type:phrase)))),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027container.name:\u0022$container.name$\u0022\u0027))"
3434
},
3535
{
3636
"url_name": "Raw data",

‎x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_docker_ecs/ml/docker_rare_process_activity_ecs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"url_name": "Process explorer",
3232
"time_range": "1h",
33-
"url_value": "kibana#/dashboard/ml_auditbeat_docker_process_explorer_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:container.runtime,negate:!f,params:(query:docker),type:phrase,value:docker),query:(match:(container.runtime:(query:docker,type:phrase)))),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027container.name:\u0022$container.name$\u0022\u0027))"
33+
"url_value": "kibana#/dashboard/ml_auditbeat_docker_process_explorer_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:container.runtime,negate:!f,params:(query:docker),type:phrase,value:docker),query:(match:(container.runtime:(query:docker,type:phrase)))),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027container.name:\u0022$container.name$\u0022\u0027))"
3434
},
3535
{
3636
"url_name": "Raw data",

‎x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_hosts_ecs/ml/hosts_high_count_process_events_ecs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
{
3030
"url_name": "Process rate",
3131
"time_range": "1h",
32-
"url_value": "kibana#/dashboard/ml_auditbeat_hosts_process_event_rate_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),exists:(field:container.runtime),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:container.runtime,negate:!t,type:exists,value:exists)),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027host.name:\u0022$host.name$\u0022\u0027))"
32+
"url_value": "kibana#/dashboard/ml_auditbeat_hosts_process_event_rate_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),exists:(field:container.runtime),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:container.runtime,negate:!t,type:exists,value:exists)),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027host.name:\u0022$host.name$\u0022\u0027))"
3333
},
3434
{
3535
"url_name": "Raw data",

‎x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_hosts_ecs/ml/hosts_rare_process_activity_ecs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"url_name": "Process explorer",
3232
"time_range": "1h",
33-
"url_value": "kibana#/dashboard/ml_auditbeat_hosts_process_explorer_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),exists:(field:container.runtime),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:container.runtime,negate:!t,type:exists,value:exists)),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:INDEX_PATTERN_ID,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027host.name:\u0022$host.name$\u0022\u0027))"
33+
"url_value": "kibana#/dashboard/ml_auditbeat_hosts_process_explorer_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.module,negate:!f,params:(query:auditd),type:phrase,value:auditd),query:(match:(event.module:(query:auditd,type:phrase)))),('$state':(store:appState),exists:(field:container.runtime),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:container.runtime,negate:!t,type:exists,value:exists)),('$state':(store:appState),exists:(field:auditd.data.syscall),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:auditd.data.syscall,negate:!f,type:exists,value:exists))),query:(language:kuery,query:\u0027host.name:\u0022$host.name$\u0022\u0027))"
3434
},
3535
{
3636
"url_name": "Raw data",

0 commit comments

Comments
 (0)