From 1bf05ff8cacca6c5db61ec3f9879f673e0c2c888 Mon Sep 17 00:00:00 2001 From: inge4pres Date: Fri, 10 Feb 2023 14:56:08 +0100 Subject: [PATCH 1/4] profiling: fix setup page and instructions Signed-off-by: inge4pres --- .../public/components/check_setup.tsx | 49 ++++++++++++++++--- .../public/components/no_data_page.tsx | 11 +++-- 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/x-pack/plugins/profiling/public/components/check_setup.tsx b/x-pack/plugins/profiling/public/components/check_setup.tsx index 566ff7382aacf..2b0a96094d7e3 100644 --- a/x-pack/plugins/profiling/public/components/check_setup.tsx +++ b/x-pack/plugins/profiling/public/components/check_setup.tsx @@ -4,7 +4,16 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiText } from '@elastic/eui'; +import { + EuiButton, + EuiFlexGrid, + EuiFlexGroup, + EuiFlexItem, + EuiLink, + EuiLoadingSpinner, + EuiMarkdownFormat, + EuiText, +} from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { useState } from 'react'; import { AsyncStatus, useAsync } from '../hooks/use_async'; @@ -81,12 +90,40 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { action: { elasticAgent: { description: ( - - {i18n.translate('xpack.profiling.noDataConfig.action.title', { - defaultMessage: `Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation. + + + {i18n.translate('xpack.profiling.noDataConfig.action.title', { + defaultMessage: `Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation. Understand what lines of code are consuming compute resources, at all times, and across your entire infrastructure.`, - })} - + })} + + + {i18n.translate('xpack.profiling.noDataConfig.action.permissionsWarning', { + defaultMessage: + 'To setup Universal Profiling, you must be logged in as a superuser, typically the `elastic` user.', + })} + + + {i18n.translate('xpack.profiling.noDataConfig.action.dataRetention', { + defaultMessage: `Normal data storage costs apply for profiling data stored in Elasticsearch. + Refer to the documentation to control data retention. `, + })} + + Read more. + + + + {i18n.translate('xpack.profiling.noDataConfig.action.legalBetaTerms', { + defaultMessage: `By using this feature, you acknowledge that you have read and agree to `, + })} + + Elastic's Beta Release Terms + + + ), onClick: (event: React.MouseEvent) => { event.preventDefault(); diff --git a/x-pack/plugins/profiling/public/components/no_data_page.tsx b/x-pack/plugins/profiling/public/components/no_data_page.tsx index d045b4146dd9c..52e5e35abe9d3 100644 --- a/x-pack/plugins/profiling/public/components/no_data_page.tsx +++ b/x-pack/plugins/profiling/public/components/no_data_page.tsx @@ -124,7 +124,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\ }), content: ( - wget -O- https://releases.prodfiler.com/stable/pf-host-agent_linux_amd64.tgz | tar xz + wget -O pf-host-agent.tgz "https://ela.st/pf-host-agent-amd64" && tar xzf + pf-host-agent.tgz ), }, @@ -162,8 +163,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\ 'Open the URL below and download the right DEB package for your CPU architecture:', }), content: ( - - https://releases.prodfiler.com/stable/index.html + + https://ela.st/pf-host-agent-linux ), }, @@ -212,8 +213,8 @@ docker.elastic.co/observability/profiling-agent:stable /root/pf-host-agent \\ 'Open the URL below and download the right RPM package for your CPU architecture:', }), content: ( - - https://releases.prodfiler.com/stable/index.html + + https://ela.st/pf-host-agent-linux ), }, From 28ad0f44404a9c9fb0f9097bac4edaff8d5afe07 Mon Sep 17 00:00:00 2001 From: boriskirov Date: Mon, 13 Feb 2023 09:05:13 +0100 Subject: [PATCH 2/4] small design uplifts --- .../public/components/check_setup.tsx | 65 +++++++++++-------- .../profiling_header_action_menu.tsx | 2 +- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/x-pack/plugins/profiling/public/components/check_setup.tsx b/x-pack/plugins/profiling/public/components/check_setup.tsx index 2b0a96094d7e3..2e2a3f2ea87db 100644 --- a/x-pack/plugins/profiling/public/components/check_setup.tsx +++ b/x-pack/plugins/profiling/public/components/check_setup.tsx @@ -6,12 +6,12 @@ */ import { EuiButton, + EuiCallOut, EuiFlexGrid, EuiFlexGroup, EuiFlexItem, EuiLink, EuiLoadingSpinner, - EuiMarkdownFormat, EuiText, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; @@ -58,6 +58,9 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { + + Loading data sources + ); @@ -90,39 +93,49 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { action: { elasticAgent: { description: ( - + {i18n.translate('xpack.profiling.noDataConfig.action.title', { defaultMessage: `Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation. Understand what lines of code are consuming compute resources, at all times, and across your entire infrastructure.`, })} - - {i18n.translate('xpack.profiling.noDataConfig.action.permissionsWarning', { - defaultMessage: - 'To setup Universal Profiling, you must be logged in as a superuser, typically the `elastic` user.', - })} - - - {i18n.translate('xpack.profiling.noDataConfig.action.dataRetention', { - defaultMessage: `Normal data storage costs apply for profiling data stored in Elasticsearch. - Refer to the documentation to control data retention. `, - })} - - Read more. - - + - {i18n.translate('xpack.profiling.noDataConfig.action.legalBetaTerms', { - defaultMessage: `By using this feature, you acknowledge that you have read and agree to `, - })} - - Elastic's Beta Release Terms - +
    +
  • + {i18n.translate('xpack.profiling.noDataConfig.action.dataRetention', { + defaultMessage: `Normal data storage costs apply for profiling data stored in Elasticsearch. + To control data retention. `, + })} + + Read more + +
    • +
  • + {i18n.translate('xpack.profiling.noDataConfig.action.legalBetaTerms', { + defaultMessage: `By using this feature, you acknowledge that you have read and agree to `, + })} + + Elastic's Beta Release Terms + +
    • +
+ ), onClick: (event: React.MouseEvent) => { diff --git a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx index 86d2ce4b28b1a..21aba30123c55 100644 --- a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx +++ b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx @@ -16,7 +16,7 @@ export function ProfilingHeaderActionMenu() { - + {i18n.translate('xpack.profiling.headerActionMenu.addData', { From 814ea0ff39ed9d628bd188a13aac64c755bc47d1 Mon Sep 17 00:00:00 2001 From: boriskirov Date: Mon, 13 Feb 2023 09:28:06 +0100 Subject: [PATCH 3/4] adding i18n --- .../profiling/public/components/check_setup.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/profiling/public/components/check_setup.tsx b/x-pack/plugins/profiling/public/components/check_setup.tsx index 2e2a3f2ea87db..2e814daf706ba 100644 --- a/x-pack/plugins/profiling/public/components/check_setup.tsx +++ b/x-pack/plugins/profiling/public/components/check_setup.tsx @@ -59,7 +59,11 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { - Loading data sources + + {i18n.translate('xpack.profiling.noDataConfig.loading.loaderText', { + defaultMessage: 'Loading data sources', + })} + @@ -119,7 +123,9 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { To control data retention. `, })} - Read more + {i18n.translate('xpack.profiling.noDataConfig.readMore.linkLabel', { + defaultMessage: 'Read more', + })}
  • @@ -130,7 +136,9 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { target="_blank" href={`https://www.elastic.co/agreements/beta-release-terms`} > - Elastic's Beta Release Terms + {i18n.translate('xpack.profiling.noDataConfig.betaTerms.linkLabel', { + defaultMessage: 'Elastic Beta Release Terms', + })}
    • From 0d8a649882cb5c09a89ce10dade1c31a26ff5734 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:33:57 +0000 Subject: [PATCH 4/4] [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' --- x-pack/plugins/profiling/public/components/check_setup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/profiling/public/components/check_setup.tsx b/x-pack/plugins/profiling/public/components/check_setup.tsx index 2e814daf706ba..aff650446303f 100644 --- a/x-pack/plugins/profiling/public/components/check_setup.tsx +++ b/x-pack/plugins/profiling/public/components/check_setup.tsx @@ -143,7 +143,7 @@ export function CheckSetup({ children }: { children: React.ReactElement }) { - +     ), onClick: (event: React.MouseEvent) => {