Skip to content

Commit

Permalink
[7.x] [Fleet, Workplace Search] Add Workplace Search connectors as no…
Browse files Browse the repository at this point in the history
…n-Fleet integrations (elastic#114919) (elastic#115195)

* [Fleet, Workplace Search] Add Workplace Search connectors as non-Fleet integrations (elastic#114919)

* Add icons

* Add new categories

* Add Workplace Search connectors to the unified integrations view

* Add a new enterprise_search shipper

* Update number of custom integrations in test

* Change customIntegrations type to optional

* Revert "Update number of custom integrations in test"

This reverts commit 30214b2.

The reason is that while this test passes with 2 separate commands for
functional test runner, it fails when it is run with a single command.

Reverting to make the CI pass. We will look into this test separately.
I will link the investigation issue in the PR.
# Conflicts:
#	x-pack/plugins/enterprise_search/kibana.json

* fix spacing

Co-authored-by: Vadim Yakhin <yakhin.v@gmail.com>
  • Loading branch information
thomasneirynck and yakhinvadim authored Oct 15, 2021
1 parent 36216bd commit 28bf592
Show file tree
Hide file tree
Showing 22 changed files with 340 additions and 3 deletions.
10 changes: 9 additions & 1 deletion src/plugins/custom_integrations/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,15 @@ export const INTEGRATION_CATEGORY_DISPLAY = {
web: 'Web',

// Kibana added
upload_file: 'Upload a file',
communication: 'Communication',
customer_support: 'Customer Support',
document_storage: 'Document Storage',
enterprise_management: 'Enterprise Management',
knowledge_platform: 'Knowledge Platform',
language_client: 'Language client',
project_management: 'Project Management',
software_development: 'Software Development',
upload_file: 'Upload a file',
};

/**
Expand Down Expand Up @@ -70,6 +77,7 @@ export interface IntegrationCategoryCount {
// TODO: consider i18n
export const SHIPPER_DISPLAY = {
beats: 'Beats',
enterprise_search: 'Enterprise Search',
language_clients: 'Language clients',
other: 'Other',
sample_data: 'Sample data',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/enterprise_search/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"kibanaVersion": "kibana",
"requiredPlugins": ["features", "spaces", "licensing", "data", "charts", "infra"],
"configPath": ["enterpriseSearch"],
"optionalPlugins": ["usageCollection", "security", "home", "cloud"],
"optionalPlugins": ["usageCollection", "security", "home", "cloud", "customIntegrations"],
"server": true,
"ui": true,
"requiredBundles": ["home", "kibanaReact"],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 28bf592

Please sign in to comment.