Date: Tue, 28 Apr 2020 17:28:28 -0400
Subject: [PATCH 05/14] Update
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
Co-Authored-By: Jen Huang
---
.../applications/ingest_manager/components/alpha_flyout.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
index 6ec0aaa470c1b2..b15a959c580596 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
@@ -71,7 +71,7 @@ export const AlphaFlyout: React.FunctionComponent = ({ onClose }) => {
Date: Tue, 28 Apr 2020 17:38:16 -0400
Subject: [PATCH 07/14] Update
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
Co-Authored-By: Jen Huang
---
.../applications/ingest_manager/sections/overview/index.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index caa9c6416f8fea..c459b1b3bfb9bd 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -87,13 +87,13 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
defaultMessage="Ingest Manager"
/>
Date: Tue, 28 Apr 2020 17:44:05 -0400
Subject: [PATCH 08/14] remove small tags
---
.../components/alpha_messaging.tsx | 29 +++++++++----------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
index 64f9e807fb6994..0cdbf0ef792738 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
@@ -12,6 +12,7 @@ import { AlphaFlyout } from './alpha_flyout';
const Message = styled(EuiText).attrs(props => ({
color: 'subdued',
textAlign: 'center',
+ size: 's',
}))`
padding: ${props => props.theme.eui.paddingSizes.m};
`;
@@ -23,23 +24,21 @@ export const AlphaMessaging: React.FC<{}> = () => {
<>
-
-
-
-
- {' – '}
+
+
+ {' – '}
+ {' '}
- setIsAlphaFlyoutOpen(true)}>
- View more details.
-
-
+ />{' '}
+ setIsAlphaFlyoutOpen(true)}>
+ View more details.
+
{isAlphaFlyoutOpen && setIsAlphaFlyoutOpen(false)} />}
From 771153ea2cfbe8ef4b198e42d26c998809ed131e Mon Sep 17 00:00:00 2001
From: Henry Harding
Date: Tue, 28 Apr 2020 18:23:48 -0400
Subject: [PATCH 09/14] change messaging from alpha to experimental
---
.../components/alpha_flyout.tsx | 53 ++++++++++---------
.../components/alpha_messaging.tsx | 2 +-
.../sections/overview/index.tsx | 9 ++--
3 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
index c972947bc4b35f..586a16578fa080 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
@@ -45,45 +45,48 @@ export const AlphaFlyout: React.FunctionComponent = ({ onClose }) => {
-
-
- ),
- forumLink: (
-
-
-
- ),
- }}
+ defaultMessage="This release is experimental and is not subject to the support SLA. It is designed for users to test and offer feedback about Ingest
+ Manager and the new Elastic Agent. It is not intended for use in production environments since certain features may change or go away in a future release."
/>
+
+
+
+ ),
+ forumLink: (
+
+
+
+ ),
+ }}
+ />
+
),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
index 0cdbf0ef792738..5a06a9a8794412 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
@@ -27,7 +27,7 @@ export const AlphaMessaging: React.FC<{}> = () => {
{' – '}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index c459b1b3bfb9bd..7eb1f84427cab3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -87,15 +87,16 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
defaultMessage="Ingest Manager"
/>
From 06d8835407987a7199eb9051ecbcd0ead86c1bdb Mon Sep 17 00:00:00 2001
From: Henry Harding
Date: Tue, 28 Apr 2020 20:52:56 -0400
Subject: [PATCH 10/14] add period
---
.../applications/ingest_manager/sections/overview/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index 7eb1f84427cab3..2b33ef956a535f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -96,7 +96,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
})}
tooltipContent={i18n.translate('xpack.IngestManager.alphaBadge.tooltipText', {
defaultMessage:
- 'This plugin might change or be removed in a future release and is not subject to the support SLA',
+ 'This plugin might change or be removed in a future release and is not subject to the support SLA.',
})}
/>
From 430805a25083fe7bf9a0a4f0d31bc0c1fcba20a1 Mon Sep 17 00:00:00 2001
From: Henry Harding
Date: Wed, 29 Apr 2020 09:57:04 -0400
Subject: [PATCH 11/14] remove unused imports
---
.../ingest_manager/components/alpha_flyout.tsx | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
index 586a16578fa080..c71d1e0925dda3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
@@ -3,23 +3,16 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { useState } from 'react';
+import React from 'react';
import {
- EuiCallOut,
+ EuiButtonEmpty,
EuiFlyout,
EuiFlyoutBody,
EuiFlyoutHeader,
- EuiSpacer,
- EuiTitle,
- EuiIcon,
- EuiText,
- EuiTextColor,
- EuiLink,
- EuiFlexGroup,
- EuiFlexItem,
- EuiButtonEmpty,
- EuiButton,
EuiFlyoutFooter,
+ EuiLink,
+ EuiText,
+ EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
From 508eb680ed2c5a9564ec0fb1c6dbed44632a31e0 Mon Sep 17 00:00:00 2001
From: Henry Harding
Date: Wed, 29 Apr 2020 12:58:30 -0400
Subject: [PATCH 12/14] fixed i18n ids
---
.../applications/ingest_manager/components/alpha_flyout.tsx | 2 +-
.../applications/ingest_manager/sections/overview/index.tsx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
index c71d1e0925dda3..1e7a14e3502296 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
@@ -91,7 +91,7 @@ export const AlphaFlyout: React.FunctionComponent = ({ onClose }) => {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
index 2b33ef956a535f..70d8e7d6882f88 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
@@ -88,13 +88,13 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
/>
Date: Wed, 29 Apr 2020 17:30:31 -0400
Subject: [PATCH 13/14] add send feedback link to header
---
.../ingest_manager/layouts/default.tsx | 28 +++++++++++++++----
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index 10245e73520f75..4a9cfe02b74ace 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -96,12 +96,28 @@ export const DefaultLayout: React.FunctionComponent = ({ section, childre
- setIsSettingsFlyoutOpen(true)}>
-
-
+
+
+
+
+
+
+
+ setIsSettingsFlyoutOpen(true)}>
+
+
+
+
From 80ab47633ba85fbec50aed31a86cff0e69d2f3bc Mon Sep 17 00:00:00 2001
From: Henry Harding
Date: Wed, 29 Apr 2020 17:32:16 -0400
Subject: [PATCH 14/14] rename "ingest management" to "ingest manager"
---
.../applications/ingest_manager/components/settings_flyout.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
index 92146e9ee56793..9863463e68a016 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -209,7 +209,7 @@ export const SettingFlyout: React.FunctionComponent = ({ onClose }) => {