Skip to content

Commit

Permalink
Merge branch 'main' into log-explorer-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyghiani authored Oct 3, 2023
2 parents 7dfe2be + 8d9e12a commit ac1391e
Show file tree
Hide file tree
Showing 230 changed files with 5,679 additions and 652 deletions.
16 changes: 16 additions & 0 deletions packages/kbn-check-mappings-update-cli/current_mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3131,6 +3131,22 @@
}
}
},
"apm-custom-dashboards": {
"properties": {
"dashboardSavedObjectId": {
"type": "keyword"
},
"kuery": {
"type": "text"
},
"serviceEnvironmentFilterEnabled": {
"type": "boolean"
},
"serviceNameFilterEnabled": {
"type": "boolean"
}
}
},
"enterprise_search_telemetry": {
"dynamic": false,
"properties": {}
Expand Down
5 changes: 5 additions & 0 deletions packages/kbn-doc-links/src/get_doc_links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
configuration: `${ENTERPRISE_SEARCH_DOCS}configuration.html`,
connectors: `${ENTERPRISE_SEARCH_DOCS}connectors.html`,
connectorsAzureBlobStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-azure-blob.html`,
connectorsBox: `${ENTERPRISE_SEARCH_DOCS}connectors-box.html`,
connectorsClients: `${ENTERPRISE_SEARCH_DOCS}connectors.html#connectors-build`,
connectorsConfluence: `${ENTERPRISE_SEARCH_DOCS}connectors-confluence.html`,
connectorsDropbox: `${ENTERPRISE_SEARCH_DOCS}connectors-dropbox.html`,
Expand All @@ -157,14 +158,17 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
connectorsNetworkDrive: `${ENTERPRISE_SEARCH_DOCS}connectors-network-drive.html`,
connectorsOneDrive: `${ENTERPRISE_SEARCH_DOCS}connectors-onedrive.html`,
connectorsOracle: `${ENTERPRISE_SEARCH_DOCS}connectors-oracle.html`,
connectorsOutlook: `${ENTERPRISE_SEARCH_DOCS}connectors-outlook.html`,
connectorsPostgreSQL: `${ENTERPRISE_SEARCH_DOCS}connectors-postgresql.html`,
connectorsS3: `${ENTERPRISE_SEARCH_DOCS}connectors-s3.html`,
connectorsSalesforce: `${ENTERPRISE_SEARCH_DOCS}connectors-salesforce.html`,
connectorsServiceNow: `${ENTERPRISE_SEARCH_DOCS}connectors-servicenow.html`,
connectorsSharepoint: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint.html`,
connectorsSharepointOnline: `${ENTERPRISE_SEARCH_DOCS}connectors-sharepoint-online.html`,
connectorsSlack: `${ENTERPRISE_SEARCH_DOCS}connectors-slack.html`,
connectorsTeams: `${ENTERPRISE_SEARCH_DOCS}connectors-teams.html`,
connectorsWorkplaceSearch: `${ENTERPRISE_SEARCH_DOCS}workplace-search-connectors.html`,
connectorsZoom: `${ENTERPRISE_SEARCH_DOCS}connectors-zoom.html`,
crawlerExtractionRules: `${ENTERPRISE_SEARCH_DOCS}crawler-extraction-rules.html`,
crawlerManaging: `${ENTERPRISE_SEARCH_DOCS}crawler-managing.html`,
crawlerOverview: `${ENTERPRISE_SEARCH_DOCS}crawler.html`,
Expand Down Expand Up @@ -510,6 +514,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
setUpgradeMode: `${ELASTICSEARCH_DOCS}ml-set-upgrade-mode.html`,
trainedModels: `${MACHINE_LEARNING_DOCS}ml-trained-models.html`,
startTrainedModelsDeployment: `${MACHINE_LEARNING_DOCS}ml-nlp-deploy-model.html`,
nlpElser: `${MACHINE_LEARNING_DOCS}ml-nlp-elser.html`,
},
transforms: {
guide: `${ELASTICSEARCH_DOCS}transforms.html`,
Expand Down
4 changes: 4 additions & 0 deletions packages/kbn-doc-links/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export interface DocLinks {
readonly configuration: string;
readonly connectors: string;
readonly connectorsAzureBlobStorage: string;
readonly connectorsBox: string;
readonly connectorsClients: string;
readonly connectorsConfluence: string;
readonly connectorsContentExtraction: string;
Expand All @@ -138,14 +139,17 @@ export interface DocLinks {
readonly connectorsNetworkDrive: string;
readonly connectorsOneDrive: string;
readonly connectorsOracle: string;
readonly connectorsOutlook: string;
readonly connectorsPostgreSQL: string;
readonly connectorsS3: string;
readonly connectorsSalesforce: string;
readonly connectorsServiceNow: string;
readonly connectorsSharepoint: string;
readonly connectorsSharepointOnline: string;
readonly connectorsTeams: string;
readonly connectorsSlack: string;
readonly connectorsWorkplaceSearch: string;
readonly connectorsZoom: string;
readonly crawlerExtractionRules: string;
readonly crawlerManaging: string;
readonly crawlerOverview: string;
Expand Down
7 changes: 7 additions & 0 deletions packages/kbn-journeys/services/page/kibana_page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ export class KibanaPage {
});
}

async waitForChartsSuggestions(count: number) {
await this.retry.waitFor(`rendering of ${count} suggestions is completed`, async () => {
const renderingItems = await this.page.$$('button[data-test-subj="lnsSuggestion"]');
return renderingItems.length === count;
});
}

async clearInput(locator: string) {
const textArea = this.page.locator(locator);
await textArea.clear();
Expand Down
50 changes: 47 additions & 3 deletions packages/kbn-search-connectors/connectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'github.svg',
isBeta: true,
isNative: false,
isNative: true,
keywords: ['github', 'cloud', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.github.name', {
defaultMessage: 'GitHub & GitHub Enterprise Server',
Expand All @@ -87,7 +87,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'google_drive.svg',
isBeta: true,
isNative: false,
isNative: true,
keywords: ['google', 'drive', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.googleDrive.name', {
defaultMessage: 'Google Drive',
Expand Down Expand Up @@ -201,7 +201,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
{
iconPath: 'onedrive.svg',
isBeta: true,
isNative: false,
isNative: true,
keywords: ['network', 'drive', 'file', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.oneDrive.name', {
defaultMessage: 'OneDrive',
Expand Down Expand Up @@ -240,6 +240,50 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
}),
serviceType: 'sharepoint_server',
},
{
iconPath: 'box.svg',
isBeta: false,
isNative: false,
isTechPreview: true,
keywords: ['cloud', 'box'],
name: i18n.translate('searchConnectors.content.nativeConnectors.box.name', {
defaultMessage: 'Box',
}),
serviceType: 'box',
},
{
iconPath: 'outlook.svg',
isBeta: false,
isNative: false,
isTechPreview: true,
keywords: ['outlook', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.outlook.name', {
defaultMessage: 'Outlook',
}),
serviceType: 'outlook',
},
{
iconPath: 'teams.svg',
isBeta: false,
isNative: false,
isTechPreview: true,
keywords: ['teams', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.teams.name', {
defaultMessage: 'Teams',
}),
serviceType: 'teams',
},
{
iconPath: 'zoom.svg',
isBeta: false,
isNative: false,
isTechPreview: true,
keywords: ['zoom', 'connector'],
name: i18n.translate('searchConnectors.content.nativeConnectors.zoom.name', {
defaultMessage: 'Zoom',
}),
serviceType: 'zoom',
},
{
iconPath: 'custom.svg',
isBeta: true,
Expand Down
Loading

0 comments on commit ac1391e

Please sign in to comment.