mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
# Backport This will backport the following commits from `main` to `9.0`: - [[Search] Removing elastic managed connectors misleading content (#213335)](https://github.com/elastic/kibana/pull/213335) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"José Luis González","email":"joseluisgj@gmail.com"},"sourceCommit":{"committedDate":"2025-03-06T13:24:11Z","message":"[Search] Removing elastic managed connectors misleading content (#213335)\n\n## Summary\n\nFixing misleading info noted in this GH issue ticket\nhttps://github.com/elastic/search-team/issues/9483 regarding Elastic\nmanaged connectors that are not available in Serverless\n\n\nConnectors empty state page:\n\n\n\nConnectors list page (without the Callout banner on top):\n\n\n\n\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"c67a239e457b9c6a78c65d48658f2d69e9e20e1b","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:version","v9.1.0"],"title":"[Search] Removing elastic managed connectors misleading content","number":213335,"url":"https://github.com/elastic/kibana/pull/213335","mergeCommit":{"message":"[Search] Removing elastic managed connectors misleading content (#213335)\n\n## Summary\n\nFixing misleading info noted in this GH issue ticket\nhttps://github.com/elastic/search-team/issues/9483 regarding Elastic\nmanaged connectors that are not available in Serverless\n\n\nConnectors empty state page:\n\n\n\nConnectors list page (without the Callout banner on top):\n\n\n\n\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"c67a239e457b9c6a78c65d48658f2d69e9e20e1b"}},"sourceBranch":"main","suggestedTargetBranches":["9.0"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/213335","number":213335,"mergeCommit":{"message":"[Search] Removing elastic managed connectors misleading content (#213335)\n\n## Summary\n\nFixing misleading info noted in this GH issue ticket\nhttps://github.com/elastic/search-team/issues/9483 regarding Elastic\nmanaged connectors that are not available in Serverless\n\n\nConnectors empty state page:\n\n\n\nConnectors list page (without the Callout banner on top):\n\n\n\n\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"c67a239e457b9c6a78c65d48658f2d69e9e20e1b"}}]}] BACKPORT--> Co-authored-by: José Luis González <joseluisgj@gmail.com>
This commit is contained in:
parent
19f4e47711
commit
d3fb1fcece
2 changed files with 10 additions and 57 deletions
|
@ -35,16 +35,13 @@ export const SelfManagedConnectorsEmptyPrompt: React.FC = () => {
|
|||
return (
|
||||
<SearchEmptyPrompt
|
||||
icon="plugs"
|
||||
title={i18n.translate('xpack.serverlessSearch.elasticManagedConnectorEmpty.title', {
|
||||
defaultMessage: 'Elastic managed connectors',
|
||||
title={i18n.translate('xpack.serverlessSearch.selfManagedConnectorEmpty.title', {
|
||||
defaultMessage: 'Set up a connector',
|
||||
})}
|
||||
description={i18n.translate('xpack.serverlessSearch.selfManagedConnectorEmpty.description', {
|
||||
defaultMessage:
|
||||
"To set up and deploy a connector you'll be working between data source, your terminal, and the Kibana UI. The high level process looks like this:",
|
||||
})}
|
||||
description={i18n.translate(
|
||||
'xpack.serverlessSearch.elasticManagedConnectorEmpty.description',
|
||||
{
|
||||
defaultMessage:
|
||||
"We're actively developing Elastic managed connectors, that won't require any self-managed infrastructure. You'll be able to handle all configuration in the UI. This will simplify syncing your data into a serverless Elasticsearch project. This new workflow will have two steps:",
|
||||
}
|
||||
)}
|
||||
body={
|
||||
<EuiFlexGroup
|
||||
alignItems="stretch"
|
||||
|
@ -179,7 +176,7 @@ export const SelfManagedConnectorsEmptyPrompt: React.FC = () => {
|
|||
<EuiIcon size="m" type="sortRight" />
|
||||
</EuiFlexItem>
|
||||
<EuiFlexItem>
|
||||
<EuiIcon color="primary" size="l" type="logoElastic" />
|
||||
<EuiIcon color="primary" size="l" type="logoElasticsearch" />
|
||||
</EuiFlexItem>
|
||||
</EuiFlexGroup>
|
||||
</EuiFlexItem>
|
||||
|
|
|
@ -7,17 +7,15 @@
|
|||
|
||||
import {
|
||||
EuiButton,
|
||||
EuiCallOut,
|
||||
EuiFlexGroup,
|
||||
EuiFlexItem,
|
||||
EuiLink,
|
||||
EuiPageTemplate,
|
||||
EuiSpacer,
|
||||
EuiText,
|
||||
} from '@elastic/eui';
|
||||
import { i18n } from '@kbn/i18n';
|
||||
import { FormattedMessage } from '@kbn/i18n-react';
|
||||
import React, { useMemo, useState } from 'react';
|
||||
import React, { useMemo } from 'react';
|
||||
|
||||
import { GithubLink } from '@kbn/search-api-panels';
|
||||
import { SelfManagedConnectorsEmptyPrompt } from './connectors/self_managed_connectors_empty_prompt';
|
||||
|
@ -29,9 +27,6 @@ import { useKibanaServices } from '../hooks/use_kibana';
|
|||
import { ConnectorsTable } from './connectors/connectors_table';
|
||||
import { ConnectorPrivilegesCallout } from './connectors/connector_config/connector_privileges_callout';
|
||||
import { useAssetBasePath } from '../hooks/use_asset_base_path';
|
||||
import { BASE_CONNECTORS_PATH, ELASTIC_MANAGED_CONNECTOR_PATH } from '../constants';
|
||||
|
||||
const CALLOUT_KEY = 'search.connectors.ElasticManaged.ComingSoon.feedbackCallout';
|
||||
|
||||
export const ConnectorsOverview = () => {
|
||||
const { data, isLoading: connectorsLoading } = useConnectors();
|
||||
|
@ -42,14 +37,7 @@ export const ConnectorsOverview = () => {
|
|||
[consolePlugin]
|
||||
);
|
||||
const canManageConnectors = !data || data.canManageConnectors;
|
||||
const {
|
||||
application: { navigateToUrl },
|
||||
} = useKibanaServices();
|
||||
const [showCallOut, setShowCallOut] = useState(sessionStorage.getItem(CALLOUT_KEY) !== 'hidden');
|
||||
const onDismiss = () => {
|
||||
setShowCallOut(false);
|
||||
sessionStorage.setItem(CALLOUT_KEY, 'hidden');
|
||||
};
|
||||
|
||||
const assetBasePath = useAssetBasePath();
|
||||
|
||||
return (
|
||||
|
@ -116,39 +104,7 @@ export const ConnectorsOverview = () => {
|
|||
<EuiPageTemplate.Section restrictWidth color="subdued">
|
||||
<ConnectorPrivilegesCallout />
|
||||
{connectorsLoading || (data?.connectors || []).length > 0 ? (
|
||||
<>
|
||||
{showCallOut && (
|
||||
<>
|
||||
<EuiCallOut
|
||||
size="m"
|
||||
title="Coming soon Elastic managed connectors."
|
||||
iconType="pin"
|
||||
onDismiss={onDismiss}
|
||||
>
|
||||
<p>
|
||||
{i18n.translate(
|
||||
'xpack.serverlessSearch.connectorsOverview.calloutDescription',
|
||||
{
|
||||
defaultMessage:
|
||||
"We're actively developing Elastic managed connectors, that won't require any self-managed infrastructure. You'll be able to handle all configuration in the UI. This will simplify syncing your data into a serverless Elasticsearch project.",
|
||||
}
|
||||
)}
|
||||
</p>
|
||||
<EuiButton
|
||||
data-test-subj="serverlessSearchConnectorsOverviewLinkButtonButton"
|
||||
color="primary"
|
||||
onClick={() =>
|
||||
navigateToUrl(`${BASE_CONNECTORS_PATH}/${ELASTIC_MANAGED_CONNECTOR_PATH}`)
|
||||
}
|
||||
>
|
||||
{LEARN_MORE_LABEL}
|
||||
</EuiButton>
|
||||
</EuiCallOut>
|
||||
<EuiSpacer size="m" />
|
||||
</>
|
||||
)}
|
||||
<ConnectorsTable />
|
||||
</>
|
||||
<ConnectorsTable />
|
||||
) : (
|
||||
<SelfManagedConnectorsEmptyPrompt />
|
||||
)}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue