{
columns: [],
isPlainRecord: true,
allSuggestions: [], // none available
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.visContext?.attributes.state.query).toStrictEqual(histogramQuery);
});
diff --git a/src/plugins/unified_histogram/public/services/lens_vis_service.suggestions.test.ts b/src/plugins/unified_histogram/public/services/lens_vis_service.suggestions.test.ts
index 09ee2a68ec248..baeb330180ab8 100644
--- a/src/plugins/unified_histogram/public/services/lens_vis_service.suggestions.test.ts
+++ b/src/plugins/unified_histogram/public/services/lens_vis_service.suggestions.test.ts
@@ -86,7 +86,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: false,
+ isTransformationalESQL: true,
});
expect(lensVis.currentSuggestionContext?.type).toBe(UnifiedHistogramSuggestionType.unsupported);
@@ -115,7 +115,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.currentSuggestionContext?.type).toBe(
@@ -153,7 +153,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.currentSuggestionContext?.type).toBe(
@@ -191,7 +191,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: true,
});
expect(lensVis.currentSuggestionContext?.type).toBe(UnifiedHistogramSuggestionType.unsupported);
@@ -225,7 +225,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.currentSuggestionContext?.type).toBe(
@@ -276,7 +276,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: allSuggestionsMock,
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.currentSuggestionContext?.type).toBe(
@@ -307,7 +307,7 @@ describe('LensVisService suggestions', () => {
],
isPlainRecord: true,
allSuggestions: [],
- hasHistogramSuggestionForESQL: true,
+ isTransformationalESQL: false,
});
expect(lensVis.currentSuggestionContext?.type).toBe(
diff --git a/src/plugins/unified_histogram/public/services/lens_vis_service.ts b/src/plugins/unified_histogram/public/services/lens_vis_service.ts
index 04bf810848f29..1f119ee5b1c92 100644
--- a/src/plugins/unified_histogram/public/services/lens_vis_service.ts
+++ b/src/plugins/unified_histogram/public/services/lens_vis_service.ts
@@ -13,6 +13,7 @@ import {
removeDropCommandsFromESQLQuery,
appendToESQLQuery,
isESQLColumnSortable,
+ hasTransformationalCommand,
} from '@kbn/esql-utils';
import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
import type {
@@ -50,7 +51,6 @@ import {
injectESQLQueryIntoLensLayers,
} from '../utils/external_vis_context';
import { computeInterval } from '../utils/compute_interval';
-import { shouldDisplayHistogram } from '../layout/helpers';
import { enrichLensAttributesWithTablesData } from '../utils/lens_vis_from_table';
const UNIFIED_HISTOGRAM_LAYER_ID = 'unifiedHistogram';
@@ -67,7 +67,6 @@ export enum LensVisServiceStatus {
interface LensVisServiceState {
status: LensVisServiceStatus;
- allSuggestions: Suggestion[] | undefined;
currentSuggestionContext: UnifiedHistogramSuggestionContext;
visContext: UnifiedHistogramVisContext | undefined;
}
@@ -87,7 +86,6 @@ export class LensVisService {
private lensSuggestionsApi: LensSuggestionsApi;
status$: Observable
;
currentSuggestionContext$: Observable;
- allSuggestions$: Observable;
visContext$: Observable;
prevUpdateContext:
| {
@@ -111,7 +109,6 @@ export class LensVisService {
this.state$ = new BehaviorSubject({
status: LensVisServiceStatus.initial,
- allSuggestions: undefined,
currentSuggestionContext: {
suggestion: undefined,
type: UnifiedHistogramSuggestionType.unsupported,
@@ -121,7 +118,6 @@ export class LensVisService {
const stateSelector = stateSelectorFactory(this.state$);
this.status$ = stateSelector((state) => state.status);
- this.allSuggestions$ = stateSelector((state) => state.allSuggestions);
this.currentSuggestionContext$ = stateSelector(
(state) => state.currentSuggestionContext,
isEqual
@@ -152,15 +148,9 @@ export class LensVisService {
externalVisContextStatus: UnifiedHistogramExternalVisContextStatus
) => void;
}) => {
- const allSuggestions = this.getAllSuggestions({
- queryParams,
- preferredVisAttributes: externalVisContext?.attributes,
- });
-
const suggestionState = this.getCurrentSuggestionState({
externalVisContext,
queryParams,
- allSuggestions,
timeInterval,
breakdownField,
});
@@ -182,7 +172,6 @@ export class LensVisService {
this.state$.next({
status: LensVisServiceStatus.completed,
- allSuggestions,
currentSuggestionContext: suggestionState.currentSuggestionContext,
visContext: lensAttributesState.visContext,
});
@@ -225,13 +214,11 @@ export class LensVisService {
};
private getCurrentSuggestionState = ({
- allSuggestions,
externalVisContext,
queryParams,
timeInterval,
breakdownField,
}: {
- allSuggestions: Suggestion[];
externalVisContext: UnifiedHistogramVisContext | undefined;
queryParams: QueryParams;
timeInterval: string | undefined;
@@ -242,34 +229,41 @@ export class LensVisService {
let type = UnifiedHistogramSuggestionType.unsupported;
let currentSuggestion: Suggestion | undefined;
- // takes lens suggestions if provided
- let availableSuggestionsWithType: Array<{
+ const availableSuggestionsWithType: Array<{
suggestion: UnifiedHistogramSuggestionContext['suggestion'];
type: UnifiedHistogramSuggestionType;
}> = [];
- if (allSuggestions.length) {
- availableSuggestionsWithType.push({
- suggestion: allSuggestions[0],
- type: UnifiedHistogramSuggestionType.lensSuggestion,
- });
- }
-
if (queryParams.isPlainRecord) {
- // appends an ES|QL histogram
- const histogramSuggestionForESQL = this.getHistogramSuggestionForESQL({
- queryParams,
- breakdownField,
- preferredVisAttributes: externalVisContext?.attributes,
- });
- if (histogramSuggestionForESQL) {
- // In case if histogram suggestion, we want to empty the array and push the new suggestion
- // to ensure that only the histogram suggestion is available
- availableSuggestionsWithType = [];
- availableSuggestionsWithType.push({
- suggestion: histogramSuggestionForESQL,
- type: UnifiedHistogramSuggestionType.histogramForESQL,
- });
+ if (isOfAggregateQueryType(queryParams.query)) {
+ if (hasTransformationalCommand(queryParams.query.esql)) {
+ // appends the first lens suggestion if available
+ const allSuggestions = this.getAllSuggestions({
+ queryParams,
+ preferredVisAttributes: externalVisContext?.attributes,
+ });
+
+ if (allSuggestions.length) {
+ availableSuggestionsWithType.push({
+ suggestion: allSuggestions[0],
+ type: UnifiedHistogramSuggestionType.lensSuggestion,
+ });
+ }
+ } else {
+ // appends an ES|QL histogram if available
+ const histogramSuggestionForESQL = this.getHistogramSuggestionForESQL({
+ queryParams,
+ breakdownField,
+ preferredVisAttributes: externalVisContext?.attributes,
+ });
+
+ if (histogramSuggestionForESQL) {
+ availableSuggestionsWithType.push({
+ suggestion: histogramSuggestionForESQL,
+ type: UnifiedHistogramSuggestionType.histogramForESQL,
+ });
+ }
+ }
}
} else {
// appends histogram for the data view mode
@@ -482,10 +476,13 @@ export class LensVisService {
const breakdownColumn = breakdownField?.name
? columns?.find((column) => column.name === breakdownField.name)
: undefined;
- if (dataView.isTimeBased() && query && isOfAggregateQueryType(query) && timeRange) {
- const isOnHistogramMode = shouldDisplayHistogram(query);
- if (!isOnHistogramMode) return undefined;
+ if (
+ dataView.isTimeBased() &&
+ timeRange &&
+ isOfAggregateQueryType(query) &&
+ !hasTransformationalCommand(query.esql)
+ ) {
const interval = computeInterval(timeRange, this.services.data);
const esqlQuery = this.getESQLHistogramQuery({
dataView,
@@ -609,13 +606,17 @@ export class LensVisService {
}): Suggestion[] => {
const { dataView, columns, query, isPlainRecord } = queryParams;
+ if (!isPlainRecord || !isOfAggregateQueryType(query)) {
+ return [];
+ }
+
const preferredChartType = preferredVisAttributes
? mapVisToChartType(preferredVisAttributes.visualizationType)
: undefined;
let visAttributes = preferredVisAttributes;
- if (query && isOfAggregateQueryType(query) && preferredVisAttributes) {
+ if (preferredVisAttributes) {
visAttributes = injectESQLQueryIntoLensLayers(preferredVisAttributes, query);
}
@@ -625,17 +626,16 @@ export class LensVisService {
textBasedColumns: columns,
query: query && isOfAggregateQueryType(query) ? query : undefined,
};
- const allSuggestions = isPlainRecord
- ? this.lensSuggestionsApi(
- context,
- dataView,
- ['lnsDatatable'],
- preferredChartType,
- visAttributes
- ) ?? []
- : [];
- return allSuggestions;
+ return (
+ this.lensSuggestionsApi(
+ context,
+ dataView,
+ ['lnsDatatable'],
+ preferredChartType,
+ visAttributes
+ ) ?? []
+ );
};
private getLensAttributesState = ({
diff --git a/src/plugins/vis_types/vislib/public/vislib/lib/data.js b/src/plugins/vis_types/vislib/public/vislib/lib/data.js
index 94c39c95930af..83c6167d40923 100644
--- a/src/plugins/vis_types/vislib/public/vislib/lib/data.js
+++ b/src/plugins/vis_types/vislib/public/vislib/lib/data.js
@@ -45,15 +45,11 @@ class D3MappableObject {
* @param attr {Object|*} Visualization options
*/
export class Data {
- constructor(data, uiState, createColorLookupFunction) {
+ constructor(data, uiState) {
this.uiState = uiState;
- this.createColorLookupFunction = createColorLookupFunction;
this.data = this.copyDataObj(data);
this.type = this.getDataType();
this.labels = this._getLabels(this.data);
- this.color = this.labels
- ? createColorLookupFunction(this.labels, uiState.get('vis.colors'))
- : undefined;
this._normalizeOrdered();
}
@@ -385,7 +381,7 @@ export class Data {
const defaultColors = this.uiState.get('vis.defaultColors');
const overwriteColors = this.uiState.get('vis.colors');
const colors = defaultColors ? _.defaults({}, overwriteColors, defaultColors) : overwriteColors;
- return this.createColorLookupFunction(this.getLabels(), colors);
+ return (value) => colors[value];
}
/**
diff --git a/src/plugins/vis_types/vislib/public/vislib/lib/vis_config.js b/src/plugins/vis_types/vislib/public/vislib/lib/vis_config.js
index bb25a8ddaada4..28d0d0c67c277 100644
--- a/src/plugins/vis_types/vislib/public/vislib/lib/vis_config.js
+++ b/src/plugins/vis_types/vislib/public/vislib/lib/vis_config.js
@@ -25,8 +25,8 @@ const DEFAULT_VIS_CONFIG = {
};
export class VisConfig {
- constructor(visConfigArgs, data, uiState, el, createColorLookupFunction) {
- this.data = new Data(data, uiState, createColorLookupFunction);
+ constructor(visConfigArgs, data, uiState, el) {
+ this.data = new Data(data, uiState);
const visType = visTypes[visConfigArgs.type];
const typeDefaults = visType(visConfigArgs, this.data);
diff --git a/src/plugins/vis_types/vislib/public/vislib/vis.js b/src/plugins/vis_types/vislib/public/vislib/vis.js
index 80f7393d69af2..35241d999f2f2 100644
--- a/src/plugins/vis_types/vislib/public/vislib/vis.js
+++ b/src/plugins/vis_types/vislib/public/vislib/vis.js
@@ -41,13 +41,7 @@ export class Vis extends EventEmitter {
initVisConfig(data, uiState) {
this.data = data;
this.uiState = uiState;
- this.visConfig = new VisConfig(
- this.visConfigArgs,
- this.data,
- this.uiState,
- this.element,
- this.charts.legacyColors.createColorLookupFunction.bind(this.charts.legacyColors)
- );
+ this.visConfig = new VisConfig(this.visConfigArgs, this.data, this.uiState, this.element);
}
/**
diff --git a/test/functional/apps/discover/context_awareness/extensions/_get_additional_cell_actions.ts b/test/functional/apps/discover/context_awareness/extensions/_get_additional_cell_actions.ts
index a2f8b1efe8dd3..23363cdb315d7 100644
--- a/test/functional/apps/discover/context_awareness/extensions/_get_additional_cell_actions.ts
+++ b/test/functional/apps/discover/context_awareness/extensions/_get_additional_cell_actions.ts
@@ -12,7 +12,13 @@ import expect from '@kbn/expect';
import type { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
- const PageObjects = getPageObjects(['common', 'discover', 'header', 'unifiedFieldList']);
+ const PageObjects = getPageObjects([
+ 'common',
+ 'discover',
+ 'header',
+ 'unifiedFieldList',
+ 'context',
+ ]);
const dataViews = getService('dataViews');
const dataGrid = getService('dataGrid');
const browser = getService('browser');
@@ -29,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('example-data-source-action');
let alert = await browser.getAlert();
try {
@@ -37,7 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
} finally {
await alert?.dismiss();
}
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('another-example-data-source-action');
alert = await browser.getAlert();
try {
@@ -57,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 2);
+ await dataGrid.clickCellExpandButton(0, { columnName: 'message' });
expect(await dataGrid.cellExpandPopoverActionExists('example-data-source-action')).to.be(
true
);
@@ -76,7 +82,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
expect(await dataGrid.cellExpandPopoverActionExists('example-data-source-action')).to.be(
false
);
@@ -94,7 +100,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataViews.switchTo('my-example-logs');
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('example-data-source-action');
let alert = await browser.getAlert();
try {
@@ -102,7 +108,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
} finally {
await alert?.dismiss();
}
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('another-example-data-source-action');
alert = await browser.getAlert();
try {
@@ -118,7 +124,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await browser.refresh();
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await PageObjects.context.waitUntilContextLoadingHasFinished();
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('example-data-source-action');
alert = await browser.getAlert();
try {
@@ -126,7 +133,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
} finally {
await alert?.dismiss();
}
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
await dataGrid.clickCellExpandPopoverAction('another-example-data-source-action');
alert = await browser.getAlert();
try {
@@ -143,7 +150,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataViews.switchTo('my-example-logs');
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 2);
+ await dataGrid.clickCellExpandButton(0, { columnName: 'message' });
expect(await dataGrid.cellExpandPopoverActionExists('example-data-source-action')).to.be(
true
);
@@ -159,7 +166,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dataViews.switchTo('my-example-metrics');
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.discover.waitUntilSearchingHasFinished();
- await dataGrid.clickCellExpandButtonExcludingControlColumns(0, 0);
+ await dataGrid.clickCellExpandButton(0, { columnName: '@timestamp' });
expect(await dataGrid.cellExpandPopoverActionExists('example-data-source-action')).to.be(
false
);
diff --git a/test/functional/apps/discover/esql/_esql_view.ts b/test/functional/apps/discover/esql/_esql_view.ts
index b1fd957f97a6d..d27df2244b18b 100644
--- a/test/functional/apps/discover/esql/_esql_view.ts
+++ b/test/functional/apps/discover/esql/_esql_view.ts
@@ -142,9 +142,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should perform test query correctly', async function () {
await timePicker.setDefaultAbsoluteRange();
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
await discover.selectTextBaseLang();
- const testQuery = `from logstash-* | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
+ const testQuery = `from logstash-* | sort @timestamp | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
await monacoEditor.setCodeEditorValue(testQuery);
await testSubjects.click('querySubmitButton');
await header.waitUntilLoadingHasFinished();
@@ -158,7 +162,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should render when switching to a time range with no data, then back to a time range with data', async () => {
await discover.selectTextBaseLang();
- const testQuery = `from logstash-* | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
+
+ const testQuery = `from logstash-* | sort @timestamp | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
await monacoEditor.setCodeEditorValue(testQuery);
await testSubjects.click('querySubmitButton');
await header.waitUntilLoadingHasFinished();
@@ -181,8 +188,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should query an index pattern that doesnt translate to a dataview correctly', async function () {
await discover.selectTextBaseLang();
- const testQuery = `from logstash* | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
+ const testQuery = `from logstash* | sort @timestamp | limit 10 | stats countB = count(bytes) by geo.dest | sort countB`;
await monacoEditor.setCodeEditorValue(testQuery);
await testSubjects.click('querySubmitButton');
await header.waitUntilLoadingHasFinished();
@@ -296,6 +305,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await header.waitUntilLoadingHasFinished();
await discover.waitUntilSearchingHasFinished();
await discover.saveSearch('esql_test2');
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
const testQuery = 'from logstash-* | limit 100 | drop @timestamp';
await monacoEditor.setCodeEditorValue(testQuery);
await testSubjects.click('querySubmitButton');
diff --git a/test/functional/apps/discover/group3/_lens_vis.ts b/test/functional/apps/discover/group3/_lens_vis.ts
index 03641ee5bcb41..71757ecbfcd20 100644
--- a/test/functional/apps/discover/group3/_lens_vis.ts
+++ b/test/functional/apps/discover/group3/_lens_vis.ts
@@ -110,17 +110,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
return seriesType;
}
- // FLAKY: https://github.com/elastic/kibana/issues/184600
- describe.skip('discover lens vis', function () {
+ describe('discover lens vis', function () {
before(async () => {
await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
+ await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/many_fields');
+ await kibanaServer.importExport.load(
+ 'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+ );
await browser.setWindowSize(1300, 1000);
});
after(async () => {
await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+ await kibanaServer.importExport.unload(
+ 'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+ );
+ await esArchiver.unload('test/functional/fixtures/es_archiver/many_fields');
await kibanaServer.uiSettings.replace({});
await kibanaServer.savedObjects.cleanStandardList();
});
@@ -193,6 +200,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(await discover.getVisContextSuggestionType()).to.be('histogramForDataView');
});
+ it('should show no histogram for non-time-based data in data view and ES|QL modes', async () => {
+ await dataViews.switchToAndValidate('indices-stats*');
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
+ await checkNoVis('50');
+
+ await discover.selectTextBaseLang();
+ await header.waitUntilLoadingHasFinished();
+ await discover.waitUntilSearchingHasFinished();
+ await checkNoVis('10');
+ });
+
it('should show ESQL histogram for ES|QL query', async () => {
await discover.selectTextBaseLang();
@@ -655,8 +674,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await discover.waitUntilSearchingHasFinished();
await testSubjects.missingOrFail('unsavedChangesBadge');
- await discover.chooseLensSuggestion('pie');
- expect(await getCurrentVisTitle()).to.be('Pie');
+ await discover.chooseLensSuggestion('waffle');
+ expect(await getCurrentVisTitle()).to.be('Waffle');
await testSubjects.existOrFail('partitionVisChart');
expect(await discover.getVisContextSuggestionType()).to.be('lensSuggestion');
diff --git a/test/functional/page_objects/unified_field_list.ts b/test/functional/page_objects/unified_field_list.ts
index 4751769f717bd..6a5f16a2cac30 100644
--- a/test/functional/page_objects/unified_field_list.ts
+++ b/test/functional/page_objects/unified_field_list.ts
@@ -204,10 +204,9 @@ export class UnifiedFieldListPageObject extends FtrService {
if (!isActive) {
// expand the field to show the "Visualize" button
- await field.click();
+ await this.clickFieldListItem(fieldName);
}
- await this.waitUntilFieldPopoverIsOpen();
const visualizeButtonTestSubject = `fieldVisualize-${fieldName}`;
// wrap visualize button click in retry to ensure button is clicked and retry if button click is not registered
await this.retry.try(async () => {
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index 36e5285a529b8..3b17a31d624b6 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -174,12 +174,14 @@ export class DataGridService extends FtrService {
private async getCellActionButton(
rowIndex: number = 0,
- columnIndex: number = 0,
+ { columnIndex = 0, columnName }: { columnIndex?: number; columnName?: string },
selector: string
): Promise {
let actionButton: WebElementWrapper | undefined;
await this.retry.try(async () => {
- const cell = await this.getCellElement(rowIndex, columnIndex);
+ const cell = columnName
+ ? await this.getCellElementByColumnName(rowIndex, columnName)
+ : await this.getCellElement(rowIndex, columnIndex);
await cell.moveMouseTo();
await cell.click();
actionButton = await cell.findByTestSubject(selector);
@@ -194,11 +196,15 @@ export class DataGridService extends FtrService {
* Clicks grid cell 'expand' action button
* @param rowIndex data row index starting from 0 (0 means 1st row)
* @param columnIndex column index starting from 0 (0 means 1st column)
+ * @param columnName column/field name
*/
- public async clickCellExpandButton(rowIndex: number = 0, columnIndex: number = 0) {
+ public async clickCellExpandButton(
+ rowIndex: number = 0,
+ { columnIndex = 0, columnName }: { columnIndex?: number; columnName?: string }
+ ) {
const actionButton = await this.getCellActionButton(
rowIndex,
- columnIndex,
+ { columnIndex, columnName },
'euiDataGridCellExpandButton'
);
await actionButton.moveMouseTo();
@@ -218,7 +224,7 @@ export class DataGridService extends FtrService {
columnIndex: number = 0
) {
const controlsCount = await this.getControlColumnsCount();
- await this.clickCellExpandButton(rowIndex, controlsCount + columnIndex);
+ await this.clickCellExpandButton(rowIndex, { columnIndex: controlsCount + columnIndex });
}
/**
@@ -244,7 +250,11 @@ export class DataGridService extends FtrService {
* @param columnIndex column index starting from 0 (0 means 1st column)
*/
public async clickCellFilterForButton(rowIndex: number = 0, columnIndex: number = 0) {
- const actionButton = await this.getCellActionButton(rowIndex, columnIndex, 'filterForButton');
+ const actionButton = await this.getCellActionButton(
+ rowIndex,
+ { columnIndex },
+ 'filterForButton'
+ );
await actionButton.moveMouseTo();
await actionButton.click();
}
@@ -261,7 +271,7 @@ export class DataGridService extends FtrService {
const controlsCount = await this.getControlColumnsCount();
const actionButton = await this.getCellActionButton(
rowIndex,
- controlsCount + columnIndex,
+ { columnIndex: controlsCount + columnIndex },
'filterForButton'
);
await actionButton.moveMouseTo();
@@ -269,7 +279,11 @@ export class DataGridService extends FtrService {
}
public async clickCellFilterOutButton(rowIndex: number = 0, columnIndex: number = 0) {
- const actionButton = await this.getCellActionButton(rowIndex, columnIndex, 'filterOutButton');
+ const actionButton = await this.getCellActionButton(
+ rowIndex,
+ { columnIndex },
+ 'filterOutButton'
+ );
await actionButton.moveMouseTo();
await actionButton.click();
}
@@ -281,7 +295,7 @@ export class DataGridService extends FtrService {
const controlsCount = await this.getControlColumnsCount();
const actionButton = await this.getCellActionButton(
rowIndex,
- controlsCount + columnIndex,
+ { columnIndex: controlsCount + columnIndex },
'filterOutButton'
);
await actionButton.moveMouseTo();
diff --git a/test/plugin_functional/test_suites/panel_actions/index.ts b/test/plugin_functional/test_suites/panel_actions/index.ts
index ad4871e961db1..5e18d768acf13 100644
--- a/test/plugin_functional/test_suites/panel_actions/index.ts
+++ b/test/plugin_functional/test_suites/panel_actions/index.ts
@@ -19,7 +19,8 @@ export default function ({
const kibanaServer = getService('kibanaServer');
const { common, dashboard } = getPageObjects(['common', 'dashboard']);
- describe('pluggable panel actions', function () {
+ // Failing: See https://github.com/elastic/kibana/issues/197475
+ describe.skip('pluggable panel actions', function () {
before(async () => {
await browser.setWindowSize(1300, 900);
await kibanaServer.savedObjects.cleanStandardList();
diff --git a/versions.json b/versions.json
index c657a16ecc1ac..0843e7d912622 100644
--- a/versions.json
+++ b/versions.json
@@ -8,13 +8,18 @@
"currentMinor": true
},
{
- "version": "8.17.0",
+ "version": "8.18.0",
"branch": "8.x",
"previousMajor": true,
"previousMinor": true
},
{
- "version": "8.16.1",
+ "version": "8.17.0",
+ "branch": "8.17",
+ "previousMajor": true
+ },
+ {
+ "version": "8.16.2",
"branch": "8.16",
"previousMajor": true
},
diff --git a/x-pack/packages/ai-infra/inference-common/index.ts b/x-pack/packages/ai-infra/inference-common/index.ts
index 2791896c801ef..4b5ef3a5cfda1 100644
--- a/x-pack/packages/ai-infra/inference-common/index.ts
+++ b/x-pack/packages/ai-infra/inference-common/index.ts
@@ -34,6 +34,9 @@ export {
type ChatCompleteStreamResponse,
type ChatCompleteResponse,
type ChatCompletionTokenCount,
+ type BoundChatCompleteAPI,
+ type BoundChatCompleteOptions,
+ type UnboundChatCompleteOptions,
withoutTokenCountEvents,
withoutChunkEvents,
isChatCompletionMessageEvent,
@@ -59,6 +62,9 @@ export {
type OutputUpdateEvent,
type Output,
type OutputEvent,
+ type BoundOutputAPI,
+ type BoundOutputOptions,
+ type UnboundOutputOptions,
isOutputCompleteEvent,
isOutputUpdateEvent,
isOutputEvent,
diff --git a/x-pack/packages/ai-infra/inference-common/src/chat_complete/bound_api.ts b/x-pack/packages/ai-infra/inference-common/src/chat_complete/bound_api.ts
new file mode 100644
index 0000000000000..083620ed99a93
--- /dev/null
+++ b/x-pack/packages/ai-infra/inference-common/src/chat_complete/bound_api.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ChatCompleteOptions, ChatCompleteCompositeResponse } from './api';
+import type { ToolOptions } from './tools';
+
+/**
+ * Static options used to call the {@link BoundChatCompleteAPI}
+ */
+export type BoundChatCompleteOptions<
+ TToolOptions extends ToolOptions = ToolOptions,
+ TStream extends boolean = false
+> = Pick, 'connectorId' | 'functionCalling'>;
+
+/**
+ * Options used to call the {@link BoundChatCompleteAPI}
+ */
+export type UnboundChatCompleteOptions<
+ TToolOptions extends ToolOptions = ToolOptions,
+ TStream extends boolean = false
+> = Omit, 'connectorId' | 'functionCalling'>;
+
+/**
+ * Version of {@link ChatCompleteAPI} that got pre-bound to a set of static parameters
+ */
+export type BoundChatCompleteAPI = <
+ TToolOptions extends ToolOptions = ToolOptions,
+ TStream extends boolean = false
+>(
+ options: UnboundChatCompleteOptions
+) => ChatCompleteCompositeResponse;
diff --git a/x-pack/packages/ai-infra/inference-common/src/chat_complete/index.ts b/x-pack/packages/ai-infra/inference-common/src/chat_complete/index.ts
index ca69f39b273e5..3daa898ab2e1a 100644
--- a/x-pack/packages/ai-infra/inference-common/src/chat_complete/index.ts
+++ b/x-pack/packages/ai-infra/inference-common/src/chat_complete/index.ts
@@ -13,6 +13,11 @@ export type {
ChatCompleteStreamResponse,
ChatCompleteResponse,
} from './api';
+export type {
+ BoundChatCompleteAPI,
+ BoundChatCompleteOptions,
+ UnboundChatCompleteOptions,
+} from './bound_api';
export {
ChatCompletionEventType,
type ChatCompletionMessageEvent,
diff --git a/x-pack/packages/ai-infra/inference-common/src/output/bound_api.ts b/x-pack/packages/ai-infra/inference-common/src/output/bound_api.ts
new file mode 100644
index 0000000000000..967dac20c0568
--- /dev/null
+++ b/x-pack/packages/ai-infra/inference-common/src/output/bound_api.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { OutputOptions, OutputCompositeResponse } from './api';
+import type { ToolSchema } from '../chat_complete/tool_schema';
+
+/**
+ * Static options used to call the {@link BoundOutputAPI}
+ */
+export type BoundOutputOptions<
+ TId extends string = string,
+ TOutputSchema extends ToolSchema | undefined = ToolSchema | undefined,
+ TStream extends boolean = false
+> = Pick, 'connectorId' | 'functionCalling'>;
+
+/**
+ * Options used to call the {@link BoundOutputAPI}
+ */
+export type UnboundOutputOptions<
+ TId extends string = string,
+ TOutputSchema extends ToolSchema | undefined = ToolSchema | undefined,
+ TStream extends boolean = false
+> = Omit, 'connectorId' | 'functionCalling'>;
+
+/**
+ * Version of {@link OutputAPI} that got pre-bound to a set of static parameters
+ */
+export type BoundOutputAPI = <
+ TId extends string = string,
+ TOutputSchema extends ToolSchema | undefined = ToolSchema | undefined,
+ TStream extends boolean = false
+>(
+ options: UnboundOutputOptions
+) => OutputCompositeResponse;
diff --git a/x-pack/packages/ai-infra/inference-common/src/output/index.ts b/x-pack/packages/ai-infra/inference-common/src/output/index.ts
index a3039005b2f7c..d4e17967b50f5 100644
--- a/x-pack/packages/ai-infra/inference-common/src/output/index.ts
+++ b/x-pack/packages/ai-infra/inference-common/src/output/index.ts
@@ -12,6 +12,7 @@ export type {
OutputResponse,
OutputStreamResponse,
} from './api';
+export type { BoundOutputAPI, BoundOutputOptions, UnboundOutputOptions } from './bound_api';
export {
OutputEventType,
type OutputCompleteEvent,
diff --git a/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_misconfigurations.ts b/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_misconfigurations.ts
new file mode 100644
index 0000000000000..9b126332b567b
--- /dev/null
+++ b/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_misconfigurations.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { buildEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
+import { useMisconfigurationPreview } from './use_misconfiguration_preview';
+
+export const useHasMisconfigurations = (field: 'host.name' | 'user.name', value: string) => {
+ const { data } = useMisconfigurationPreview({
+ query: buildEntityFlyoutPreviewQuery(field, value),
+ sort: [],
+ enabled: true,
+ pageSize: 1,
+ });
+
+ const passedFindings = data?.count.passed || 0;
+ const failedFindings = data?.count.failed || 0;
+
+ const hasMisconfigurationFindings = passedFindings > 0 || failedFindings > 0;
+
+ return {
+ passedFindings,
+ failedFindings,
+ hasMisconfigurationFindings,
+ };
+};
diff --git a/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_vulnerabilities.ts b/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_vulnerabilities.ts
new file mode 100644
index 0000000000000..336892ee888af
--- /dev/null
+++ b/x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_has_vulnerabilities.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { buildEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
+import { useVulnerabilitiesPreview } from './use_vulnerabilities_preview';
+import { hasVulnerabilitiesData } from '../utils/vulnerability_helpers';
+
+export const useHasVulnerabilities = (field: 'host.name' | 'user.name', value: string) => {
+ const { data: vulnerabilitiesData } = useVulnerabilitiesPreview({
+ query: buildEntityFlyoutPreviewQuery(field, value),
+ sort: [],
+ enabled: true,
+ pageSize: 1,
+ });
+
+ const {
+ CRITICAL = 0,
+ HIGH = 0,
+ MEDIUM = 0,
+ LOW = 0,
+ NONE = 0,
+ } = vulnerabilitiesData?.count || {};
+
+ const counts = {
+ critical: CRITICAL,
+ high: HIGH,
+ medium: MEDIUM,
+ low: LOW,
+ none: NONE,
+ };
+
+ const hasVulnerabilitiesFindings = hasVulnerabilitiesData(counts);
+
+ return { counts, hasVulnerabilitiesFindings };
+};
diff --git a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/bedrock_runtime_client.ts b/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/bedrock_runtime_client.ts
index 359342870a8b9..7f20591bd51a4 100644
--- a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/bedrock_runtime_client.ts
+++ b/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/bedrock_runtime_client.ts
@@ -8,12 +8,17 @@
import {
BedrockRuntimeClient as _BedrockRuntimeClient,
BedrockRuntimeClientConfig,
+ ConverseCommand,
+ ConverseResponse,
+ ConverseStreamCommand,
+ ConverseStreamResponse,
} from '@aws-sdk/client-bedrock-runtime';
import { constructStack } from '@smithy/middleware-stack';
+import { HttpHandlerOptions } from '@smithy/types';
import { PublicMethodsOf } from '@kbn/utility-types';
import type { ActionsClient } from '@kbn/actions-plugin/server';
-import { NodeHttpHandler } from './node_http_handler';
+import { prepareMessages } from '../../utils/bedrock';
export interface CustomChatModelInput extends BedrockRuntimeClientConfig {
actionsClient: PublicMethodsOf;
@@ -23,15 +28,51 @@ export interface CustomChatModelInput extends BedrockRuntimeClientConfig {
export class BedrockRuntimeClient extends _BedrockRuntimeClient {
middlewareStack: _BedrockRuntimeClient['middlewareStack'];
+ streaming: boolean;
+ actionsClient: PublicMethodsOf;
+ connectorId: string;
constructor({ actionsClient, connectorId, ...fields }: CustomChatModelInput) {
super(fields ?? {});
- this.config.requestHandler = new NodeHttpHandler({
- streaming: fields.streaming ?? true,
- actionsClient,
- connectorId,
- });
+ this.streaming = fields.streaming ?? true;
+ this.actionsClient = actionsClient;
+ this.connectorId = connectorId;
// eliminate middleware steps that handle auth as Kibana connector handles auth
this.middlewareStack = constructStack() as _BedrockRuntimeClient['middlewareStack'];
}
+
+ public async send(
+ command: ConverseCommand | ConverseStreamCommand,
+ optionsOrCb?: HttpHandlerOptions | ((err: unknown, data: unknown) => void)
+ ) {
+ const options = typeof optionsOrCb !== 'function' ? optionsOrCb : {};
+ if (command.input.messages) {
+ // without this, our human + human messages do not work and result in error:
+ // A conversation must alternate between user and assistant roles.
+ command.input.messages = prepareMessages(command.input.messages);
+ }
+ const data = (await this.actionsClient.execute({
+ actionId: this.connectorId,
+ params: {
+ subAction: 'bedrockClientSend',
+ subActionParams: {
+ command,
+ signal: options?.abortSignal,
+ },
+ },
+ })) as {
+ data: ConverseResponse | ConverseStreamResponse;
+ status: string;
+ message?: string;
+ serviceMessage?: string;
+ };
+
+ if (data.status === 'error') {
+ throw new Error(
+ `ActionsClient BedrockRuntimeClient: action result status is error: ${data?.message} - ${data?.serviceMessage}`
+ );
+ }
+
+ return data.data;
+ }
}
diff --git a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.test.ts b/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.test.ts
deleted file mode 100644
index ba8a1db1fbb00..0000000000000
--- a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { NodeHttpHandler } from './node_http_handler';
-import { HttpRequest } from '@smithy/protocol-http';
-import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client/actions_client.mock';
-import { Readable } from 'stream';
-import { fromUtf8 } from '@smithy/util-utf8';
-
-const mockActionsClient = actionsClientMock.create();
-const connectorId = 'mock-connector-id';
-const mockOutput = {
- output: {
- message: {
- role: 'assistant',
- content: [{ text: 'This is a response from the assistant.' }],
- },
- },
- stopReason: 'end_turn',
- usage: { inputTokens: 10, outputTokens: 20, totalTokens: 30 },
- metrics: { latencyMs: 123 },
- additionalModelResponseFields: {},
- trace: { guardrail: { modelOutput: ['Output text'] } },
-};
-describe('NodeHttpHandler', () => {
- let handler: NodeHttpHandler;
-
- beforeEach(() => {
- jest.clearAllMocks();
- handler = new NodeHttpHandler({
- streaming: false,
- actionsClient: mockActionsClient,
- connectorId,
- });
-
- mockActionsClient.execute.mockResolvedValue({
- data: mockOutput,
- actionId: 'mock-action-id',
- status: 'ok',
- });
- });
-
- it('handles non-streaming requests successfully', async () => {
- const request = new HttpRequest({
- body: JSON.stringify({ messages: [] }),
- });
-
- const result = await handler.handle(request);
-
- expect(result.response.statusCode).toBe(200);
- expect(result.response.headers['content-type']).toBe('application/json');
- expect(result.response.body).toStrictEqual(fromUtf8(JSON.stringify(mockOutput)));
- });
-
- it('handles streaming requests successfully', async () => {
- handler = new NodeHttpHandler({
- streaming: true,
- actionsClient: mockActionsClient,
- connectorId,
- });
-
- const request = new HttpRequest({
- body: JSON.stringify({ messages: [] }),
- });
-
- const readable = new Readable();
- readable.push('streaming data');
- readable.push(null);
-
- mockActionsClient.execute.mockResolvedValue({
- data: readable,
- status: 'ok',
- actionId: 'mock-action-id',
- });
-
- const result = await handler.handle(request);
-
- expect(result.response.statusCode).toBe(200);
- expect(result.response.body).toBe(readable);
- });
-
- it('throws an error for non-streaming requests with error status', async () => {
- const request = new HttpRequest({
- body: JSON.stringify({ messages: [] }),
- });
-
- mockActionsClient.execute.mockResolvedValue({
- status: 'error',
- message: 'error message',
- serviceMessage: 'service error message',
- actionId: 'mock-action-id',
- });
-
- await expect(handler.handle(request)).rejects.toThrow(
- 'ActionsClientBedrockChat: action result status is error: error message - service error message'
- );
- });
-
- it('throws an error for streaming requests with error status', async () => {
- handler = new NodeHttpHandler({
- streaming: true,
- actionsClient: mockActionsClient,
- connectorId,
- });
-
- const request = new HttpRequest({
- body: JSON.stringify({ messages: [] }),
- });
-
- mockActionsClient.execute.mockResolvedValue({
- status: 'error',
- message: 'error message',
- serviceMessage: 'service error message',
- actionId: 'mock-action-id',
- });
-
- await expect(handler.handle(request)).rejects.toThrow(
- 'ActionsClientBedrockChat: action result status is error: error message - service error message'
- );
- });
-});
diff --git a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.ts b/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.ts
deleted file mode 100644
index bd5143ef45d4a..0000000000000
--- a/x-pack/packages/kbn-langchain/server/language_models/chat_bedrock_converse/node_http_handler.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { NodeHttpHandler as _NodeHttpHandler } from '@smithy/node-http-handler';
-import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
-import { HttpHandlerOptions, NodeHttpHandlerOptions } from '@smithy/types';
-import { PublicMethodsOf } from '@kbn/utility-types';
-import type { ActionsClient } from '@kbn/actions-plugin/server';
-import { Readable } from 'stream';
-import { fromUtf8 } from '@smithy/util-utf8';
-import { ConverseResponse } from '@aws-sdk/client-bedrock-runtime';
-import { prepareMessages } from '../../utils/bedrock';
-
-interface NodeHandlerOptions extends NodeHttpHandlerOptions {
- streaming: boolean;
- actionsClient: PublicMethodsOf;
- connectorId: string;
-}
-
-export class NodeHttpHandler extends _NodeHttpHandler {
- streaming: boolean;
- actionsClient: PublicMethodsOf;
- connectorId: string;
- constructor(options: NodeHandlerOptions) {
- super(options);
- this.streaming = options.streaming;
- this.actionsClient = options.actionsClient;
- this.connectorId = options.connectorId;
- }
-
- async handle(
- request: HttpRequest,
- options: HttpHandlerOptions = {}
- ): Promise<{ response: HttpResponse }> {
- const body = JSON.parse(request.body);
- const messages = prepareMessages(body.messages);
-
- if (this.streaming) {
- const data = (await this.actionsClient.execute({
- actionId: this.connectorId,
- params: {
- subAction: 'converseStream',
- subActionParams: { ...body, messages, signal: options.abortSignal },
- },
- })) as { data: Readable; status: string; message?: string; serviceMessage?: string };
-
- if (data.status === 'error') {
- throw new Error(
- `ActionsClientBedrockChat: action result status is error: ${data?.message} - ${data?.serviceMessage}`
- );
- }
-
- return {
- response: {
- statusCode: 200,
- headers: {},
- body: data.data,
- },
- };
- }
-
- const data = (await this.actionsClient.execute({
- actionId: this.connectorId,
- params: {
- subAction: 'converse',
- subActionParams: { ...body, messages, signal: options.abortSignal },
- },
- })) as { data: ConverseResponse; status: string; message?: string; serviceMessage?: string };
-
- if (data.status === 'error') {
- throw new Error(
- `ActionsClientBedrockChat: action result status is error: ${data?.message} - ${data?.serviceMessage}`
- );
- }
-
- return {
- response: {
- statusCode: 200,
- headers: { 'content-type': 'application/json' },
- body: fromUtf8(JSON.stringify(data.data)),
- },
- };
- }
-}
diff --git a/x-pack/packages/kbn-langchain/server/utils/bedrock.ts b/x-pack/packages/kbn-langchain/server/utils/bedrock.ts
index 7c8c069e5eb5a..b61144a5f9ad1 100644
--- a/x-pack/packages/kbn-langchain/server/utils/bedrock.ts
+++ b/x-pack/packages/kbn-langchain/server/utils/bedrock.ts
@@ -10,6 +10,7 @@ import { finished } from 'stream/promises';
import { Logger } from '@kbn/core/server';
import { EventStreamCodec } from '@smithy/eventstream-codec';
import { fromUtf8, toUtf8 } from '@smithy/util-utf8';
+import { Message } from '@aws-sdk/client-bedrock-runtime';
import { StreamParser } from './types';
export const parseBedrockStreamAsAsyncIterator = async function* (
@@ -227,7 +228,7 @@ function parseContent(content: Array<{ text?: string; type: string }>): string {
* Prepare messages for the bedrock API by combining messages from the same role
* @param messages
*/
-export const prepareMessages = (messages: Array<{ role: string; content: string[] }>) =>
+export const prepareMessages = (messages: Message[]) =>
messages.reduce((acc, { role, content }) => {
const lastMessage = acc[acc.length - 1];
@@ -236,13 +237,13 @@ export const prepareMessages = (messages: Array<{ role: string; content: string[
return acc;
}
- if (lastMessage.role === role) {
- acc[acc.length - 1].content = lastMessage.content.concat(content);
+ if (lastMessage.role === role && lastMessage.content) {
+ acc[acc.length - 1].content = lastMessage.content.concat(content || []);
return acc;
}
return acc;
- }, [] as Array<{ role: string; content: string[] }>);
+ }, [] as Message[]);
export const DEFAULT_BEDROCK_MODEL = 'anthropic.claude-3-5-sonnet-20240620-v1:0';
export const DEFAULT_BEDROCK_REGION = 'us-east-1';
diff --git a/x-pack/packages/security/ui_components/kibana.jsonc b/x-pack/packages/security/ui_components/kibana.jsonc
index 1aad2d80ed7f7..996f7b78e110a 100644
--- a/x-pack/packages/security/ui_components/kibana.jsonc
+++ b/x-pack/packages/security/ui_components/kibana.jsonc
@@ -1,5 +1,5 @@
{
- "type": "shared-common",
+ "type": "shared-browser",
"id": "@kbn/security-ui-components",
"owner": "@elastic/kibana-security"
}
diff --git a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
index 2ed172a49ad8b..6e55fa7ed7bbf 100644
--- a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
+++ b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
@@ -54,6 +54,7 @@ const setup = (config: TestConfig) => {
kibanaPrivileges={kibanaPrivileges}
onChange={onChange}
onChangeAll={onChangeAll}
+ showAdditionalPermissionsMessage={true}
canCustomizeSubFeaturePrivileges={config.canCustomizeSubFeaturePrivileges}
privilegeIndex={config.privilegeIndex}
allSpacesSelected={true}
diff --git a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.tsx b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.tsx
index 2f77b55ce5bac..9ee1ea3517dae 100644
--- a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.tsx
+++ b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.tsx
@@ -45,13 +45,10 @@ interface Props {
privilegeIndex: number;
onChange: (featureId: string, privileges: string[]) => void;
onChangeAll: (privileges: string[]) => void;
+ showAdditionalPermissionsMessage: boolean;
canCustomizeSubFeaturePrivileges: boolean;
allSpacesSelected: boolean;
disabled?: boolean;
- /**
- * default is true, to remain backwards compatible
- */
- showTitle?: boolean;
}
interface State {
@@ -62,7 +59,6 @@ export class FeatureTable extends Component {
public static defaultProps = {
privilegeIndex: -1,
showLocks: true,
- showTitle: true,
};
private featureCategories: Map = new Map();
@@ -189,20 +185,7 @@ export class FeatureTable extends Component {
return (
-
- {this.props.showTitle && (
-
-
- {i18n.translate(
- 'xpack.security.management.editRole.featureTable.featureVisibilityTitle',
- {
- defaultMessage: 'Customize feature privileges',
- }
- )}
-
-
- )}
-
+
{!this.props.disabled && (
{
};
private getCategoryHelpText = (category: AppCategory) => {
- if (category.id === 'management') {
+ if (category.id === 'management' && this.props.showAdditionalPermissionsMessage) {
return i18n.translate(
'xpack.security.management.editRole.featureTable.managementCategoryHelpText',
{
diff --git a/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
index 86f9124702fb2..9367ecb221b57 100644
--- a/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
+++ b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
@@ -10,45 +10,6 @@ Object {
"presence": "optional",
},
"keys": Object {
- "apiType": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "matches": Array [
- Object {
- "schema": Object {
- "allow": Array [
- "converse",
- ],
- "flags": Object {
- "error": [Function],
- "only": true,
- },
- "type": "any",
- },
- },
- Object {
- "schema": Object {
- "allow": Array [
- "invoke",
- ],
- "flags": Object {
- "error": [Function],
- "only": true,
- },
- "type": "any",
- },
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "alternatives",
- },
"body": Object {
"flags": Object {
"error": [Function],
@@ -170,45 +131,6 @@ Object {
"presence": "optional",
},
"keys": Object {
- "apiType": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "matches": Array [
- Object {
- "schema": Object {
- "allow": Array [
- "converse",
- ],
- "flags": Object {
- "error": [Function],
- "only": true,
- },
- "type": "any",
- },
- },
- Object {
- "schema": Object {
- "allow": Array [
- "invoke",
- ],
- "flags": Object {
- "error": [Function],
- "only": true,
- },
- "type": "any",
- },
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "alternatives",
- },
"body": Object {
"flags": Object {
"error": [Function],
@@ -1471,23 +1393,18 @@ Object {
"presence": "optional",
},
"keys": Object {
- "additionalModelRequestFields": Object {
+ "command": Object {
"flags": Object {
- "default": [Function],
"error": [Function],
- "presence": "optional",
},
"metas": Array [
Object {
"x-oas-any-type": true,
},
- Object {
- "x-oas-optional": true,
- },
],
"type": "any",
},
- "additionalModelResponseFieldPaths": Object {
+ "signal": Object {
"flags": Object {
"default": [Function],
"error": [Function],
@@ -1503,927 +1420,83 @@ Object {
],
"type": "any",
},
- "guardrailConfig": Object {
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .bedrock 8`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "apiUrl": Object {
"flags": Object {
- "default": [Function],
"error": [Function],
- "presence": "optional",
},
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
+ "rules": Array [
Object {
- "x-oas-optional": true,
+ "args": Object {
+ "method": [Function],
+ },
+ "name": "custom",
},
],
- "type": "any",
+ "type": "string",
},
- "inferenceConfig": Object {
+ "defaultModel": Object {
"flags": Object {
- "default": Object {
- "special": "deep",
- },
+ "default": "anthropic.claude-3-5-sonnet-20240620-v1:0",
"error": [Function],
"presence": "optional",
},
- "keys": Object {
- "maxTokens": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
- },
- "stopSequences": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "items": Array [
- Object {
- "flags": Object {
- "error": [Function],
- "presence": "optional",
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "array",
- },
- "temperature": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
- },
- "topP": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
+ "rules": Array [
+ Object {
+ "args": Object {
+ "method": [Function],
},
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
+ "name": "custom",
},
- },
- "type": "object",
+ ],
+ "type": "string",
},
- "messages": Object {
+ },
+ "type": "object",
+}
+`;
+
+exports[`Connector type config checks detect connector type changes for: .bedrock 9`] = `
+Object {
+ "flags": Object {
+ "default": Object {
+ "special": "deep",
+ },
+ "error": [Function],
+ "presence": "optional",
+ },
+ "keys": Object {
+ "accessKey": Object {
"flags": Object {
"error": [Function],
},
- "items": Array [
+ "rules": Array [
Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "content": Object {
- "flags": Object {
- "error": [Function],
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- ],
- "type": "any",
- },
- "role": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
+ "args": Object {
+ "method": [Function],
},
- "type": "object",
+ "name": "custom",
},
],
- "type": "array",
+ "type": "string",
},
- "modelId": Object {
+ "secret": Object {
"flags": Object {
- "default": [Function],
"error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "signal": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "any",
- },
- "system": Object {
- "flags": Object {
- "error": [Function],
- },
- "items": Array [
- Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "text": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- ],
- "type": "array",
- },
- "toolConfig": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "toolChoice": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- "unknown": true,
- },
- "keys": Object {},
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "preferences": Object {
- "stripUnknown": Object {
- "objects": false,
- },
- },
- "type": "object",
- },
- "tools": Object {
- "flags": Object {
- "error": [Function],
- },
- "items": Array [
- Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "toolSpec": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "description": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "inputSchema": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "json": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "$schema": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "additionalProperties": Object {
- "flags": Object {
- "error": [Function],
- },
- "type": "boolean",
- },
- "properties": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- "unknown": true,
- },
- "keys": Object {},
- "preferences": Object {
- "stripUnknown": Object {
- "objects": false,
- },
- },
- "type": "object",
- },
- "required": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "items": Array [
- Object {
- "flags": Object {
- "error": [Function],
- "presence": "optional",
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "array",
- },
- "type": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- },
- "type": "object",
- },
- "name": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- },
- "type": "object",
- },
- ],
- "type": "array",
- },
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "object",
- },
- },
- "type": "object",
-}
-`;
-
-exports[`Connector type config checks detect connector type changes for: .bedrock 8`] = `
-Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "additionalModelRequestFields": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "any",
- },
- "additionalModelResponseFieldPaths": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "any",
- },
- "guardrailConfig": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "any",
- },
- "inferenceConfig": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "maxTokens": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
- },
- "stopSequences": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "items": Array [
- Object {
- "flags": Object {
- "error": [Function],
- "presence": "optional",
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "array",
- },
- "temperature": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
- },
- "topP": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "number",
- },
- },
- "type": "object",
- },
- "messages": Object {
- "flags": Object {
- "error": [Function],
- },
- "items": Array [
- Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "content": Object {
- "flags": Object {
- "error": [Function],
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- ],
- "type": "any",
- },
- "role": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- ],
- "type": "array",
- },
- "modelId": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "signal": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-any-type": true,
- },
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "any",
- },
- "system": Object {
- "flags": Object {
- "error": [Function],
- },
- "items": Array [
- Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "text": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- ],
- "type": "array",
- },
- "toolConfig": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "toolChoice": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- "unknown": true,
- },
- "keys": Object {},
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "preferences": Object {
- "stripUnknown": Object {
- "objects": false,
- },
- },
- "type": "object",
- },
- "tools": Object {
- "flags": Object {
- "error": [Function],
- },
- "items": Array [
- Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "toolSpec": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "description": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "inputSchema": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "json": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "$schema": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "additionalProperties": Object {
- "flags": Object {
- "error": [Function],
- },
- "type": "boolean",
- },
- "properties": Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- "unknown": true,
- },
- "keys": Object {},
- "preferences": Object {
- "stripUnknown": Object {
- "objects": false,
- },
- },
- "type": "object",
- },
- "required": Object {
- "flags": Object {
- "default": [Function],
- "error": [Function],
- "presence": "optional",
- },
- "items": Array [
- Object {
- "flags": Object {
- "error": [Function],
- "presence": "optional",
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- ],
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "array",
- },
- "type": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- },
- "type": "object",
- },
- "name": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
- },
- },
- "type": "object",
- },
- ],
- "type": "array",
- },
- },
- "metas": Array [
- Object {
- "x-oas-optional": true,
- },
- ],
- "type": "object",
- },
- },
- "type": "object",
-}
-`;
-
-exports[`Connector type config checks detect connector type changes for: .bedrock 9`] = `
-Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "apiUrl": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "defaultModel": Object {
- "flags": Object {
- "default": "anthropic.claude-3-5-sonnet-20240620-v1:0",
- "error": [Function],
- "presence": "optional",
},
"rules": Array [
Object {
@@ -2441,49 +1514,6 @@ Object {
`;
exports[`Connector type config checks detect connector type changes for: .bedrock 10`] = `
-Object {
- "flags": Object {
- "default": Object {
- "special": "deep",
- },
- "error": [Function],
- "presence": "optional",
- },
- "keys": Object {
- "accessKey": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- "secret": Object {
- "flags": Object {
- "error": [Function],
- },
- "rules": Array [
- Object {
- "args": Object {
- "method": [Function],
- },
- "name": "custom",
- },
- ],
- "type": "string",
- },
- },
- "type": "object",
-}
-`;
-
-exports[`Connector type config checks detect connector type changes for: .bedrock 11`] = `
Object {
"flags": Object {
"default": Object {
diff --git a/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.test.ts b/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.test.ts
index d6c89a35ba7ff..f9cc6ff5a5ba0 100644
--- a/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.test.ts
+++ b/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.test.ts
@@ -24,6 +24,7 @@ describe('getGenAiTokenTracking', () => {
let mockGetTokenCountFromInvokeStream: jest.Mock;
let mockGetTokenCountFromInvokeAsyncIterator: jest.Mock;
beforeEach(() => {
+ jest.clearAllMocks();
mockGetTokenCountFromBedrockInvoke = (
getTokenCountFromBedrockInvoke as jest.Mock
).mockResolvedValueOnce({
@@ -163,6 +164,103 @@ describe('getGenAiTokenTracking', () => {
});
});
+ it('should return the total, prompt, and completion token counts when given a valid ConverseResponse for bedrockClientSend subaction', async () => {
+ const actionTypeId = '.bedrock';
+
+ const result = {
+ actionId: '123',
+ status: 'ok' as const,
+ data: {
+ usage: {
+ inputTokens: 50,
+ outputTokens: 50,
+ totalTokens: 100,
+ },
+ },
+ };
+ const validatedParams = {
+ subAction: 'bedrockClientSend',
+ };
+
+ const tokenTracking = await getGenAiTokenTracking({
+ actionTypeId,
+ logger,
+ result,
+ validatedParams,
+ });
+
+ expect(tokenTracking).toEqual({
+ total_tokens: 100,
+ prompt_tokens: 50,
+ completion_tokens: 50,
+ });
+ expect(logger.error).not.toHaveBeenCalled();
+ });
+
+ it('should return the total, prompt, and completion token counts when given a valid ConverseStreamResponse for bedrockClientSend subaction', async () => {
+ const chunkIterable = {
+ async *[Symbol.asyncIterator]() {
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ yield {
+ metadata: {
+ usage: {
+ totalTokens: 100,
+ inputTokens: 40,
+ outputTokens: 60,
+ },
+ },
+ };
+ },
+ };
+ const actionTypeId = '.bedrock';
+
+ const result = {
+ actionId: '123',
+ status: 'ok' as const,
+ data: {
+ tokenStream: chunkIterable,
+ },
+ };
+ const validatedParams = {
+ subAction: 'bedrockClientSend',
+ };
+
+ const tokenTracking = await getGenAiTokenTracking({
+ actionTypeId,
+ logger,
+ result,
+ validatedParams,
+ });
+
+ expect(tokenTracking).toEqual({
+ total_tokens: 100,
+ prompt_tokens: 40,
+ completion_tokens: 60,
+ });
+ expect(logger.error).not.toHaveBeenCalled();
+ });
+
+ it('should return null when given an invalid Bedrock response for bedrockClientSend subaction', async () => {
+ const actionTypeId = '.bedrock';
+ const result = {
+ actionId: '123',
+ status: 'ok' as const,
+ data: {},
+ };
+ const validatedParams = {
+ subAction: 'bedrockClientSend',
+ };
+
+ const tokenTracking = await getGenAiTokenTracking({
+ actionTypeId,
+ logger,
+ result,
+ validatedParams,
+ });
+
+ expect(tokenTracking).toBeNull();
+ expect(logger.error).toHaveBeenCalled();
+ });
it('should return the total, prompt, and completion token counts when given a valid OpenAI streamed response', async () => {
const mockReader = new IncomingMessage(new Socket());
const actionTypeId = '.gen-ai';
diff --git a/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.ts b/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.ts
index 41bfa28605f40..d73610892098d 100644
--- a/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.ts
+++ b/x-pack/plugins/actions/server/lib/gen_ai_token_tracking.ts
@@ -9,6 +9,10 @@ import { PassThrough, Readable } from 'stream';
import { Logger } from '@kbn/logging';
import { Stream } from 'openai/streaming';
import { ChatCompletionChunk } from 'openai/resources/chat/completions';
+import {
+ getTokensFromBedrockConverseStream,
+ SmithyStream,
+} from './get_token_count_from_bedrock_converse';
import {
InvokeAsyncIteratorBody,
getTokenCountFromInvokeAsyncIterator,
@@ -264,6 +268,29 @@ export const getGenAiTokenTracking = async ({
// silently fail and null is returned at bottom of function
}
}
+
+ // BedrockRuntimeClient.send response used by chat model ActionsClientChatBedrockConverse
+ if (actionTypeId === '.bedrock' && validatedParams.subAction === 'bedrockClientSend') {
+ const { tokenStream, usage } = result.data as unknown as {
+ tokenStream?: SmithyStream;
+ usage?: { inputTokens: number; outputTokens: number; totalTokens: number };
+ };
+ if (tokenStream) {
+ const res = await getTokensFromBedrockConverseStream(tokenStream, logger);
+ return res;
+ }
+ if (usage) {
+ return {
+ total_tokens: usage.totalTokens,
+ prompt_tokens: usage.inputTokens,
+ completion_tokens: usage.outputTokens,
+ };
+ } else {
+ logger.error('Response from Bedrock converse API did not contain usage object');
+ return null;
+ }
+ }
+
return null;
};
diff --git a/x-pack/plugins/actions/server/lib/get_token_count_from_bedrock_converse.ts b/x-pack/plugins/actions/server/lib/get_token_count_from_bedrock_converse.ts
new file mode 100644
index 0000000000000..55bd9e6582e00
--- /dev/null
+++ b/x-pack/plugins/actions/server/lib/get_token_count_from_bedrock_converse.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SmithyMessageDecoderStream } from '@smithy/eventstream-codec';
+import { Logger } from '@kbn/logging';
+
+export type SmithyStream = SmithyMessageDecoderStream<{
+ metadata?: {
+ usage: { inputTokens: number; outputTokens: number; totalTokens: number };
+ };
+}>;
+
+export const getTokensFromBedrockConverseStream = async function (
+ responseStream: SmithyStream,
+ logger: Logger
+): Promise<{ total_tokens: number; prompt_tokens: number; completion_tokens: number } | null> {
+ try {
+ for await (const { metadata } of responseStream) {
+ if (metadata) {
+ return {
+ total_tokens: metadata.usage.totalTokens,
+ prompt_tokens: metadata.usage.inputTokens,
+ completion_tokens: metadata.usage.outputTokens,
+ };
+ }
+ }
+ return null; // Return the final tokens once the generator finishes
+ } catch (e) {
+ logger.error('Response from Bedrock converse API did not contain usage object');
+ return null;
+ }
+};
diff --git a/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.test.ts b/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.test.ts
index cc81706fc257c..a1bc118066b9d 100644
--- a/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.test.ts
+++ b/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.test.ts
@@ -61,6 +61,16 @@ describe('getTokenCountFromOpenAIStream', () => {
],
};
+ const usageChunk = {
+ object: 'chat.completion.chunk',
+ choices: [],
+ usage: {
+ prompt_tokens: 50,
+ completion_tokens: 100,
+ total_tokens: 150,
+ },
+ };
+
const PROMPT_TOKEN_COUNT = 36;
const COMPLETION_TOKEN_COUNT = 5;
@@ -70,55 +80,79 @@ describe('getTokenCountFromOpenAIStream', () => {
});
describe('when a stream completes', () => {
- beforeEach(async () => {
- stream.write('data: [DONE]');
- stream.complete();
- });
+ describe('with usage chunk', () => {
+ it('returns the counts from the usage chunk', async () => {
+ stream = createStreamMock();
+ stream.write(`data: ${JSON.stringify(chunk)}`);
+ stream.write(`data: ${JSON.stringify(usageChunk)}`);
+ stream.write('data: [DONE]');
+ stream.complete();
- describe('without function tokens', () => {
- beforeEach(async () => {
tokens = await getTokenCountFromOpenAIStream({
responseStream: stream.transform,
logger,
body: JSON.stringify(body),
});
- });
- it('counts the prompt tokens', () => {
- expect(tokens.prompt).toBe(PROMPT_TOKEN_COUNT);
- expect(tokens.completion).toBe(COMPLETION_TOKEN_COUNT);
- expect(tokens.total).toBe(PROMPT_TOKEN_COUNT + COMPLETION_TOKEN_COUNT);
+ expect(tokens).toEqual({
+ prompt: usageChunk.usage.prompt_tokens,
+ completion: usageChunk.usage.completion_tokens,
+ total: usageChunk.usage.total_tokens,
+ });
});
});
- describe('with function tokens', () => {
+ describe('without usage chunk', () => {
beforeEach(async () => {
- tokens = await getTokenCountFromOpenAIStream({
- responseStream: stream.transform,
- logger,
- body: JSON.stringify({
- ...body,
- functions: [
- {
- name: 'my_function',
- description: 'My function description',
- parameters: {
- type: 'object',
- properties: {
- my_property: {
- type: 'boolean',
- description: 'My function property',
+ stream.write('data: [DONE]');
+ stream.complete();
+ });
+
+ describe('without function tokens', () => {
+ beforeEach(async () => {
+ tokens = await getTokenCountFromOpenAIStream({
+ responseStream: stream.transform,
+ logger,
+ body: JSON.stringify(body),
+ });
+ });
+
+ it('counts the prompt tokens', () => {
+ expect(tokens.prompt).toBe(PROMPT_TOKEN_COUNT);
+ expect(tokens.completion).toBe(COMPLETION_TOKEN_COUNT);
+ expect(tokens.total).toBe(PROMPT_TOKEN_COUNT + COMPLETION_TOKEN_COUNT);
+ });
+ });
+
+ describe('with function tokens', () => {
+ beforeEach(async () => {
+ tokens = await getTokenCountFromOpenAIStream({
+ responseStream: stream.transform,
+ logger,
+ body: JSON.stringify({
+ ...body,
+ functions: [
+ {
+ name: 'my_function',
+ description: 'My function description',
+ parameters: {
+ type: 'object',
+ properties: {
+ my_property: {
+ type: 'boolean',
+ description: 'My function property',
+ },
},
},
},
- },
- ],
- }),
+ ],
+ }),
+ });
});
- });
- it('counts the function tokens', () => {
- expect(tokens.prompt).toBeGreaterThan(PROMPT_TOKEN_COUNT);
+ it('counts the function tokens', () => {
+ expect(tokens.prompt).toBeGreaterThan(PROMPT_TOKEN_COUNT);
+ });
});
});
});
diff --git a/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.ts b/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.ts
index 790a59fe6097a..5c19a23e6d230 100644
--- a/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.ts
+++ b/x-pack/plugins/actions/server/lib/get_token_count_from_openai_stream.ts
@@ -25,44 +25,7 @@ export async function getTokenCountFromOpenAIStream({
prompt: number;
completion: number;
}> {
- const chatCompletionRequest = JSON.parse(
- body
- ) as OpenAI.ChatCompletionCreateParams.ChatCompletionCreateParamsStreaming;
-
- // per https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb
- const tokensFromMessages = encode(
- chatCompletionRequest.messages
- .map(
- (msg) =>
- `<|start|>${msg.role}\n${msg.content}\n${
- 'name' in msg
- ? msg.name
- : 'function_call' in msg && msg.function_call
- ? msg.function_call.name + '\n' + msg.function_call.arguments
- : ''
- }<|end|>`
- )
- .join('\n')
- ).length;
-
- // this is an approximation. OpenAI cuts off a function schema
- // at a certain level of nesting, so their token count might
- // be lower than what we are calculating here.
-
- const tokensFromFunctions = chatCompletionRequest.functions
- ? encode(
- chatCompletionRequest.functions
- ?.map(
- (fn) =>
- `<|start|>${fn.name}\n${fn.description}\n${JSON.stringify(fn.parameters)}<|end|>`
- )
- .join('\n')
- ).length
- : 0;
-
- const promptTokens = tokensFromMessages + tokensFromFunctions;
-
- let responseBody: string = '';
+ let responseBody = '';
responseStream.on('data', (chunk: string) => {
responseBody += chunk.toString();
@@ -74,7 +37,9 @@ export async function getTokenCountFromOpenAIStream({
logger.error('An error occurred while calculating streaming response tokens');
}
- const response = responseBody
+ let completionUsage: OpenAI.CompletionUsage | undefined;
+
+ const response: ParsedResponse = responseBody
.split('\n')
.filter((line) => {
return line.startsWith('data: ') && !line.endsWith('[DONE]');
@@ -82,31 +47,54 @@ export async function getTokenCountFromOpenAIStream({
.map((line) => {
return JSON.parse(line.replace('data: ', ''));
})
- .filter(
- (
- line
- ): line is {
- choices: Array<{
- delta: { content?: string; function_call?: { name?: string; arguments: string } };
- }>;
- } => {
- return (
- 'object' in line && line.object === 'chat.completion.chunk' && line.choices.length > 0
- );
- }
- )
+ .filter((line): line is OpenAI.ChatCompletionChunk => {
+ return 'object' in line && line.object === 'chat.completion.chunk';
+ })
.reduce(
(prev, line) => {
- const msg = line.choices[0].delta!;
- prev.content += msg.content || '';
- prev.function_call.name += msg.function_call?.name || '';
- prev.function_call.arguments += msg.function_call?.arguments || '';
+ if (line.usage) {
+ completionUsage = line.usage;
+ }
+ if (line.choices?.length) {
+ const msg = line.choices[0].delta!;
+ prev.content += msg.content || '';
+ prev.function_call.name += msg.function_call?.name || '';
+ prev.function_call.arguments += msg.function_call?.arguments || '';
+ }
return prev;
},
{ content: '', function_call: { name: '', arguments: '' } }
);
- const completionTokens = encode(
+ // not all openAI compatible providers emit completion chunk, so we still have to support
+ // manually counting the tokens
+ if (completionUsage) {
+ return {
+ prompt: completionUsage.prompt_tokens,
+ completion: completionUsage.completion_tokens,
+ total: completionUsage.total_tokens,
+ };
+ } else {
+ const promptTokens = manuallyCountPromptTokens(body);
+ const completionTokens = manuallyCountCompletionTokens(response);
+ return {
+ prompt: promptTokens,
+ completion: completionTokens,
+ total: promptTokens + completionTokens,
+ };
+ }
+}
+
+interface ParsedResponse {
+ content: string;
+ function_call: {
+ name: string;
+ arguments: string;
+ };
+}
+
+const manuallyCountCompletionTokens = (response: ParsedResponse) => {
+ return encode(
JSON.stringify(
omitBy(
{
@@ -117,10 +105,42 @@ export async function getTokenCountFromOpenAIStream({
)
)
).length;
+};
- return {
- prompt: promptTokens,
- completion: completionTokens,
- total: promptTokens + completionTokens,
- };
-}
+const manuallyCountPromptTokens = (requestBody: string) => {
+ const chatCompletionRequest: OpenAI.ChatCompletionCreateParams.ChatCompletionCreateParamsStreaming =
+ JSON.parse(requestBody);
+
+ // per https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb
+ const tokensFromMessages = encode(
+ chatCompletionRequest.messages
+ .map(
+ (msg) =>
+ `<|start|>${msg.role}\n${msg.content}\n${
+ 'name' in msg
+ ? msg.name
+ : 'function_call' in msg && msg.function_call
+ ? msg.function_call.name + '\n' + msg.function_call.arguments
+ : ''
+ }<|end|>`
+ )
+ .join('\n')
+ ).length;
+
+ // this is an approximation. OpenAI cuts off a function schema
+ // at a certain level of nesting, so their token count might
+ // be lower than what we are calculating here.
+
+ const tokensFromFunctions = chatCompletionRequest.functions
+ ? encode(
+ chatCompletionRequest.functions
+ ?.map(
+ (fn) =>
+ `<|start|>${fn.name}\n${fn.description}\n${JSON.stringify(fn.parameters)}<|end|>`
+ )
+ .join('\n')
+ ).length
+ : 0;
+
+ return tokensFromMessages + tokensFromFunctions;
+};
diff --git a/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx b/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
index 420e2b510c62e..1ca4d0449a6c8 100644
--- a/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
+++ b/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
@@ -10,7 +10,6 @@ import React, { useMemo } from 'react';
import type { Observable } from 'rxjs';
import { map } from 'rxjs';
import { pick } from 'lodash';
-import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
import { EuiSpacer } from '@elastic/eui';
import type { DataView } from '@kbn/data-views-plugin/common';
@@ -86,30 +85,28 @@ export const ChangePointDetectionAppState: FC
const casesPermissions = appContextValue.cases?.helpers.canUseCases();
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
};
diff --git a/x-pack/plugins/aiops/tsconfig.json b/x-pack/plugins/aiops/tsconfig.json
index e8b4f4f3ed972..234420f01c52f 100644
--- a/x-pack/plugins/aiops/tsconfig.json
+++ b/x-pack/plugins/aiops/tsconfig.json
@@ -63,7 +63,6 @@
"@kbn/presentation-containers",
"@kbn/presentation-publishing",
"@kbn/presentation-util-plugin",
- "@kbn/react-kibana-context-theme",
"@kbn/react-kibana-mount",
"@kbn/rison",
"@kbn/saved-search-plugin",
diff --git a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
deleted file mode 100644
index be9661eb891f7..0000000000000
--- a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
-
-export const featureCatalogueEntry = {
- id: 'canvas',
- title: 'Canvas',
- subtitle: i18n.translate('xpack.canvas.featureCatalogue.canvasSubtitle', {
- defaultMessage: 'Design pixel-perfect presentations.',
- }),
- description: i18n.translate('xpack.canvas.appDescription', {
- defaultMessage: 'Showcase your data in a pixel-perfect way.',
- }),
- icon: 'canvasApp',
- path: '/app/canvas',
- showOnHomePage: false,
- category: 'data' as FeatureCatalogueCategory,
- solutionId: 'kibana',
- order: 300,
-};
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index bd4e920a56f7e..37a0ae1388899 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -18,6 +18,7 @@ import {
AppUpdater,
DEFAULT_APP_CATEGORIES,
PluginInitializerContext,
+ AppStatus,
} from '@kbn/core/public';
import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
@@ -30,7 +31,6 @@ import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
import { ContentManagementPublicStart } from '@kbn/content-management-plugin/public';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
import { CanvasAppLocatorDefinition } from '../common/locator';
import { SESSIONSTORAGE_LASTPATH, CANVAS_APP } from '../common/lib/constants';
import { getSessionStorage } from './lib/storage';
@@ -39,6 +39,7 @@ import { getPluginApi, CanvasApi } from './plugin_api';
import { setupExpressions } from './setup_expressions';
import { addCanvasElementTrigger } from './state/triggers/add_canvas_element_trigger';
import { setKibanaServices, untilPluginStartServicesReady } from './services/kibana_services';
+import { getHasWorkpads } from './services/get_has_workpads';
export type { CoreStart, CoreSetup };
@@ -161,9 +162,11 @@ export class CanvasPlugin
},
});
- if (setupPlugins.home) {
- setupPlugins.home.featureCatalogue.register(featureCatalogueEntry);
- }
+ getHasWorkpads(coreSetup.http).then((hasWorkpads) => {
+ this.appUpdater.next(() => ({
+ status: hasWorkpads ? AppStatus.accessible : AppStatus.inaccessible,
+ }));
+ });
if (setupPlugins.share) {
setupPlugins.share.url.locators.create(new CanvasAppLocatorDefinition());
diff --git a/x-pack/plugins/canvas/public/services/get_has_workpads.ts b/x-pack/plugins/canvas/public/services/get_has_workpads.ts
new file mode 100644
index 0000000000000..84cfdfc8a29f9
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/get_has_workpads.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpSetup } from '@kbn/core/public';
+import { API_ROUTE_WORKPAD } from '../../common/lib/constants';
+
+export async function getHasWorkpads(http: HttpSetup): Promise {
+ try {
+ const response = await http.get(`${API_ROUTE_WORKPAD}/hasWorkpads`, {
+ version: '1',
+ });
+ return (response as { hasWorkpads: boolean })?.hasWorkpads ?? false;
+ } catch (error) {
+ return false;
+ }
+}
diff --git a/x-pack/plugins/canvas/server/routes/workpad/has_workpads.ts b/x-pack/plugins/canvas/server/routes/workpad/has_workpads.ts
new file mode 100644
index 0000000000000..e42c8fe6fb7c9
--- /dev/null
+++ b/x-pack/plugins/canvas/server/routes/workpad/has_workpads.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RouteInitializerDeps } from '..';
+import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants';
+
+export function initializeHasWorkpadsRoute(deps: RouteInitializerDeps) {
+ const { router } = deps;
+ router.versioned
+ .get({
+ path: `${API_ROUTE_WORKPAD}/hasWorkpads`,
+ access: 'internal',
+ })
+ .addVersion(
+ {
+ version: '1',
+ validate: {
+ request: {},
+ },
+ },
+ async (context, request, response) => {
+ const savedObjectsClient = (await context.core).savedObjects.client;
+
+ try {
+ const workpads = await savedObjectsClient.find({
+ type: CANVAS_TYPE,
+ fields: ['id'],
+ perPage: 1,
+ // search across all spaces
+ namespaces: ['*'],
+ });
+
+ return response.ok({
+ body: {
+ hasWorkpads: workpads.total > 0,
+ },
+ });
+ } catch (error) {
+ return response.ok({
+ body: {
+ hasWorkpads: false,
+ },
+ });
+ }
+ }
+ );
+}
diff --git a/x-pack/plugins/canvas/server/routes/workpad/index.ts b/x-pack/plugins/canvas/server/routes/workpad/index.ts
index 067b54e7cbebe..fefd1b84fd8a8 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/index.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/index.ts
@@ -13,8 +13,10 @@ import { initializeImportWorkpadRoute } from './import';
import { initializeUpdateWorkpadRoute, initializeUpdateWorkpadAssetsRoute } from './update';
import { initializeDeleteWorkpadRoute } from './delete';
import { initializeResolveWorkpadRoute } from './resolve';
+import { initializeHasWorkpadsRoute } from './has_workpads';
export function initWorkpadRoutes(deps: RouteInitializerDeps) {
+ initializeHasWorkpadsRoute(deps);
initializeFindWorkpadsRoute(deps);
initializeResolveWorkpadRoute(deps);
initializeGetWorkpadRoute(deps);
diff --git a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
index 70635a2f8c362..226064204bc2a 100644
--- a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
@@ -91,7 +91,8 @@ describe('AllCases', () => {
jest.clearAllMocks();
});
- describe('empty table', () => {
+ // FLAKY: https://github.com/elastic/kibana/issues/162852
+ describe.skip('empty table', () => {
beforeEach(() => {
useGetCasesMock.mockReturnValue({
...defaultGetCases,
diff --git a/x-pack/plugins/cases/public/components/case_form_fields/severity.test.tsx b/x-pack/plugins/cases/public/components/case_form_fields/severity.test.tsx
index b1c893d020e4e..12f72a073b7fc 100644
--- a/x-pack/plugins/cases/public/components/case_form_fields/severity.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_form_fields/severity.test.tsx
@@ -16,7 +16,8 @@ import { FormTestComponent } from '../../common/test_utils';
const onSubmit = jest.fn();
-describe('Severity form field', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/188951
+describe.skip('Severity form field', () => {
let appMockRender: AppMockRenderer;
beforeEach(() => {
diff --git a/x-pack/plugins/cases/public/components/case_form_fields/sync_alerts_toggle.test.tsx b/x-pack/plugins/cases/public/components/case_form_fields/sync_alerts_toggle.test.tsx
index e783e81800f3e..fbe7eca218391 100644
--- a/x-pack/plugins/cases/public/components/case_form_fields/sync_alerts_toggle.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_form_fields/sync_alerts_toggle.test.tsx
@@ -6,17 +6,13 @@
*/
import React from 'react';
-import { screen, within, waitFor } from '@testing-library/react';
+import { screen, within, waitFor, render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { SyncAlertsToggle } from './sync_alerts_toggle';
import { schema } from '../create/schema';
import { FormTestComponent } from '../../common/test_utils';
-import type { AppMockRenderer } from '../../common/mock';
-import { createAppMockRenderer } from '../../common/mock';
-// Failing: https://github.com/elastic/kibana/issues/190270
-describe.skip('SyncAlertsToggle', () => {
- let appMockRender: AppMockRenderer;
+describe('SyncAlertsToggle', () => {
const onSubmit = jest.fn();
const defaultFormProps = {
onSubmit,
@@ -28,15 +24,10 @@ describe.skip('SyncAlertsToggle', () => {
beforeEach(() => {
jest.clearAllMocks();
- appMockRender = createAppMockRenderer();
- });
-
- afterEach(async () => {
- await appMockRender.clearQueryCache();
});
it('it renders', async () => {
- appMockRender.render(
+ render(
@@ -48,7 +39,7 @@ describe.skip('SyncAlertsToggle', () => {
});
it('it toggles the switch', async () => {
- appMockRender.render(
+ render(
@@ -63,7 +54,7 @@ describe.skip('SyncAlertsToggle', () => {
});
it('calls onSubmit with correct data', async () => {
- appMockRender.render(
+ render(
@@ -73,7 +64,7 @@ describe.skip('SyncAlertsToggle', () => {
await userEvent.click(within(synAlerts).getByRole('switch'));
- await userEvent.click(screen.getByText('Submit'));
+ await userEvent.click(await screen.findByText('Submit'));
await waitFor(() => {
expect(onSubmit).toBeCalledWith(
diff --git a/x-pack/plugins/cases/public/components/category/category_form_field.test.tsx b/x-pack/plugins/cases/public/components/category/category_form_field.test.tsx
index 8380276e3e106..e2aed2c397835 100644
--- a/x-pack/plugins/cases/public/components/category/category_form_field.test.tsx
+++ b/x-pack/plugins/cases/public/components/category/category_form_field.test.tsx
@@ -6,28 +6,19 @@
*/
import React from 'react';
-import { screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import type { AppMockRenderer } from '../../common/mock';
-import { createAppMockRenderer } from '../../common/mock';
import { CategoryFormField } from './category_form_field';
import { categories } from '../../containers/mock';
import { MAX_CATEGORY_LENGTH } from '../../../common/constants';
import { FormTestComponent } from '../../common/test_utils';
-// FLAKY: https://github.com/elastic/kibana/issues/189739
-describe.skip('Category', () => {
- let appMockRender: AppMockRenderer;
+describe('Category', () => {
const onSubmit = jest.fn();
- beforeEach(() => {
- jest.clearAllMocks();
- appMockRender = createAppMockRenderer();
- });
-
it('renders the category field correctly', async () => {
- appMockRender.render(
+ render(
@@ -37,7 +28,7 @@ describe.skip('Category', () => {
});
it('can submit without setting a category', async () => {
- appMockRender.render(
+ render(
@@ -53,7 +44,7 @@ describe.skip('Category', () => {
});
it('can submit with category a string as default value', async () => {
- appMockRender.render(
+ render(
@@ -69,7 +60,7 @@ describe.skip('Category', () => {
});
it('can submit with category with null as default value', async () => {
- appMockRender.render(
+ render(
@@ -85,7 +76,7 @@ describe.skip('Category', () => {
});
it('cannot submit if the category is an empty string', async () => {
- appMockRender.render(
+ render(
@@ -100,13 +91,13 @@ describe.skip('Category', () => {
expect(onSubmit).toBeCalledWith({}, false);
});
- expect(screen.getByText('Empty category is not allowed'));
+ expect(await screen.findByText('Empty category is not allowed'));
});
it(`cannot submit if the category is more than ${MAX_CATEGORY_LENGTH}`, async () => {
const category = 'a'.repeat(MAX_CATEGORY_LENGTH + 1);
- appMockRender.render(
+ render(
@@ -122,20 +113,20 @@ describe.skip('Category', () => {
});
expect(
- screen.getByText(
+ await screen.findByText(
'The length of the category is too long. The maximum length is 50 characters.'
)
);
});
it('can set a category from existing ones', async () => {
- appMockRender.render(
+ render(
);
- await userEvent.type(screen.getByRole('combobox'), `${categories[1]}{enter}`);
+ await userEvent.type(await screen.findByRole('combobox'), `${categories[1]}{enter}`);
await userEvent.click(await screen.findByTestId('form-test-component-submit-button'));
await waitFor(() => {
@@ -145,13 +136,13 @@ describe.skip('Category', () => {
});
it('can set a new category', async () => {
- appMockRender.render(
+ render(
);
- await userEvent.type(screen.getByRole('combobox'), 'my new category{enter}');
+ await userEvent.type(await screen.findByRole('combobox'), 'my new category{enter}');
await userEvent.click(await screen.findByTestId('form-test-component-submit-button'));
await waitFor(() => {
@@ -161,30 +152,30 @@ describe.skip('Category', () => {
});
it('cannot set an empty category', async () => {
- appMockRender.render(
+ render(
);
- await userEvent.type(screen.getByRole('combobox'), ' {enter}');
+ await userEvent.type(await screen.findByRole('combobox'), ' {enter}');
await userEvent.click(await screen.findByTestId('form-test-component-submit-button'));
await waitFor(() => {
// data, isValid
expect(onSubmit).toBeCalledWith({}, false);
- expect(screen.getByText('Empty category is not allowed'));
});
+ expect(await screen.findByText('Empty category is not allowed'));
});
it('setting an empty category and clear it do not produce an error', async () => {
- appMockRender.render(
+ render(
);
- await userEvent.type(screen.getByRole('combobox'), ' {enter}');
+ await userEvent.type(await screen.findByRole('combobox'), ' {enter}');
await userEvent.click(await screen.findByTestId('form-test-component-submit-button'));
await waitFor(() => {
@@ -202,7 +193,7 @@ describe.skip('Category', () => {
});
it('disables the component correctly when it is loading', async () => {
- appMockRender.render(
+ render(
diff --git a/x-pack/plugins/cases/public/components/create/owner_selector.test.tsx b/x-pack/plugins/cases/public/components/create/owner_selector.test.tsx
index 7f11214a1576c..8ba88a4d8a3c5 100644
--- a/x-pack/plugins/cases/public/components/create/owner_selector.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/owner_selector.test.tsx
@@ -6,29 +6,19 @@
*/
import React from 'react';
-import { waitFor, screen } from '@testing-library/react';
+import { waitFor, screen, render } from '@testing-library/react';
import { SECURITY_SOLUTION_OWNER } from '../../../common';
import { OBSERVABILITY_OWNER, OWNER_INFO } from '../../../common/constants';
import { CreateCaseOwnerSelector } from './owner_selector';
-import type { AppMockRenderer } from '../../common/mock';
-import { createAppMockRenderer } from '../../common/mock';
import userEvent from '@testing-library/user-event';
-// FLAKY: https://github.com/elastic/kibana/issues/188488
-describe.skip('Case Owner Selection', () => {
+describe('Case Owner Selection', () => {
const onOwnerChange = jest.fn();
const selectedOwner = SECURITY_SOLUTION_OWNER;
- let appMockRender: AppMockRenderer;
-
- beforeEach(() => {
- jest.clearAllMocks();
- appMockRender = createAppMockRenderer();
- });
-
it('renders all options', async () => {
- appMockRender.render(
+ render(
{
it.each([[SECURITY_SOLUTION_OWNER], [OBSERVABILITY_OWNER]])(
'only displays %s option if available',
async (available) => {
- appMockRender.render(
+ render(
{
);
it('changes the selection', async () => {
- appMockRender.render(
+ render(
{
- let appMockRender: AppMockRenderer;
+describe('TemplateSelector', () => {
const onTemplateChange = jest.fn();
- beforeEach(() => {
- jest.clearAllMocks();
- appMockRender = createAppMockRenderer();
- });
-
- afterEach(async () => {
- await appMockRender.clearQueryCache();
- });
-
it('renders correctly', async () => {
- appMockRender.render(
+ render(
{
it('selects a template correctly', async () => {
const selectedTemplate = templatesConfigurationMock[2];
- appMockRender.render(
+ render(
{
it('shows selected template as default', async () => {
const templateToSelect = templatesConfigurationMock[1];
- appMockRender.render(
+ render(
{
const templateToSelect = templatesConfigurationMock[1];
const newTemplate = templatesConfigurationMock[2];
- appMockRender.render(
+ render(
{
it('shows the selected option correctly', async () => {
const selectedTemplate = templatesConfigurationMock[2];
- appMockRender.render(
+ render(
{
- let appMockRender: AppMockRenderer;
-
+describe('FileNameLink', () => {
const defaultProps = {
file: basicFileMock,
showPreview: jest.fn(),
@@ -26,11 +20,10 @@ describe.skip('FileNameLink', () => {
beforeEach(() => {
jest.clearAllMocks();
- appMockRender = createAppMockRenderer();
});
it('renders clickable name if file is image', async () => {
- appMockRender.render();
+ render();
const nameLink = await screen.findByTestId('cases-files-name-link');
@@ -42,7 +35,7 @@ describe.skip('FileNameLink', () => {
});
it('renders simple text name if file is not image', async () => {
- appMockRender.render(
+ render(
{
- let appMock: AppMockRenderer;
+describe('DeleteAttachmentConfirmationModal', () => {
const props = {
title: 'My title',
confirmButtonText: 'My button text',
@@ -21,34 +18,29 @@ describe.skip('DeleteAttachmentConfirmationModal', () => {
onConfirm: jest.fn(),
};
- beforeEach(() => {
- appMock = createAppMockRenderer();
- jest.clearAllMocks();
- });
-
it('renders correctly', async () => {
- const result = appMock.render();
+ render();
- expect(result.getByTestId('property-actions-confirm-modal')).toBeInTheDocument();
- expect(result.getByText('My title')).toBeInTheDocument();
- expect(result.getByText('My button text')).toBeInTheDocument();
- expect(result.getByText('Cancel')).toBeInTheDocument();
+ expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+ expect(await screen.findByText('My title')).toBeInTheDocument();
+ expect(await screen.findByText('My button text')).toBeInTheDocument();
+ expect(await screen.findByText('Cancel')).toBeInTheDocument();
});
it('calls onConfirm', async () => {
- const result = appMock.render();
+ const result = render();
- expect(result.getByText('My button text')).toBeInTheDocument();
- await userEvent.click(result.getByText('My button text'));
+ expect(await result.findByText('My button text')).toBeInTheDocument();
+ await userEvent.click(await result.findByText('My button text'));
expect(props.onConfirm).toHaveBeenCalled();
});
it('calls onCancel', async () => {
- const result = appMock.render();
+ render();
- expect(result.getByText('Cancel')).toBeInTheDocument();
- await userEvent.click(result.getByText('Cancel'));
+ expect(await screen.findByText('Cancel')).toBeInTheDocument();
+ await userEvent.click(await screen.findByText('Cancel'));
expect(props.onCancel).toHaveBeenCalled();
});
diff --git a/x-pack/plugins/cases/public/components/user_actions/show_more_button.test.tsx b/x-pack/plugins/cases/public/components/user_actions/show_more_button.test.tsx
index 58c152f6b0b3c..34a0ad2713373 100644
--- a/x-pack/plugins/cases/public/components/user_actions/show_more_button.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/show_more_button.test.tsx
@@ -14,7 +14,8 @@ import { createAppMockRenderer } from '../../common/mock';
const showMoreClickMock = jest.fn();
-describe('ShowMoreButton', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/192672
+describe.skip('ShowMoreButton', () => {
let appMockRender: AppMockRenderer;
beforeEach(() => {
diff --git a/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts b/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
index 09a6481f24455..ccc8158ecace7 100644
--- a/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
+++ b/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
@@ -82,56 +82,45 @@ export type UsageMetricsRequestBody = TypeOf;
export const UsageMetricsResponseSchema = {
body: () =>
- schema.object({
- metrics: schema.recordOf(
- metricTypesSchema,
- schema.arrayOf(
- schema.object({
- name: schema.string(),
- error: schema.nullable(schema.string()),
- data: schema.arrayOf(
- schema.object({
- x: schema.number(),
- y: schema.number(),
- })
- ),
- })
- )
- ),
- }),
+ schema.recordOf(
+ metricTypesSchema,
+ schema.arrayOf(
+ schema.object({
+ name: schema.string(),
+ error: schema.nullable(schema.string()),
+ data: schema.arrayOf(
+ schema.object({
+ x: schema.number(),
+ y: schema.number(),
+ })
+ ),
+ })
+ )
+ ),
};
-export type UsageMetricsResponseSchemaBody = Omit<
- TypeOf,
- 'metrics'
-> & {
- metrics: Partial>;
-};
-export type MetricSeries = TypeOf<
- typeof UsageMetricsResponseSchema.body
->['metrics'][MetricTypes][number];
+
+export type UsageMetricsResponseSchemaBody = Partial>;
+
+export type MetricSeries = TypeOf[MetricTypes][number];
export const UsageMetricsAutoOpsResponseSchema = {
body: () =>
- schema.object({
- metrics: schema.recordOf(
- metricTypesSchema,
- schema.arrayOf(
- schema.object({
- name: schema.string(),
- error: schema.nullable(schema.string()),
- data: schema.arrayOf(schema.arrayOf(schema.number(), { minSize: 2, maxSize: 2 })),
- })
- )
- ),
- }),
+ schema.recordOf(
+ metricTypesSchema,
+ schema.arrayOf(
+ schema.object({
+ name: schema.string(),
+ error: schema.nullable(schema.string()),
+ data: schema.arrayOf(schema.arrayOf(schema.number(), { minSize: 2, maxSize: 2 })),
+ })
+ )
+ ),
};
+
export type UsageMetricsAutoOpsResponseMetricSeries = TypeOf<
typeof UsageMetricsAutoOpsResponseSchema.body
->['metrics'][MetricTypes][number];
+>[MetricTypes][number];
-export type UsageMetricsAutoOpsResponseSchemaBody = Omit<
- TypeOf,
- 'metrics'
-> & {
- metrics: Partial>;
-};
+export type UsageMetricsAutoOpsResponseSchemaBody = Partial<
+ Record
+>;
diff --git a/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx b/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx
index 7554716c59492..31ae68244e982 100644
--- a/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx
+++ b/x-pack/plugins/data_usage/public/app/components/chart_panel.tsx
@@ -16,6 +16,7 @@ import {
niceTimeFormatter,
DARK_THEME,
LIGHT_THEME,
+ LineSeries,
} from '@elastic/charts';
import { i18n } from '@kbn/i18n';
import { LegendAction } from './legend_action';
@@ -59,6 +60,18 @@ export const ChartPanel: React.FC = ({
[minTimestamp, maxTimestamp]
);
+ // Calculate the total for each time bucket
+ const totalSeries = useMemo(() => {
+ const totalsMap = new Map();
+
+ series.forEach((stream) => {
+ stream.data.forEach((point) => {
+ totalsMap.set(point.x, (totalsMap.get(point.x) || 0) + point.y);
+ });
+ });
+
+ return Array.from(totalsMap.entries()).map(([x, y]) => ({ x, y }));
+ }, [series]);
const renderLegendAction = useCallback(
({ label }: { label: string }) => {
return (
@@ -87,6 +100,19 @@ export const ChartPanel: React.FC = ({
xDomain={{ min: minTimestamp, max: maxTimestamp }}
legendAction={renderLegendAction}
/>
+
{series.map((stream, streamIdx) => (
= ({ data, 'data-test-subj': dataTest
return (
- {Object.entries(data.metrics).map(([metricType, series], idx) => (
+ {Object.entries(data).map(([metricType, series], idx) => (
{
...getBaseMockedDataUsageMetrics,
isFetched: true,
data: {
- metrics: {
- ingest_rate: [
- {
- name: '.ds-1',
- data: [{ x: new Date(), y: 1000 }],
- },
- {
- name: '.ds-10',
- data: [{ x: new Date(), y: 1100 }],
- },
- ],
- storage_retained: [
- {
- name: '.ds-2',
- data: [{ x: new Date(), y: 2000 }],
- },
- {
- name: '.ds-20',
- data: [{ x: new Date(), y: 2100 }],
- },
- ],
- },
+ ingest_rate: [
+ {
+ name: '.ds-1',
+ data: [{ x: new Date(), y: 1000 }],
+ },
+ {
+ name: '.ds-10',
+ data: [{ x: new Date(), y: 1100 }],
+ },
+ ],
+ storage_retained: [
+ {
+ name: '.ds-2',
+ data: [{ x: new Date(), y: 2000 }],
+ },
+ {
+ name: '.ds-20',
+ data: [{ x: new Date(), y: 2100 }],
+ },
+ ],
},
});
const { getByTestId } = render();
diff --git a/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx b/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx
index 8bedde117785a..5460c7ada0389 100644
--- a/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx
+++ b/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx
@@ -206,7 +206,7 @@ export const DataUsageMetrics = memo(
- {isFetched && data?.metrics ? (
+ {isFetched && data ? (
) : isFetching ? (
diff --git a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx
index 2b009f05f3bb1..c73e35fe1397d 100644
--- a/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx
+++ b/x-pack/plugins/data_usage/public/app/hooks/use_charts_url_params.test.tsx
@@ -9,7 +9,8 @@ import moment from 'moment';
import { METRIC_TYPE_VALUES, MetricTypes } from '../../../common/rest_types';
import { getDataUsageMetricsFiltersFromUrlParams } from './use_charts_url_params';
-describe('#getDataUsageMetricsFiltersFromUrlParams', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/200888
+describe.skip('#getDataUsageMetricsFiltersFromUrlParams', () => {
const getMetricTypesAsArray = (): MetricTypes[] => {
return [...METRIC_TYPE_VALUES];
};
diff --git a/x-pack/plugins/data_usage/server/config.ts b/x-pack/plugins/data_usage/server/config.ts
index 7dd664f35288b..c6721592b6aac 100644
--- a/x-pack/plugins/data_usage/server/config.ts
+++ b/x-pack/plugins/data_usage/server/config.ts
@@ -20,7 +20,6 @@ export const configSchema = schema.object({
schema.object({
certificate: schema.maybe(schema.string()),
key: schema.maybe(schema.string()),
- ca: schema.maybe(schema.string()),
})
),
})
diff --git a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
index 07625ad4c0898..6907a683696a7 100644
--- a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
+++ b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
@@ -83,18 +83,16 @@ export const getUsageMetricsHandler = (
export function transformMetricsData(
data: UsageMetricsAutoOpsResponseSchemaBody
): UsageMetricsResponseSchemaBody {
- return {
- metrics: Object.fromEntries(
- Object.entries(data.metrics).map(([metricType, series]) => [
- metricType,
- series.map((metricSeries) => ({
- name: metricSeries.name,
- data: (metricSeries.data as Array<[number, number]>).map(([timestamp, value]) => ({
- x: timestamp,
- y: value,
- })),
+ return Object.fromEntries(
+ Object.entries(data).map(([metricType, series]) => [
+ metricType,
+ series.map((metricSeries) => ({
+ name: metricSeries.name,
+ data: (metricSeries.data as Array<[number, number]>).map(([timestamp, value]) => ({
+ x: timestamp,
+ y: value,
})),
- ])
- ),
- };
+ })),
+ ])
+ ) as UsageMetricsResponseSchemaBody;
}
diff --git a/x-pack/plugins/data_usage/server/services/autoops_api.ts b/x-pack/plugins/data_usage/server/services/autoops_api.ts
index c1b96a973d9d7..9fd742a3e73fa 100644
--- a/x-pack/plugins/data_usage/server/services/autoops_api.ts
+++ b/x-pack/plugins/data_usage/server/services/autoops_api.ts
@@ -52,12 +52,23 @@ export class AutoOpsAPIService {
throw new AutoOpsError(AUTO_OPS_MISSING_CONFIG_ERROR);
}
+ if (!autoopsConfig.api?.url) {
+ this.logger.error(`[AutoOps API] Missing API URL in the configuration.`, errorMetadata);
+ throw new AutoOpsError('Missing API URL in AutoOps configuration.');
+ }
+
+ if (!autoopsConfig.api?.tls?.certificate || !autoopsConfig.api?.tls?.key) {
+ this.logger.error(
+ `[AutoOps API] Missing required TLS certificate or key in the configuration.`,
+ errorMetadata
+ );
+ throw new AutoOpsError('Missing required TLS certificate or key in AutoOps configuration.');
+ }
+
this.logger.debug(
- `[AutoOps API] Creating autoops agent with TLS cert: ${
- autoopsConfig?.api?.tls?.certificate ? '[REDACTED]' : 'undefined'
- } and TLS key: ${autoopsConfig?.api?.tls?.key ? '[REDACTED]' : 'undefined'}
- and TLS ca: ${autoopsConfig?.api?.tls?.ca ? '[REDACTED]' : 'undefined'}`
+ `[AutoOps API] Creating autoops agent with request URL: ${autoopsConfig.api.url} and TLS cert: [REDACTED] and TLS key: [REDACTED]`
);
+
const controller = new AbortController();
const tlsConfig = this.createTlsConfig(autoopsConfig);
const cloudSetup = appContextService.getCloud();
@@ -153,11 +164,7 @@ export class AutoOpsAPIService {
}
);
- const validatedResponse = response.data.metrics
- ? UsageMetricsAutoOpsResponseSchema.body().validate(response.data)
- : UsageMetricsAutoOpsResponseSchema.body().validate({
- metrics: response.data,
- });
+ const validatedResponse = UsageMetricsAutoOpsResponseSchema.body().validate(response.data);
this.logger.debug(`[AutoOps API] Successfully created an autoops agent ${response}`);
return validatedResponse;
@@ -169,7 +176,6 @@ export class AutoOpsAPIService {
enabled: true,
certificate: autoopsConfig?.api?.tls?.certificate,
key: autoopsConfig?.api?.tls?.key,
- certificateAuthorities: autoopsConfig?.api?.tls?.ca,
})
);
}
@@ -187,7 +193,6 @@ export class AutoOpsAPIService {
...requestConfig.httpsAgent.options,
cert: requestConfig.httpsAgent.options.cert ? 'REDACTED' : undefined,
key: requestConfig.httpsAgent.options.key ? 'REDACTED' : undefined,
- ca: requestConfig.httpsAgent.options.ca ? 'REDACTED' : undefined,
},
},
});
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
index 797f94fa29e51..0c13a772862b8 100644
--- a/x-pack/plugins/enterprise_search/common/constants.ts
+++ b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -27,7 +27,7 @@ import { IngestPipelineParams } from '@kbn/search-connectors';
import { ProductFeatures } from './types';
export const SEARCH_PRODUCT_NAME = i18n.translate('xpack.enterpriseSearch.search.productName', {
- defaultMessage: 'Search',
+ defaultMessage: 'Elasticsearch',
});
export const ENTERPRISE_SEARCH_PRODUCT_NAME = i18n.translate('xpack.enterpriseSearch.productName', {
defaultMessage: 'Enterprise Search',
diff --git a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx
index 7374ecd0ac359..4ce68d1bbd6e4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/ai_search_guide/ai_search_guide.tsx
@@ -40,7 +40,7 @@ export const AISearchGuide: React.FC = () => {
bottomBorder={false}
pageHeader={{
pageTitle: i18n.translate('xpack.enterpriseSearch.aiSearch.guide.pageTitle', {
- defaultMessage: 'Improve search revelance with AI',
+ defaultMessage: 'Improve search relevance with AI',
}),
}}
>
diff --git a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx
index 42a84efd0ccc4..dfcc1695e4efd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/ai_search/components/layout/page_template.test.tsx
@@ -13,6 +13,8 @@ import React from 'react';
import { shallow } from 'enzyme';
+import { i18n } from '@kbn/i18n';
+
import { SetAiSearchChrome } from '../../../shared/kibana_chrome';
import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout';
import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
@@ -23,12 +25,14 @@ describe('EnterpriseSearchAISearchPageTemplate', () => {
it('renders', () => {
const wrapper = shallow(
- world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })}
+
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] });
+ expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.test.tsx
index 2dc27c7f7bfad..fa390d39e99d8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.test.tsx
@@ -9,9 +9,10 @@ import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logi
import React from 'react';
-import { shallow, mount } from 'enzyme';
+import { shallow } from 'enzyme';
import { EuiModal, EuiFieldText, EuiCodeBlock } from '@elastic/eui';
+import { mountWithIntl } from '@kbn/test-jest-helpers';
const mockActions = { makeRequest: jest.fn(), setKeyName: jest.fn() };
@@ -47,7 +48,9 @@ describe('GenerateAnalyticsApiKeyModal', () => {
});
it('pre-set the key name with collection name', () => {
- mount();
+ mountWithIntl(
+
+ );
expect(mockActions.setKeyName).toHaveBeenCalledWith('puggles API key');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.tsx
index 7cf5b76490c4f..bd5b7eed2a891 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/api_key_modal/generate_analytics_api_key_modal.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { useEffect } from 'react';
+import React, { useRef, useEffect } from 'react';
import { useValues, useActions } from 'kea';
@@ -24,12 +24,13 @@ import {
EuiFieldText,
EuiFormRow,
EuiText,
- EuiSpacer,
- EuiFormLabel,
EuiCodeBlock,
+ EuiCallOut,
+ useGeneratedHtmlId,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
import { generateAnalyticsApiKeyLogic } from '../../../../api/generate_analytics_api_key/generate_analytics_api_key_logic';
@@ -47,15 +48,23 @@ export const GenerateAnalyticsApiKeyModal: React.FC(null);
+ const modalTitleId = useGeneratedHtmlId();
+
+ useEffect(() => {
+ if (isSuccess) {
+ copyApiKeyRef.current?.focus();
+ }
+ }, [isSuccess]);
useEffect(() => {
setKeyName(`${collectionName} API key`);
}, [collectionName]);
return (
-
+
-
+
{i18n.translate(
'xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title',
{
@@ -66,15 +75,24 @@ export const GenerateAnalyticsApiKeyModal: React.FC
<>
-
+
{!isSuccess ? (
<>
-
+
+ }
+ fullWidth
+ >
) : (
- {keyName}
-
+ {keyName},
+ }}
+ />
+ }
+ color="success"
+ iconType="check"
+ role="alert"
+ />
{apiKey ? (
) : (
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx
index b43f1fbcee7d6..f59a750e1a06c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/layout/page_template.test.tsx
@@ -43,7 +43,7 @@ describe('EnterpriseSearchAnalyticsPageTemplate', () => {
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] });
+ expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/app_search_gate/app_search_gate.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/app_search_gate/app_search_gate.tsx
index 85cea5e8bf3c1..c2385efe47061 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/app_search_gate/app_search_gate.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/app_search_gate/app_search_gate.tsx
@@ -554,7 +554,7 @@ export const AppSearchGate: React.FC = () => {
)}
>
= ({ onClose }) =
)}
-
-
-
+ />
= ({ onClose }) =
& {
'data-telemetry-id'?: string;
ignoredOptions?: string[];
+ label?: string;
};
export const IndicesSelectComboBox = ({ ignoredOptions, ...props }: IndicesSelectComboBoxProps) => {
const [searchQuery, setSearchQuery] = useState(undefined);
const { makeRequest } = useActions(FetchIndicesForSearchApplicationsAPILogic);
const { status, data } = useValues(FetchIndicesForSearchApplicationsAPILogic);
+ const isInvalid = Boolean(searchQuery && !props.selectedOptions?.length);
useEffect(() => {
makeRequest({ searchQuery });
@@ -85,7 +88,20 @@ export const IndicesSelectComboBox = ({ ignoredOptions, ...props }: IndicesSelec
renderOption,
...props,
};
- return ;
+
+ return (
+
+
+
+ );
};
export const indexToOption = (
diff --git a/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx
index 99eba7d57b108..53fdc507ccfb6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/elasticsearch/components/layout/page_template.test.tsx
@@ -13,6 +13,8 @@ import React from 'react';
import { shallow } from 'enzyme';
+import { i18n } from '@kbn/i18n';
+
import { SetElasticsearchChrome } from '../../../shared/kibana_chrome';
import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout';
import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
@@ -23,12 +25,14 @@ describe('EnterpriseSearchElasticsearchPageTemplate', () => {
it('renders', () => {
const wrapper = shallow(
- world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })}
+
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] });
+ expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/run_options_buttons.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/run_options_buttons.tsx
index c0dd0ff23622d..233b6ddb67374 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/run_options_buttons.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/run_options_buttons.tsx
@@ -42,6 +42,11 @@ export const RunOptionsButtons: React.FC = ({
onChange={() => selectDeploymentMethod('docker')}
id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.runConnectorService.docker"
checked={selectedDeploymentMethod === 'docker'}
+ aria-label={i18n.translate(
+ 'xpack.enterpriseSearch.connectorConfiguration.dockerTextLabel.ariaLabel',
+ { defaultMessage: 'Run with Docker' }
+ )}
+ name="deployment-method-run-connector"
label={
@@ -64,6 +69,11 @@ export const RunOptionsButtons: React.FC = ({
onChange={() => selectDeploymentMethod('source')}
id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.runConnectorService.source"
checked={selectedDeploymentMethod === 'source'}
+ aria-label={i18n.translate(
+ 'xpack.enterpriseSearch.connectorConfiguration.sourceTextLabel.ariaLabel',
+ { defaultMessage: 'Run from source' }
+ )}
+ name="deployment-method-run-connector"
label={
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx
index 3f072abb3c0bf..f6f7355b04e20 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/page_template.test.tsx
@@ -13,6 +13,8 @@ import React from 'react';
import { shallow } from 'enzyme';
+import { i18n } from '@kbn/i18n';
+
import { SetEnterpriseSearchContentChrome } from '../../../shared/kibana_chrome';
import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout';
import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
@@ -23,12 +25,14 @@ describe('EnterpriseSearchContentPageTemplate', () => {
it('renders', () => {
const wrapper = shallow(
- world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })}
+
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] });
+ expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/generate_api_key_modal/modal.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/generate_api_key_modal/modal.tsx
index d19568bea9e3c..5c0ba545bb565 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/generate_api_key_modal/modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/generate_api_key_modal/modal.tsx
@@ -28,6 +28,7 @@ import {
EuiLink,
EuiCodeBlock,
EuiCallOut,
+ useGeneratedHtmlId,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -51,6 +52,7 @@ export const GenerateApiKeyModal: React.FC = ({ indexN
const { setKeyName } = useActions(GenerateApiKeyModalLogic);
const { makeRequest } = useActions(GenerateApiKeyLogic);
const copyApiKeyRef = useRef(null);
+ const modalTitleId = useGeneratedHtmlId();
useEffect(() => {
if (isSuccess) {
@@ -59,9 +61,9 @@ export const GenerateApiKeyModal: React.FC = ({ indexN
}, [isSuccess]);
return (
-
+
-
+
{i18n.translate('xpack.enterpriseSearch.content.overview.generateApiKeyModal.title', {
defaultMessage: 'Generate API Key',
})}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
index 107be669d8852..ddc98157f80ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
@@ -93,6 +93,7 @@ export const AutomaticCrawlScheduler: React.FC = () => {
@@ -137,6 +138,7 @@ export const AutomaticCrawlScheduler: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/authentication_panel/authentication_panel_edit_content.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/authentication_panel/authentication_panel_edit_content.tsx
index c8d24525747e0..bbc9c6877f0c0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/authentication_panel/authentication_panel_edit_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/authentication_panel/authentication_panel_edit_content.tsx
@@ -42,6 +42,7 @@ export const AuthenticationPanelEditContent: React.FC = () => {
@@ -75,6 +76,7 @@ export const AuthenticationPanelEditContent: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts
index ba2e47b204648..8f952f9406102 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts
@@ -6,4 +6,3 @@
*/
export { SetupGuide } from './setup_guide';
-export { SetupGuideCta } from './setup_guide_cta';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.scss
deleted file mode 100644
index b3e2ffd8c11e3..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.enterpriseSearchSetupCta {
- &__image {
- width: $euiSize * 10;
- margin: 0 auto;
-
- @include euiBreakpoint('xs', 's') {
- width: $euiSize * 15;
- }
- }
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
deleted file mode 100644
index 2516382914d6e..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { shallow } from 'enzyme';
-
-import { SetupGuideCta } from '.';
-
-describe('SetupGuideCta', () => {
- it('renders', () => {
- const wrapper = shallow();
-
- expect(wrapper.find('.enterpriseSearchSetupCta')).toHaveLength(1);
- expect(wrapper.find('EuiImage')).toHaveLength(1);
- });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.tsx
deleted file mode 100644
index 346477b08dbb9..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiText, EuiImage } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import { EuiPanelTo } from '../../../shared/react_router_helpers';
-import { PRODUCT_SELECTOR_CALLOUT_HEADING } from '../../constants';
-
-import CtaImage from './assets/getting_started.png';
-import './setup_guide_cta.scss';
-
-export const SetupGuideCta: React.FC = () => (
-
-
-
-
- {PRODUCT_SELECTOR_CALLOUT_HEADING}
-
-
- {i18n.translate('xpack.enterpriseSearch.overview.setupCta.description', {
- defaultMessage:
- 'Add search to your app or internal organization with Elastic App Search and Workplace Search. Watch the video to see what you can do when search is made easy.',
- })}
-
-
-
-
-
-
-
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx
index 6b9e6b891a59f..246c9835a015a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_relevance/components/layout/page_template.test.tsx
@@ -32,7 +32,7 @@ describe('EnterpriseSearchRelevancePageTemplate', () => {
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Search' });
+ expect(wrapper.prop('solutionNav')).toEqual({ items: [], name: 'Elasticsearch' });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx
index ef1e5ffa70593..0fccdb62d4d2e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/search_experiences/components/layout/page_template.test.tsx
@@ -13,6 +13,8 @@ import React from 'react';
import { shallow } from 'enzyme';
+import { i18n } from '@kbn/i18n';
+
import { SetSearchExperiencesChrome } from '../../../shared/kibana_chrome';
import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout';
import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
@@ -23,12 +25,14 @@ describe('EnterpriseSearchSearchExperiencesPageTemplate', () => {
it('renders', () => {
const wrapper = shallow(
- world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })}
+
);
expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
- expect(wrapper.prop('solutionNav')).toEqual({ name: 'Search', items: [] });
+ expect(wrapper.prop('solutionNav')).toEqual({ name: 'Elasticsearch', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
index c767706fb0d6f..47dcd899d82cf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
@@ -162,7 +162,7 @@ describe('useSearchBreadcrumbs', () => {
expect(useSearchBreadcrumbs(breadcrumbs)).toEqual([
{
- text: 'Search',
+ text: 'Elasticsearch',
href: '/app/enterprise_search/overview',
onClick: expect.any(Function),
},
@@ -180,7 +180,7 @@ describe('useSearchBreadcrumbs', () => {
it('shows just the root if breadcrumbs is empty', () => {
expect(useSearchBreadcrumbs()).toEqual([
{
- text: 'Search',
+ text: 'Elasticsearch',
},
]);
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts
index 511445240095f..5db04cc0a15c2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.test.ts
@@ -17,17 +17,17 @@ describe('generateTitle', () => {
describe('searchTitle', () => {
it('automatically appends the Enterprise Search product onto the pages array', () => {
const title = searchTitle(['Setup Guide']);
- expect(title).toEqual('Setup Guide - Search');
+ expect(title).toEqual('Setup Guide - Elasticsearch');
});
it('can be mixed and matched', () => {
const title = searchTitle([appSearchTitle(['Some Page'])]);
- expect(title).toEqual('Some Page - App Search - Search');
+ expect(title).toEqual('Some Page - App Search - Elasticsearch');
});
it('falls back to product name', () => {
const title = searchTitle();
- expect(title).toEqual('Search');
+ expect(title).toEqual('Elasticsearch');
});
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
index 4c2dc40309349..370972ebe53ea 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
@@ -12,6 +12,7 @@ import React from 'react';
import { shallow } from 'enzyme';
import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
@@ -35,7 +36,9 @@ describe('EnterpriseSearchPageTemplateWrapper', () => {
it('renders children', () => {
const wrapper = shallow(
- world
+
+ {i18n.translate('xpack.enterpriseSearch..div.worldLabel', { defaultMessage: 'world' })}
+
);
@@ -71,7 +74,13 @@ describe('EnterpriseSearchPageTemplateWrapper', () => {
const wrapper = shallow(
Nothing here yet! }
+ emptyState={
+
+ {i18n.translate('xpack.enterpriseSearch..div.nothingHereYetLabel', {
+ defaultMessage: 'Nothing here yet!',
+ })}
+
+ }
>
@@ -88,7 +97,13 @@ describe('EnterpriseSearchPageTemplateWrapper', () => {
const wrapper = shallow(
Nothing here yet!
+ {i18n.translate('xpack.enterpriseSearch..div.nothingHereYetLabel', {
+ defaultMessage: 'Nothing here yet!',
+ })}
+
+ }
>
+ {i18n.translate('xpack.enterpriseSearch.fakeEmbeddedConsole.div.fooLabel', {
+ defaultMessage: 'foo',
+ })}
+
+ );
const consolePlugin = { EmbeddableConsole: FakeEmbeddedConsole };
setMockValues({
@@ -241,14 +262,22 @@ describe('EnterpriseSearchPageTemplateWrapper', () => {
const wrapper = shallow(
+ {i18n.translate('xpack.enterpriseSearch.fakeEmbeddedConsole.div.fooLabel', {
+ defaultMessage: 'foo',
+ })}
+
+ );
const consolePlugin = { EmbeddableConsole: FakeEmbeddedConsole };
setMockValues({
@@ -258,7 +287,9 @@ describe('EnterpriseSearchPageTemplateWrapper', () => {
const wrapper = shallow(