Skip to content

Commit 09c729e

Browse files
XavierMXavierM
committed
Merge branch 'master' of github.com:elastic/kibana into add-endpoint-alerts-url
2 parents a914816 + 0e2f9fc commit 09c729e

8 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎x-pack/plugins/ml/public/application/explorer/add_to_dashboard_control.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ interface AddToDashboardControlProps {
5757
}
5858

5959
/**
60-
* Component for attaching anomaly swimlane embeddable to dashboards.
60+
* Component for attaching anomaly swim lane embeddable to dashboards.
6161
*/
6262
export const AddToDashboardControl: FC<AddToDashboardControlProps> = ({
6363
onClose,
@@ -225,7 +225,7 @@ export const AddToDashboardControl: FC<AddToDashboardControlProps> = ({
225225
<EuiModalHeaderTitle>
226226
<FormattedMessage
227227
id="xpack.ml.explorer.dashboardsTitle"
228-
defaultMessage="Add swimlanes to dashboards"
228+
defaultMessage="Add swim lanes to dashboards"
229229
/>
230230
</EuiModalHeaderTitle>
231231
</EuiModalHeader>
@@ -234,7 +234,7 @@ export const AddToDashboardControl: FC<AddToDashboardControlProps> = ({
234234
label={
235235
<FormattedMessage
236236
id="xpack.ml.explorer.addToDashboard.selectSwimlanesLabel"
237-
defaultMessage="Select swimlane view:"
237+
defaultMessage="Select swim lane view:"
238238
/>
239239
}
240240
>

‎x-pack/plugins/ml/public/application/services/dashboard_service.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ describe('DashboardService', () => {
7070
gridData: { x: 24, y: 0, w: 24, h: 15, i: '0aa334bd-8308-4ded-9462-80dbd37680ee' },
7171
panelIndex: '0aa334bd-8308-4ded-9462-80dbd37680ee',
7272
embeddableConfig: {
73-
title: 'ML anomaly swimlane for fb_population_1',
73+
title: 'ML anomaly swim lane for fb_population_1',
7474
jobIds: ['fb_population_1'],
7575
limit: 5,
7676
swimlaneType: 'overall',
7777
},
78-
title: 'ML anomaly swimlane for fb_population_1',
78+
title: 'ML anomaly swim lane for fb_population_1',
7979
},
8080
{
8181
version: '8.0.0',
@@ -118,12 +118,12 @@ describe('DashboardService', () => {
118118
gridData: { x: 24, y: 0, w: 24, h: 15, i: '0aa334bd-8308-4ded-9462-80dbd37680ee' },
119119
panelIndex: '0aa334bd-8308-4ded-9462-80dbd37680ee',
120120
embeddableConfig: {
121-
title: 'ML anomaly swimlane for fb_population_1',
121+
title: 'ML anomaly swim lane for fb_population_1',
122122
jobIds: ['fb_population_1'],
123123
limit: 5,
124124
swimlaneType: 'overall',
125125
},
126-
title: 'ML anomaly swimlane for fb_population_1',
126+
title: 'ML anomaly swim lane for fb_population_1',
127127
},
128128
{
129129
version: '8.0.0',

‎x-pack/plugins/ml/public/application/services/explorer_service.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ export class ExplorerService {
5555

5656
const intervalSeconds = this.timeBuckets.getInterval().asSeconds();
5757

58-
// if the swimlane cell widths are too small they will not be visible
59-
// calculate how many buckets will be drawn before the swimlanes are actually rendered
58+
// if the swim lane cell widths are too small they will not be visible
59+
// calculate how many buckets will be drawn before the swim lanes are actually rendered
6060
// and increase the interval to widen the cells if they're going to be smaller than 8px
6161
// this has to be done at this stage so all searches use the same interval
6262
const timerangeSeconds = (bounds.max!.valueOf() - bounds.min!.valueOf()) / 1000;
@@ -81,7 +81,7 @@ export class ExplorerService {
8181
}
8282

8383
/**
84-
* Loads overall swimlane data
84+
* Loads overall swim lane data
8585
* @param selectedJobs
8686
* @param chartWidth
8787
*/
@@ -97,13 +97,13 @@ export class ExplorerService {
9797

9898
const bounds = this.getTimeBounds();
9999

100-
// Ensure the search bounds align to the bucketing interval used in the swimlane so
100+
// Ensure the search bounds align to the bucketing interval used in the swim lane so
101101
// that the first and last buckets are complete.
102102
const searchBounds = getBoundsRoundedToInterval(bounds, interval, false);
103103
const selectedJobIds = selectedJobs.map((d) => d.id);
104104

105105
// Load the overall bucket scores by time.
106-
// Pass the interval in seconds as the swimlane relies on a fixed number of seconds between buckets
106+
// Pass the interval in seconds as the swim lane relies on a fixed number of seconds between buckets
107107
// which wouldn't be the case if e.g. '1M' was used.
108108
// Pass 'true' when obtaining bucket bounds due to the way the overall_buckets endpoint works
109109
// to ensure the search is inclusive of end time.
@@ -125,7 +125,7 @@ export class ExplorerService {
125125
);
126126

127127
// eslint-disable-next-line no-console
128-
console.log('Explorer overall swimlane data set:', overallSwimlaneData);
128+
console.log('Explorer overall swim lane data set:', overallSwimlaneData);
129129

130130
return overallSwimlaneData;
131131
}
@@ -158,7 +158,7 @@ export class ExplorerService {
158158

159159
const selectedJobIds = selectedJobs.map((d) => d.id);
160160
// load scores by influencer/jobId value and time.
161-
// Pass the interval in seconds as the swimlane relies on a fixed number of seconds between buckets
161+
// Pass the interval in seconds as the swim lane relies on a fixed number of seconds between buckets
162162
// which wouldn't be the case if e.g. '1M' was used.
163163

164164
const interval = `${swimlaneBucketInterval.asSeconds()}s`;
@@ -199,7 +199,7 @@ export class ExplorerService {
199199
swimlaneBucketInterval.asSeconds()
200200
);
201201
// eslint-disable-next-line no-console
202-
console.log('Explorer view by swimlane data set:', viewBySwimlaneData);
202+
console.log('Explorer view by swim lane data set:', viewBySwimlaneData);
203203

204204
return viewBySwimlaneData;
205205
}
@@ -227,7 +227,7 @@ export class ExplorerService {
227227
};
228228

229229
// Store the earliest and latest times of the data returned by the ES aggregations,
230-
// These will be used for calculating the earliest and latest times for the swimlane charts.
230+
// These will be used for calculating the earliest and latest times for the swim lane charts.
231231
Object.entries(scoresByTime).forEach(([timeMs, score]) => {
232232
const time = Number(timeMs) / 1000;
233233
dataset.points.push({
@@ -250,7 +250,7 @@ export class ExplorerService {
250250
viewBySwimlaneFieldName: string,
251251
interval: number
252252
): OverallSwimlaneData {
253-
// Processes the scores for the 'view by' swimlane.
253+
// Processes the scores for the 'view by' swim lane.
254254
// Sorts the lanes according to the supplied array of lane
255255
// values in the order in which they should be displayed,
256256
// or pass an empty array to sort lanes according to max score over all time.
@@ -259,7 +259,7 @@ export class ExplorerService {
259259
points: [],
260260
laneLabels: [],
261261
interval,
262-
// Set the earliest and latest to be the same as the overall swimlane.
262+
// Set the earliest and latest to be the same as the overall swim lane.
263263
earliest: bounds.earliest,
264264
latest: bounds.latest,
265265
};
@@ -295,7 +295,7 @@ export class ExplorerService {
295295
});
296296
} else {
297297
// Sort lanes according to supplied order
298-
// e.g. when a cell in the overall swimlane has been selected.
298+
// e.g. when a cell in the overall swim lane has been selected.
299299
// Find the index of each lane label from the actual data set,
300300
// rather than using sortedLaneValues as-is, just in case they differ.
301301
dataset.laneLabels = dataset.laneLabels.sort((a, b) => {

‎x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const ANOMALY_SWIMLANE_EMBEDDABLE_TYPE = 'ml_anomaly_swimlane';
3232

3333
export const getDefaultPanelTitle = (jobIds: JobId[]) =>
3434
i18n.translate('xpack.ml.swimlaneEmbeddable.title', {
35-
defaultMessage: 'ML anomaly swimlane for {jobIds}',
35+
defaultMessage: 'ML anomaly swim lane for {jobIds}',
3636
values: { jobIds: jobIds.join(', ') },
3737
});
3838

‎x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AnomalySwimlaneEmbeddableFactory
3939

4040
public getDisplayName() {
4141
return i18n.translate('xpack.ml.components.jobAnomalyScoreEmbeddable.displayName', {
42-
defaultMessage: 'ML Anomaly Swimlane',
42+
defaultMessage: 'ML Anomaly Swim Lane',
4343
});
4444
}
4545

‎x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export const AnomalySwimlaneInitializer: FC<AnomalySwimlaneInitializerProps> = (
9292
<EuiModalHeaderTitle>
9393
<FormattedMessage
9494
id="xpack.ml.swimlaneEmbeddable.setupModal.title"
95-
defaultMessage="Anomaly swimlane configuration"
95+
defaultMessage="Anomaly swim lane configuration"
9696
/>
9797
</EuiModalHeaderTitle>
9898
</EuiModalHeader>
@@ -121,7 +121,7 @@ export const AnomalySwimlaneInitializer: FC<AnomalySwimlaneInitializerProps> = (
121121
label={
122122
<FormattedMessage
123123
id="xpack.ml.swimlaneEmbeddable.setupModal.swimlaneTypeLabel"
124-
defaultMessage="Swimlane type"
124+
defaultMessage="Swim lane type"
125125
/>
126126
}
127127
>
@@ -131,7 +131,7 @@ export const AnomalySwimlaneInitializer: FC<AnomalySwimlaneInitializerProps> = (
131131
color="primary"
132132
isFullWidth
133133
legend={i18n.translate('xpack.ml.swimlaneEmbeddable.setupModal.swimlaneTypeLabel', {
134-
defaultMessage: 'Swimlane type',
134+
defaultMessage: 'Swim lane type',
135135
})}
136136
options={swimlaneTypeOptions}
137137
idSelected={swimlaneType}

‎x-pack/plugins/ml/public/embeddables/anomaly_swimlane/explorer_swimlane_container.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const ExplorerSwimlaneContainer: FC<ExplorerSwimlaneContainerProps> = ({
6969
title={
7070
<FormattedMessage
7171
id="xpack.ml.swimlaneEmbeddable.errorMessage"
72-
defaultMessage="Unable to load the ML swimlane data"
72+
defaultMessage="Unable to load the ML swim lane data"
7373
/>
7474
}
7575
color="danger"

‎x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function createEditSwimlanePanelAction(getStartServices: CoreSetup['getSt
3232
},
3333
getDisplayName: () =>
3434
i18n.translate('xpack.ml.actions.editSwimlaneTitle', {
35-
defaultMessage: 'Edit swimlane',
35+
defaultMessage: 'Edit swim lane',
3636
}),
3737
execute: async ({ embeddable }: EditSwimlanePanelContext) => {
3838
if (!embeddable) {

0 commit comments

Comments
 (0)