From 55e111d0d015912e43ed60f18e27e35eb8d6389b Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <quynh.nguyen@elastic.co>
Date: Tue, 21 Dec 2021 12:17:46 -0600
Subject: [PATCH 1/3] Update beta badge & docs

---
 .../components/view_mode_toggle/view_mode_toggle.tsx  |  1 -
 src/plugins/discover/server/ui_settings.ts            | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx b/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
index 7c3610b45dc13..af48673bf31be 100644
--- a/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
+++ b/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
@@ -42,7 +42,6 @@ export const DocumentViewModeToggle = ({
                 defaultMessage: 'Beta',
               })}
               size="s"
-              iconType="beaker"
               className="fieldStatsBetaBadge"
             />
           </div>
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index a58770ed1c1d8..26d8986b45d91 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -211,7 +211,16 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
     description: i18n.translate(
       'discover.advancedSettings.discover.showFieldStatisticsDescription',
       {
-        defaultMessage: `Enable "Field statistics" table in Discover.`,
+        defaultMessage: `Enable {fieldStatisticsDocs} in Discover to explore the fields in your data. This functionality is in beta and is subject to change. `,
+        values: {
+          fieldStatisticsDocs:
+            `<a href="https://www.elastic.co/guide/en/kibana/master/show-field-statistics.html"
+            target="_blank" rel="noopener">` +
+            i18n.translate('discover.advancedSettings.discover.fieldStatisticsLinkText', {
+              defaultMessage: 'Field statistics view',
+            }) +
+            '</a>',
+        },
       }
     ),
     value: false,

From c0ec1063feb5d98f74f7756067774a120034adcd Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <quynh.nguyen@elastic.co>
Date: Wed, 5 Jan 2022 11:46:51 -0600
Subject: [PATCH 2/3] Add docs link to Discover, update to current

---
 src/core/public/doc_links/doc_links_service.ts | 1 +
 src/plugins/discover/server/ui_settings.ts     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index ab0613280673b..91060ce716e1f 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -69,6 +69,7 @@ export class DocLinksService {
         },
         discover: {
           guide: `${KIBANA_DOCS}discover.html`,
+          fieldStatistics: `${KIBANA_DOCS}show-field-statistics.html`,
         },
         filebeat: {
           base: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}`,
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index 26d8986b45d91..45df73aca9022 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -214,7 +214,7 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
         defaultMessage: `Enable {fieldStatisticsDocs} in Discover to explore the fields in your data. This functionality is in beta and is subject to change. `,
         values: {
           fieldStatisticsDocs:
-            `<a href="https://www.elastic.co/guide/en/kibana/master/show-field-statistics.html"
+            `<a href="https://www.elastic.co/guide/en/kibana/current/show-field-statistics.html"
             target="_blank" rel="noopener">` +
             i18n.translate('discover.advancedSettings.discover.fieldStatisticsLinkText', {
               defaultMessage: 'Field statistics view',

From a06ad4e21b4a65e1715ac9e647f47bfa64c099cc Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <quynh.nguyen@elastic.co>
Date: Thu, 6 Jan 2022 09:48:19 -0600
Subject: [PATCH 3/3] Revert change to docLinks service

---
 src/core/public/doc_links/doc_links_service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 91060ce716e1f..ab0613280673b 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -69,7 +69,6 @@ export class DocLinksService {
         },
         discover: {
           guide: `${KIBANA_DOCS}discover.html`,
-          fieldStatistics: `${KIBANA_DOCS}show-field-statistics.html`,
         },
         filebeat: {
           base: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}`,